Merge branch 'debugging' into 'main'

Debugging

See merge request veilid/veilidchat!17

.gitignore

@@ -32,6 +32,15 @@ migrate_working_dir/
 .pub/
 /build/
 
+# Flutter generated files
+# Not doing this at this time: https://stackoverflow.com/questions/56110386/should-i-commit-generated-code-in-flutter-dart-to-vcs
+# *.g.dart
+# *.freezed.dart
+# *.pb.dart
+# *.pbenum.dart
+# *.pbjson.dart
+# *.pbserver.dart
+
 # Symbolication related
 app.*.symbols
 

build.bat

@@ -0,0 +1,8 @@
+@echo off
+dart run build_runner build --delete-conflicting-outputs
+
+pushd lib
+protoc --dart_out=proto -I veilid_support\proto -I veilid_support\dht_support\proto -I proto veilidchat.proto
+protoc --dart_out=proto -I veilid_support\proto -I veilid_support\dht_support\proto dht.proto
+protoc --dart_out=proto -I veilid_support\proto veilid.proto
+popd

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-dart run build_runner build
+dart run build_runner build --delete-conflicting-outputs
 
 pushd lib > /dev/null
 protoc --dart_out=proto -I veilid_support/proto -I veilid_support/dht_support/proto -I proto veilidchat.proto

lib/components/scan_invite_dialog.dart

@@ -369,10 +369,10 @@ class ScanInviteDialogState extends ConsumerState<ScanInviteDialog> {
                   : () async {
                       final inviteData = await pasteQRImage(context);
                       if (inviteData != null) {
+                        await validateInviteData(inviteData: inviteData);
                         setState(() {
                           scanned = true;
                         });
-                        await validateInviteData(inviteData: inviteData);
                       }
                     },
               child: Text(translate('scan_invite_dialog.paste'))),

lib/main.dart

@@ -27,28 +27,29 @@ void main() async {
   // Ansi colors
   ansiColorDisabled = false;
 
-  // Logs
+  // Catch errors
-  initLoggy();
+  await runZonedGuarded(() async {
+    // Logs
+    initLoggy();
 
-  // Prepare theme
+    // Prepare theme
-  WidgetsFlutterBinding.ensureInitialized();
+    WidgetsFlutterBinding.ensureInitialized();
-  final themeService = await ThemeService.instance;
+    final themeService = await ThemeService.instance;
-  final initTheme = themeService.initial;
+    final initTheme = themeService.initial;
 
-  // Manage window on desktop platforms
+    // Manage window on desktop platforms
-  await WindowControl.initialize();
+    await WindowControl.initialize();
 
-  // Make localization delegate
+    // Make localization delegate
-  final delegate = await LocalizationDelegate.create(
+    final delegate = await LocalizationDelegate.create(
-      fallbackLocale: 'en_US', supportedLocales: ['en_US']);
+        fallbackLocale: 'en_US', supportedLocales: ['en_US']);
-  await initializeDateFormatting();
+    await initializeDateFormatting();
 
-  // Start up Veilid and Veilid processor in the background
+    // Start up Veilid and Veilid processor in the background
-  unawaited(initializeVeilid());
+    unawaited(initializeVeilid());
 
-  // Run the app
+    // Run the app
-  // Hot reloads will only restart this part, not Veilid
+    // Hot reloads will only restart this part, not Veilid
-  runZonedGuarded(() {
     runApp(ProviderScope(
         observers: const [StateLogger()],
         child: LocalizedApp(delegate, VeilidChatApp(theme: initTheme))));

lib/pages/main_pager/main_pager.dart

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

lib/router/router_notifier.g.dart

@@ -6,7 +6,7 @@ part of 'router_notifier.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$routerNotifierHash() => r'5a3527e3890f0746db4cbe051d453b89e5809989';
+String _$routerNotifierHash() => r'6f52ed95f090f2d198d358e7526a91511c0a61e5';
 
 /// See also [RouterNotifier].
 @ProviderFor(RouterNotifier)

lib/tools/radix_generator.dart

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