設定のインポート・エクスポートでダイアログを閉じられるように

shiosyakeyakini-info · Sep 27, 2023 · d83280b · d83280b
1 parent ab36416
commit d83280b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/lib/repository/import_export_repository.dart b/lib/repository/import_export_repository.dart
@@ -24,17 +24,16 @@ class ImportExportRepository extends ChangeNotifier {
   ImportExportRepository(this.reader);
 
   Future<void> import(BuildContext context, Account account) async {
-    final folder = await showDialog<DriveFolder>(
-      barrierDismissible: false,
+    final result = await showDialog<FolderResult>(
       context: context,
-      builder: (context2) => WillPopScope(
-        onWillPop: () async => false,
-        child: FolderSelectDialog(
-          account: account,
-          fileShowTarget: const ["miria.json", "miria.json.unknown"],
-        ),
+      builder: (context2) => FolderSelectDialog(
+        account: account,
+        fileShowTarget: const ["miria.json", "miria.json.unknown"],
       ),
     );
+    if (result == null) return;
+
+    final folder = result.folder;
 
     Iterable<DriveFile> alreadyExists =
         await reader(misskeyProvider(account)).drive.files.find(
@@ -53,6 +52,7 @@ class ImportExportRepository extends ChangeNotifier {
             ),
           );
 
+      if (!context.mounted) return;
       if (alreadyExists.isEmpty) {
         await SimpleMessageDialog.show(context, "ここにMiriaの設定ファイルあれへんかったわ");
         return;
@@ -121,17 +121,16 @@ class ImportExportRepository extends ChangeNotifier {
   }
 
   Future<void> export(BuildContext context, Account account) async {
-    final folder = await showDialog<DriveFolder>(
-      barrierDismissible: false,
+    final result = await showDialog<FolderResult>(
       context: context,
-      builder: (context2) => WillPopScope(
-        onWillPop: () async => false,
-        child: FolderSelectDialog(
-          account: account,
-          fileShowTarget: const ["miria.json", "miria.json.unknown"],
-        ),
+      builder: (context2) => FolderSelectDialog(
+        account: account,
+        fileShowTarget: const ["miria.json", "miria.json.unknown"],
       ),
     );
+    if (result == null) return;
+
+    final folder = result.folder;
 
     final alreadyExists =
         await reader(misskeyProvider(account)).drive.files.find(

diff --git a/lib/view/settings_page/import_export_page/folder_select_dialog.dart b/lib/view/settings_page/import_export_page/folder_select_dialog.dart
@@ -6,6 +6,12 @@ import 'package:miria/view/common/futable_list_builder.dart';
 import 'package:miria/view/common/pushable_listview.dart';
 import 'package:misskey_dart/misskey_dart.dart';
 
+class FolderResult {
+  const FolderResult(this.folder);
+
+  final DriveFolder? folder;
+}
+
 class FolderSelectDialog extends ConsumerStatefulWidget {
   final Account account;
   final List<String>? fileShowTarget;
@@ -123,7 +129,7 @@ class FolderSelectDialogState extends ConsumerState<FolderSelectDialog> {
       actions: [
         ElevatedButton(
           onPressed: () {
-            Navigator.of(context).pop(path.lastOrNull);
+            Navigator.of(context).pop(FolderResult(path.lastOrNull));
           },
           child: const Text("このフォルダーに保存する"),
         )