Git-Mirrors/veilidchat
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilidchat.git synced 2024-10-01 06:55:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Christien Rioux 2023-10-10 09:55:15 -04:00
parent dd79d50355
commit 5bc7d68552
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/pages/main_pager/main_pager.dart
View File

@ -154,6 +154,10 @@ class MainPagerState extends ConsumerState<MainPager>
Widget _newContactInvitationBottomSheetBuilder( Widget _newContactInvitationBottomSheetBuilder(
// ignore: prefer_expression_function_bodies // ignore: prefer_expression_function_bodies
BuildContext context) { BuildContext context) {
final theme = Theme.of(context);
final textTheme = theme.textTheme;
final scale = theme.extension<ScaleScheme>()!;
return KeyboardListener( return KeyboardListener(
focusNode: FocusNode(), focusNode: FocusNode(),
onKeyEvent: (ke) { onKeyEvent: (ke) {
@ -165,37 +169,40 @@ class MainPagerState extends ConsumerState<MainPager>
height: 200, height: 200,
child: Column(children: [ child: Column(children: [
Text(translate('accounts_menu.invite_contact'), Text(translate('accounts_menu.invite_contact'),
style: Theme.of(context).textTheme.titleMedium) style: textTheme.titleMedium)
.paddingAll(8), .paddingAll(8),
Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
Column(mainAxisAlignment: MainAxisAlignment.center, children: [ Column(children: [
IconButton( IconButton(
onPressed: () async { onPressed: () async {
Navigator.pop(context); Navigator.pop(context);
await SendInviteDialog.show(context); await SendInviteDialog.show(context);
}, },
iconSize: 64, iconSize: 64,
icon: const Icon(Icons.contact_page)), icon: const Icon(Icons.contact_page),
color: scale.primaryScale.background),
Text(translate('accounts_menu.create_invite')) Text(translate('accounts_menu.create_invite'))
]), ]),
Column(mainAxisAlignment: MainAxisAlignment.center, children: [ Column(children: [
IconButton( IconButton(
onPressed: () async { onPressed: () async {
Navigator.pop(context); Navigator.pop(context);
await ScanInviteDialog.show(context); await ScanInviteDialog.show(context);
}, },
iconSize: 64, iconSize: 64,
icon: const Icon(Icons.qr_code_scanner)), icon: const Icon(Icons.qr_code_scanner),
color: scale.primaryScale.background),
Text(translate('accounts_menu.scan_invite')) Text(translate('accounts_menu.scan_invite'))
]), ]),
Column(mainAxisAlignment: MainAxisAlignment.center, children: [ Column(children: [
IconButton( IconButton(
onPressed: () async { onPressed: () async {
Navigator.pop(context); Navigator.pop(context);
await PasteInviteDialog.show(context); await PasteInviteDialog.show(context);
}, },
iconSize: 64, iconSize: 64,
icon: const Icon(Icons.paste)), icon: const Icon(Icons.paste),
color: scale.primaryScale.background),
Text(translate('accounts_menu.paste_invite')) Text(translate('accounts_menu.paste_invite'))
]) ])
]).expanded() ]).expanded()
@ -288,7 +295,7 @@ class MainPagerState extends ConsumerState<MainPager>
floatingActionButton: BottomSheetActionButton( floatingActionButton: BottomSheetActionButton(
shape: const RoundedRectangleBorder( shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(14))), borderRadius: BorderRadius.all(Radius.circular(14))),
//foregroundColor: scale.secondaryScale.text, foregroundColor: scale.secondaryScale.text,
backgroundColor: scale.secondaryScale.hoverBorder, backgroundColor: scale.secondaryScale.hoverBorder,
builder: (context) => Icon( builder: (context) => Icon(
_fabIconList[_currentPage], _fabIconList[_currentPage],

12
lib/tools/radix_generator.dart
View File

@ -537,9 +537,15 @@ ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {
final colorScheme = _radixColorScheme(brightness, radix); final colorScheme = _radixColorScheme(brightness, radix);
final scaleScheme = radix.toScale(); final scaleScheme = radix.toScale();
return ThemeData.from( final themeData = ThemeData.from(
colorScheme: colorScheme, textTheme: textTheme, useMaterial3: true) colorScheme: colorScheme, textTheme: textTheme, useMaterial3: true);
.copyWith(extensions: <ThemeExtension<dynamic>>[ return themeData.copyWith(
bottomSheetTheme: themeData.bottomSheetTheme.copyWith(
elevation: 0,
modalElevation: 0,
shape:
RoundedRectangleBorder(borderRadius: BorderRadius.circular(16))),
extensions: <ThemeExtension<dynamic>>[
scaleScheme, scaleScheme,
]); ]);
} }