feat: add loading dialog when adding dictionaries

mumu-lhl · Jan 18, 2025 · a5b2110 · a5b2110
1 parent 569a6fe
commit a5b2110
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 25 deletions.
diff --git a/android/app/src/main/kotlin/org/eu/mumulhl/ciyue/MainActivity.kt b/android/app/src/main/kotlin/org/eu/mumulhl/ciyue/MainActivity.kt
@@ -14,6 +14,7 @@ import io.flutter.plugin.common.MethodChannel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.withContext
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.launch
 import java.io.File
@@ -67,6 +68,8 @@ class MainActivity : FlutterActivity() {
 
     private fun openDocumentTree(data: Intent?) {
         data?.data?.also { uri ->
+            methodChannel!!.invokeMethod("showLoadingDialog", null)
+
             val takeFlags: Int = Intent.FLAG_GRANT_READ_URI_PERMISSION
             applicationContext.contentResolver.takePersistableUriPermission(
                 uri, takeFlags
@@ -78,8 +81,7 @@ class MainActivity : FlutterActivity() {
             if (!cacheDir.exists()) {
                 cacheDir.mkdir()
             }
-            val targetFolder =
-                DocumentFileCompat.fromFile(applicationContext, cacheDir)!!
+            val targetFolder = DocumentFileCompat.fromFile(applicationContext, cacheDir)!!
 
             ioScope.launch {
                 documents.copyFolderTo(applicationContext,
@@ -98,19 +100,19 @@ class MainActivity : FlutterActivity() {
                             conflictedFiles: MutableList<FileConflict>,
                             action: FolderContentConflictAction
                         ) {
-                            val newSolution =
-                                ArrayList<FileConflict>(conflictedFiles.size)
+                            val newSolution = ArrayList<FileConflict>(conflictedFiles.size)
                             conflictedFiles.forEach {
-                                it.solution =
-                                    SingleFileConflictCallback.ConflictResolution.SKIP
+                                it.solution = SingleFileConflictCallback.ConflictResolution.SKIP
                             }
                             newSolution.addAll(conflictedFiles)
                             action.confirmResolution(newSolution)
-
                         }
-                    }).onCompletion {}.collect { _ -> }
+                    }).onCompletion {
+                     withContext(Dispatchers.Main) {
+                        methodChannel!!.invokeMethod("inputDirectory", null)
+                    }
+                }.collect { _ -> }
             }
-            methodChannel!!.invokeMethod("inputDirectory", null)
         }
     }
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -7,6 +7,7 @@ import "package:ciyue/pages/manage_dictionaries/main.dart";
 import "package:ciyue/pages/manage_dictionaries/settings_dictionary.dart";
 import "package:ciyue/pages/webview_display.dart";
 import "package:ciyue/settings.dart";
+import "package:ciyue/widget/loading_dialog.dart";
 import "package:drift/drift.dart";
 import "package:dynamic_color/dynamic_color.dart";
 import "package:flutter/material.dart";
@@ -43,7 +44,7 @@ Future<void> updateAllDictionaries() async {
   final cacheDir = Directory(
       join((await getApplicationCacheDirectory()).path, "dictionaries_cache"));
   final entities = await cacheDir.list().toList();
-  _addDictionaries(entities);
+  await _addDictionaries(entities);
 }
 
 void main() async {
@@ -66,13 +67,21 @@ void main() async {
   packageInfo = await PackageInfo.fromPlatform();
 
   platform.setMethodCallHandler((call) async {
-    if (call.method == "processText") {
-      final text = call.arguments as String;
-
-      // Navigate to search result with the text
-      _router.go("/word", extra: {"word": text});
-    } else if (call.method == "inputDirectory") {
-      updateAllDictionaries();
+    switch (call.method) {
+      case "processText":
+        final text = call.arguments as String;
+
+        // Navigate to search result with the text
+        _router.go("/word", extra: {"word": text});
+        break;
+      case "inputDirectory":
+        await updateAllDictionaries();
+        _router.pop();
+        updateManageDictionariesPage();
+        break;
+      case "showLoadingDialog":
+        showLoadingDialog(_navigatorKey.currentContext!);
+        break;
     }
   });
 
@@ -92,7 +101,9 @@ late final VoidCallback refreshAll;
 final WordbookDao wordbookDao = WordbookDao(mainDatabase);
 final WordbookTagsDao wordbookTagsDao = WordbookTagsDao(mainDatabase);
 
+final _navigatorKey = GlobalKey<NavigatorState>();
 final _router = GoRouter(
+  navigatorKey: _navigatorKey,
   routes: [
     GoRoute(
       path: "/",

diff --git a/lib/pages/manage_dictionaries/main.dart b/lib/pages/manage_dictionaries/main.dart
@@ -10,6 +10,8 @@ import "package:flutter_gen/gen_l10n/app_localizations.dart";
 import "package:go_router/go_router.dart";
 import "package:path/path.dart";
 
+late VoidCallback updateManageDictionariesPage;
+
 class ManageDictionaries extends StatefulWidget {
   const ManageDictionaries({super.key});
 
@@ -20,6 +22,13 @@ class ManageDictionaries extends StatefulWidget {
 class _ManageDictionariesState extends State<ManageDictionaries> {
   var dictionaries = dictionaryListDao.all();
 
+  @override
+  void initState() {
+    super.initState();
+
+    updateManageDictionariesPage = updateDictionaries;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -192,10 +201,9 @@ class _ManageDictionariesState extends State<ManageDictionaries> {
             }
           }
 
-          setState(() {
-            context.pop();
-            updateDictionaries();
-          });
+          if (context.mounted) context.pop();
+
+          updateDictionaries();
         }
       },
     );
@@ -287,9 +295,7 @@ class _ManageDictionariesState extends State<ManageDictionaries> {
                           await tmpDict.close();
                         }
 
-                        setState(() {
-                          updateDictionaries();
-                        });
+                        updateDictionaries();
 
                         if (context.mounted) context.pop();
                       },
@@ -364,6 +370,8 @@ class _ManageDictionariesState extends State<ManageDictionaries> {
   }
 
   void updateDictionaries() {
-    dictionaries = dictionaryListDao.all();
+    setState(() {
+      dictionaries = dictionaryListDao.all();
+    });
   }
 }