Material Design 3 migration part 2

Author: luckyrat

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -44,6 +44,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES"
       systemAttachmentLifetime = "keepAlways">
       <MacroExpansion>
@@ -72,6 +73,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

lib/extension_methods.dart

@@ -70,6 +70,10 @@ extension KdbxFileKDF on KdbxFile {
     }
     return false;
   }
+
+  List<String> get trimmedTags {
+    return tags.map((tag) => tag.trim()).where((tag) => tag.isNotEmpty).toSet().toList(growable: false);
+  }
 }
 
 extension KdbxEntryColor on KdbxEntry {

lib/vault_backend/jwt.dart

@@ -90,7 +90,7 @@ class JWT {
     try {
       final keyPair = jwt.JWTKey.fromJWK(jwk);
       // If this does not throw an exception then we know the signature is valid
-      final _ = jwt.JWT.verify(sig, keyPair);
+      final _ = jwt.JWT.verify(sig, keyPair, checkHeaderType: false);
       return ClientVerificationResult(claim: claim, audience: claim.aud);
     } on jwt.JWTExpiredException {
       l.w('JWT expired. Token should therefore be ignored.');

lib/widgets/account_email_change.dart

@@ -200,6 +200,7 @@ class _AccountEmailChangeWidgetState extends State<AccountEmailChangeWidget> {
                       ),
                     OverflowBar(
                       alignment: MainAxisAlignment.end,
+                      spacing: 8.0,
                       children: [
                         OutlinedButton(
                           onPressed: changing

lib/widgets/autofill_save.dart

@@ -114,7 +114,7 @@ class _AutofillSaveWidgetState extends State<AutofillSaveWidget> with TraceableC
           return EntryWidget(
             key: ValueKey('autofillSaveDetails'),
             savingViaAutofill: true,
-            endEditing: (bool keepChanges) => onEndEditing(keepChanges, vaultCubit, vault.files.current.tags),
+            endEditing: (bool keepChanges) => onEndEditing(keepChanges, vaultCubit, vault.files.current.trimmedTags),
             allCustomIcons: vault.files.current.body.meta.customIcons.map(
               (key, value) =>
                   MapEntry(value, Image.memory(value.data, fit: BoxFit.contain, filterQuality: FilterQuality.low)),

lib/widgets/bottom.dart

@@ -274,7 +274,7 @@ class VaultStatusIconWidget extends StatelessWidget {
                 onPressed: () async {
                   await DialogUtils.showSimpleAlertDialog(
                     context,
-                    null,
+                    _buildTitle(state, str).data,
                     _buildDescription(state, str),
                     routeAppend: 'vaultStatusExplanation',
                   );
@@ -303,6 +303,26 @@ class VaultStatusIconWidget extends StatelessWidget {
     return Icon(Icons.device_unknown);
   }
 
+  Text _buildTitle(VaultState state, S str) {
+    if (state is VaultUploadCredentialsRequired) {
+      return Text(str.vaultStatusActionNeeded);
+    } else if (state is VaultSaving && state.remotely) {
+      return Text(str.vaultStatusUploading);
+    } else if (state is VaultSaving && state.locally) {
+      return Text(str.vaultStatusSaving);
+    } else if (state is VaultRefreshing) {
+      return Text(str.vaultStatusRefreshing);
+    } else if (state is VaultBackgroundError) {
+      return Text(str.vaultStatusError);
+    } else if (state is VaultLoaded) {
+      if (state.vault.hasPendingChanges) {
+        return Text(str.vaultStatusSaveNeeded);
+      }
+      return Text(str.vaultStatusLoaded);
+    }
+    return Text(str.vaultStatusUnknownState);
+  }
+
   String _buildDescription(VaultState state, S str) {
     if (state is VaultUploadCredentialsRequired) {
       return str.vaultStatusDescPasswordChanged;

lib/widgets/change_subscription.dart

@@ -135,7 +135,7 @@ class _ChangeSubscriptionWidgetState extends State<ChangeSubscriptionWidget> {
               alignment: Alignment.center,
               child: OutlinedButton(
                 onPressed: () async => await DialogUtils.openUrl('https://kee.pm/keevault/delete-account/'),
-                style: OutlinedButton.styleFrom(backgroundColor: theme.buttonTheme.colorScheme!.error),
+                style: OutlinedButton.styleFrom(foregroundColor: theme.buttonTheme.colorScheme!.error),
                 child: Text(str.deleteAccount),
               ),
             ),

lib/widgets/entry.dart

@@ -15,6 +15,7 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 
 import 'package:keevault/cubit/entry_cubit.dart';
 import 'package:keevault/cubit/vault_cubit.dart';
+import 'package:keevault/extension_methods.dart';
 import 'package:keevault/logging/logger.dart';
 import 'package:keevault/model/entry.dart';
 import 'package:keevault/model/field.dart';
@@ -278,12 +279,8 @@ class EntryWidget extends StatelessWidget {
                   key: key,
                   appBar: savingViaAutofill
                       ? AppBar(
-                          title: Image(
-                            image: AssetImage('assets/vault.png'),
-                            excludeFromSemantics: true,
-                            height: 32,
-                            color: Color.fromARGB(0xFF, 0x1A, 0x46, 0x6B),
-                          ),
+                          backgroundColor: theme.scaffoldBackgroundColor,
+                          title: Image(image: AssetImage('assets/vault.png'), excludeFromSemantics: true, height: 32),
                           centerTitle: true,
                           toolbarHeight: 48,
                           leading: IconButton(
@@ -494,7 +491,7 @@ class EntryWidget extends StatelessWidget {
                                     ),
                                     LabelsWidget(
                                       tags: entry.tags,
-                                      otherKnownTags: loadedState.vault.files.current.tags
+                                      otherKnownTags: loadedState.vault.files.current.trimmedTags
                                           .map((t) => Tag(t, true))
                                           .where((t) => !entry.tags.any((et) => et.lowercase == t.lowercase))
                                           .toList(),

lib/widgets/entry_list.dart

@@ -242,7 +242,7 @@ class EntryListItemWidget extends StatelessWidget {
                           final entryCubit = BlocProvider.of<EntryCubit>(context);
                           entryCubit.revertToHistoryEntry(entry, index);
                           final filterCubit = BlocProvider.of<FilterCubit>(context);
-                          filterCubit.reFilter(entry.file!.tags, entry.file!.body.rootGroup);
+                          filterCubit.reFilter(entry.file!.trimmedTags, entry.file!.body.rootGroup);
                           close(returnValue: false);
                           //TODO:f: Maybe one day we can automatically reopen the container with the updated information?
                           //   BlocProvider.of<EntryCubit>(context).startEditing(entry);
@@ -252,7 +252,7 @@ class EntryListItemWidget extends StatelessWidget {
                           final entryCubit = BlocProvider.of<EntryCubit>(context);
                           entryCubit.removeHistoryEntry(entry, index);
                           final filterCubit = BlocProvider.of<FilterCubit>(context);
-                          filterCubit.reFilter(entry.file!.tags, entry.file!.body.rootGroup);
+                          filterCubit.reFilter(entry.file!.trimmedTags, entry.file!.body.rootGroup);
                           close(returnValue: false);
                         },
                       );
@@ -271,7 +271,7 @@ class EntryListItemWidget extends StatelessWidget {
                         final filterCubit = BlocProvider.of<FilterCubit>(context);
                         await BlocProvider.of<InteractionCubit>(context).entrySaved();
                         await iam.showIfAppropriate(InAppMessageTrigger.entryChanged);
-                        filterCubit.reFilter(entry.file!.tags, entry.file!.body.rootGroup);
+                        filterCubit.reFilter(entry.file!.trimmedTags, entry.file!.body.rootGroup);
                         //TODO:f: A separate cubit to track state of ELIVMs might provide better performance and scroll position stability than recreating them all from scratch every time we re-filter?
                       } else {
                         entryCubit.endEditing(null);

lib/widgets/import_export.dart

@@ -99,6 +99,7 @@ class _ImportExportWidgetState extends State<ImportExportWidget> {
                     ),
                     OverflowBar(
                       alignment: MainAxisAlignment.end,
+                      spacing: 8.0,
                       children: [
                         FilledButton(onPressed: () => {_exportFreeKdbx(context)}, child: Text(str.export)),
                         FilledButton(