Merge pull request #69 from mumu-lhl/refactor/69

Author: mumu-lhl

lib/dictionary.dart

@@ -95,6 +95,29 @@ class _Dict {
     await dictionaryList.updateFont(id!, path);
   }
 
+  Future<String> readWord(String word) async {
+    late DictionaryData data;
+    try {
+      data = await db!.getOffset(word);
+    } catch (e) {
+      data = await db!.getOffset(word.toLowerCase());
+    }
+
+    String content = await dict.reader!.readOne(data.blockOffset,
+        data.startOffset, data.endOffset, data.compressedSize);
+
+    if (content.startsWith("@@@LINK=")) {
+      // 8: remove @@@LINK=
+      // content.length - 3: remove \r\n\x00
+      data = await db!
+          .getOffset(content.substring(8, content.length - 3).trimRight());
+      content = await dict.reader!.readOne(data.blockOffset, data.startOffset,
+          data.endOffset, data.compressedSize);
+    }
+
+    return content;
+  }
+
   Future<void> removeDictionary(String path) async {
     reader = null;
     readerResource = null;
@@ -203,20 +226,4 @@ class _Dict {
       readerResource = null;
     }
   }
-
-  Future<String> readWord(DictionaryData word) async {
-    String content = await dict.reader!.readOne(word.blockOffset,
-        word.startOffset, word.endOffset, word.compressedSize);
-
-    if (content.startsWith("@@@LINK=")) {
-      // 8: remove @@@LINK=
-      // content.length - 3: remove \r\n\x00
-      word = await dict.db!
-          .getOffset(content.substring(8, content.length - 3).trimRight());
-      content = await dict.reader!.readOne(word.blockOffset, word.startOffset,
-          word.endOffset, word.compressedSize);
-    }
-
-    return content;
-  }
 }

lib/main.dart

@@ -51,17 +51,8 @@ void main() async {
     if (call.method == "processText") {
       final text = call.arguments as String;
 
-      late DictionaryData word;
-      try {
-        word = await dict.db!.getOffset(text);
-      } catch (e) {
-        word = await dict.db!.getOffset(text.toLowerCase());
-      }
-
-      final content = await dict.readWord(word);
-
       // Navigate to search result with the text
-      _router.go("/word", extra: {"content": content, "word": text});
+      _router.go("/word", extra: {"word": text});
     }
   });
 
@@ -86,12 +77,11 @@ final _router = GoRouter(
         path: "/word",
         builder: (context, state) {
           final extra = state.extra as Map<String, String>;
-          return WebviewDisplay(
-            content: extra["content"]!,
-            word: extra["word"]!,
-            description: extra.containsKey("description"),
-          );
+          return WebviewDisplay(word: extra["word"]!);
         }),
+    GoRoute(
+        path: "/description",
+        builder: (context, state) => const WebviewDisplayDescription()),
     GoRoute(
         path: "/settings/dictionaries",
         builder: (context, state) => const ManageDictionaries()),

lib/pages/main/home.dart

@@ -66,12 +66,7 @@ class SearchResult extends StatelessWidget {
             },
           ),
           onTap: () async {
-            final content = await dict.readWord(word);
-
-            if (context.mounted) {
-              context
-                  .push("/word", extra: {"content": content, "word": word.key});
-            }
+            context.push("/word", extra: {"word": word.key});
           }));
     }
 

lib/pages/manage_dictionaries/main.dart

@@ -234,11 +234,7 @@ class _ManageDictionariesState extends State<ManageDictionaries> {
             highlightElevation: 0,
             child: Icon(Icons.info),
             onPressed: () {
-              context.push("/word", extra: {
-                "content": dict.reader!.header["Description"]!,
-                "word": "",
-                "description": "1",
-              });
+              context.push("/description");
             },
           );
           return Column(

lib/pages/webview_display.dart

@@ -118,23 +118,7 @@ class WebView extends StatelessWidget {
             id: 2,
             title: locale.lookup,
             action: () async {
-              try {
-                final word = await dict.db!.getOffset(selectedText);
-                final content = await dict.readWord(word);
-
-                if (context.mounted) {
-                  context.push("/word",
-                      extra: {"content": content, "word": word.key});
-                }
-              } catch (e) {
-                final snackBar = SnackBar(
-                  content: Text(locale.notFound),
-                  duration: const Duration(seconds: 1),
-                );
-                if (context.mounted) {
-                  ScaffoldMessenger.of(context).showSnackBar(snackBar);
-                }
-              }
+              context.push("/word", extra: {"word": selectedText});
             }),
         ContextMenuItem(
             id: 3,
@@ -188,41 +172,57 @@ document.body.style.fontFamily = 'Custom Font';
 }
 
 class WebviewDisplay extends StatelessWidget {
-  final String content;
   final String word;
-  final bool description;
 
-  const WebviewDisplay(
-      {super.key,
-      required this.content,
-      required this.word,
-      required this.description});
+  const WebviewDisplay({super.key, required this.word});
 
   @override
   Widget build(BuildContext context) {
-    Widget? floatingActionButton;
-    late String html;
-    if (description) {
-      html = HtmlUnescape().convert(content);
-    } else {
-      html = content;
-      floatingActionButton = Button(word: word);
-    }
+    final content = dict.readWord(word);
+
+    return Scaffold(
+        appBar: AppBar(leading: BackButton(
+          onPressed: () {
+            if (context.canPop()) {
+              context.pop();
+            } else {
+              // When opened from context menu
+              SystemChannels.platform.invokeMethod('SystemNavigator.pop');
+            }
+          },
+        )),
+        floatingActionButton: Button(word: word),
+        body: FutureBuilder(
+            future: content,
+            builder: (context, snapshot) {
+              if (snapshot.hasData) {
+                return WebView(content: snapshot.data!);
+              } else if (snapshot.hasError) {
+                return Center(
+                    child: Text(AppLocalizations.of(context)!.notFound,
+                        style: Theme.of(context).textTheme.titleLarge));
+              } else {
+                return const Center(child: CircularProgressIndicator());
+              }
+            }));
+  }
+}
+
+class WebviewDisplayDescription extends StatelessWidget {
+  const WebviewDisplayDescription({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    String html = dict.reader!.header["Description"]!;
+    html = HtmlUnescape().convert(html);
 
     return Scaffold(
-      appBar: AppBar(leading: BackButton(
-        onPressed: () {
-          if (context.canPop()) {
+        appBar: AppBar(leading: BackButton(
+          onPressed: () {
             context.pop();
-          } else {
-            // When opened from context menu
-            SystemChannels.platform.invokeMethod('SystemNavigator.pop');
-          }
-        },
-      )),
-      floatingActionButton: floatingActionButton,
-      body: WebView(content: html),
-    );
+          },
+        )),
+        body: WebView(content: html));
   }
 }