Merge pull request #667 from 4ster1sk/fix/tab-setting-freeze

タブ設定、設定のインポートでフリーズするのを修正
shiosyakeyakini-info · Nov 10, 2024 · b7ab5f7 · b7ab5f7
2 parents fe7b1c5 + 05071b7
commit b7ab5f7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/lib/repository/import_export_repository.dart b/lib/repository/import_export_repository.dart
@@ -108,8 +108,10 @@ class ImportExportRepository extends ChangeNotifier {
     await SimpleMessageDialog.show(context, S.of(context).importCompleted);
 
     if (!context.mounted) return;
-    context.router.removeWhere((route) => true);
-    await context.router.push(const SplashRoute());
+    await context.router.pushAndPopUntil(
+      const SplashRoute(),
+      predicate: (_) => false,
+    );
   }
 
   Future<void> export(BuildContext context, Account account) async {

diff --git a/lib/view/settings_page/account_settings_page/account_list.dart b/lib/view/settings_page/account_settings_page/account_list.dart
@@ -59,14 +59,10 @@ class AccountListPage extends ConsumerWidget {
             child: Padding(
               padding: const EdgeInsets.all(10),
               child: ElevatedButton(
-                onPressed: () async {
-                  final newState = ref.refresh(accountsProvider);
-                  print(newState);
-                  final router = context.router..removeWhere((route) => true);
-                  WidgetsBinding.instance.addPostFrameCallback((_) async {
-                    await router.push(const SplashRoute());
-                  });
-                },
+                onPressed: () async => await context.router.pushAndPopUntil(
+                  const SplashRoute(),
+                  predicate: (_) => false,
+                ),
                 child: Text(S.of(context).quitAccountSettings),
               ),
             ),

diff --git a/lib/view/settings_page/tab_settings_page/tab_settings_list_page.dart b/lib/view/settings_page/tab_settings_page/tab_settings_list_page.dart
@@ -78,10 +78,10 @@ class TabSettingsListPage extends ConsumerWidget {
             child: Padding(
               padding: const EdgeInsets.all(10),
               child: ElevatedButton(
-                onPressed: () async {
-                  context.router.removeWhere((route) => true);
-                  await context.router.push(const SplashRoute());
-                },
+                onPressed: () async => await context.router.pushAndPopUntil(
+                  const SplashRoute(),
+                  predicate: (_) => false,
+                ),
                 child: Text(S.of(context).apply),
               ),
             ),