Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions lib/centralassociation/ui/centralassociation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,16 @@ class CentralassociationTemplate extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Container(
color: Colors.white,
child: SafeArea(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
const TopBar(
title: CentralassociationTextConstants.centralassociation,
root: CentralassociationRouter.root,
),
Expanded(child: child),
],
),
body: SafeArea(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
const TopBar(
title: CentralassociationTextConstants.centralassociation,
root: CentralassociationRouter.root,
),
Expanded(child: child),
],
),
),
);
Expand Down
39 changes: 26 additions & 13 deletions lib/centralassociation/ui/pages/link_card.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:auto_size_text/auto_size_text.dart';
import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:titan/centralassociation/class/link.dart';
Expand All @@ -15,10 +16,10 @@ class LinkCard extends HookConsumerWidget {
margin: const EdgeInsets.symmetric(vertical: 7),
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(20)),
color: Colors.white,
color: Theme.of(context).colorScheme.primary,
boxShadow: [
BoxShadow(
color: Colors.grey.withValues(alpha: 0.3),
color: Theme.of(context).shadowColor,
blurRadius: 8,
spreadRadius: 2,
offset: const Offset(2, 3),
Expand All @@ -31,16 +32,24 @@ class LinkCard extends HookConsumerWidget {
shape: WidgetStateProperty.all<RoundedRectangleBorder>(
RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0)),
),
overlayColor: WidgetStateProperty.all<Color>(
const Color.fromARGB(37, 0, 0, 0),
),
),
child: Row(
children: [
Container(
margin: const EdgeInsets.only(left: 10.0, right: 10.0, bottom: 3),
width: 45,
height: 45,
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Theme.of(context).shadowColor,
blurRadius: 5,
spreadRadius: 2,
),
],
borderRadius: BorderRadius.circular(15),
),
child: link.icon.endsWith('.svg')
? SvgPicture.network(
"${CentralassociationTextConstants.imagePath}${link.icon}",
Expand All @@ -51,15 +60,19 @@ class LinkCard extends HookConsumerWidget {
),
const SizedBox(width: 10),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
link.name,
style: const TextStyle(fontSize: 18, color: Colors.black),
child: Container(
alignment: Alignment.center,
padding: const EdgeInsets.only(bottom: 7),
child: AutoSizeText(
link.name,
style: TextStyle(
fontSize: 18,
color: Theme.of(context).colorScheme.onPrimary,
),
],
minFontSize: 10,
maxLines: 2,
textAlign: TextAlign.center,
),
),
),
],
Expand Down
Loading