Merge pull request #169 from mumu-lhl/switch-show-not-found-words

feat: add option to switch show not found words
mumu-lhl · Feb 7, 2025 · 2c018c1 · 2c018c1
2 parents fb47435 + 4624fa4
commit 2c018c1
Show file tree

Hide file tree

Showing 17 changed files with 227 additions and 93 deletions.
diff --git a/lib/database/dictionary.dart b/lib/database/dictionary.dart
@@ -81,6 +81,12 @@ class DictionaryDatabase extends _$DictionaryDatabase {
           ..limit(20))
         .get();
   }
+
+  Future<bool> wordExist(String word) async {
+    final result =
+        await (select(dictionary)..where((u) => u.key.isValue(word))).get();
+    return result.isNotEmpty;
+  }
 }
 
 @TableIndex(name: "idx_data", columns: {#key})

diff --git a/lib/dictionary.dart b/lib/dictionary.dart
@@ -161,6 +161,9 @@ class Mdict {
 
     final alias = await dictionaryListDao.getAlias(id);
     title = alias ?? reader.header["Title"] ?? basename(path);
+    if (title.isEmpty) {
+      title = basename(path);
+    }
 
     if (Platform.isWindows) {
       await _startServer();

diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -61,5 +61,6 @@
   "notification": "Benachrichtigung",
   "moreOptionsButton": "Mehr Optionen Schaltfläche",
   "titleAlias": "Titel Alias",
-  "skipTaggedWord": "Markiertes Wort überspringen"
+  "skipTaggedWord": "Markiertes Wort überspringen",
+  "showNotFoundWord": "Nicht gefundene Wörter anzeigen"
 }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -123,5 +123,7 @@
   "titleAlias": "Title Alias",
   "@titleAlias": {},
   "skipTaggedWord": "Skip Tagged Word",
-  "@skipTaggedWord": {}
+  "@skipTaggedWord": {},
+  "showNotFoundWord": "Show Not Found Word",
+  "@showNotFoundWord": {}
 }
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
@@ -61,5 +61,6 @@
   "notification": "اعلان",
   "moreOptionsButton": "دکمه گزینه‌های بیشتر",
   "titleAlias": "عنوان مستعار",
-  "skipTaggedWord": "رد شدن از کلمه تگ شده"
+  "skipTaggedWord": "رد شدن از کلمه تگ شده",
+  "showNotFoundWord": "نمایش کلمات پیدا نشده"
 }
diff --git a/lib/l10n/app_nb.arb b/lib/l10n/app_nb.arb
@@ -61,5 +61,6 @@
   "notification": "Varsling",
   "moreOptionsButton": "Flere alternativer-knapp",
   "titleAlias": "Tittel Alias",
-  "skipTaggedWord": "Hopp over merket ord"
+  "skipTaggedWord": "Hopp over merket ord",
+  "showNotFoundWord": "Vis ord som ikke ble funnet"
 }
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
@@ -61,5 +61,6 @@
   "notification": "Уведомление",
   "moreOptionsButton": "Кнопка дополнительных параметров",
   "titleAlias": "Псевдоним заголовка",
-  "skipTaggedWord": "Пропускать помеченное слово"
+  "skipTaggedWord": "Пропускать помеченное слово",
+  "showNotFoundWord": "Показывать ненайденные слова"
 }
diff --git a/lib/l10n/app_sc.arb b/lib/l10n/app_sc.arb
@@ -61,5 +61,6 @@
   "notification": "Notìfica",
   "moreOptionsButton": "Butone de àteras optziones",
   "titleAlias": "Alias de tìtulu",
-  "skipTaggedWord": "Iscarta sa প্যারau প্যারau ডে প্যারau"
+  "skipTaggedWord": "Iscarta sa প্যারau প্যারau ডে প্যারau",
+  "showNotFoundWord": "Mustra sas paràulas non atzapadas"
 }
diff --git a/lib/l10n/app_ta.arb b/lib/l10n/app_ta.arb
@@ -61,5 +61,6 @@
   "notification": "அறிவிப்பு",
   "moreOptionsButton": "மேலும் விருப்பங்கள் பொத்தான்",
   "titleAlias": "தலைப்பு மாற்றுப்பெயர்",
-  "skipTaggedWord": "குறிச்சொல்லிடப்பட்ட வார்த்தையைத் தவிர்க்கவும்"
+  "skipTaggedWord": "குறிச்சொல்லிடப்பட்ட வார்த்தையைத் தவிர்க்கவும்",
+  "showNotFoundWord": "காணப்படாத வார்த்தைகளைக் காட்டு"
 }
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
@@ -61,5 +61,6 @@
   "notification": "通知",
   "moreOptionsButton": "更多选项按钮",
   "titleAlias": "标题别名",
-  "skipTaggedWord": "跳过有标签的单词"
+  "skipTaggedWord": "跳过有标签的单词",
+  "showNotFoundWord": "显示未找到的单词"
 }
diff --git a/lib/l10n/app_zh_HK.arb b/lib/l10n/app_zh_HK.arb
@@ -61,5 +61,6 @@
   "notification": "通知",
   "moreOptionsButton": "更多選項按鈕",
   "titleAlias": "標題別名",
-  "skipTaggedWord": "跳過有標籤的字詞"
+  "skipTaggedWord": "跳過有標籤的字詞",
+  "showNotFoundWord": "顯示未找到的字詞"
 }
diff --git a/lib/l10n/app_zh_TW.arb b/lib/l10n/app_zh_TW.arb
@@ -61,5 +61,6 @@
   "notification": "通知",
   "moreOptionsButton": "更多選項按鈕",
   "titleAlias": "標題別名",
-  "skipTaggedWord": "跳過有標籤的字詞"
+  "skipTaggedWord": "跳過有標籤的字詞",
+  "showNotFoundWord": "顯示未找到的字詞"
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -52,6 +52,7 @@ void main() async {
     "notification",
     "showMoreOptionsButton",
     "skipTaggedWord",
+    "showNotFound",
   }));
 
   int? groupId = prefs.getInt("currentDictionaryGroupId");

diff --git a/lib/pages/main/settings.dart b/lib/pages/main/settings.dart
@@ -263,6 +263,7 @@ class SettingsScreen extends StatelessWidget {
         const SearchbarLocationSelector(),
         const DrawerIconSwitch(),
         const MoreOptionsButtonSwitch(),
+        const NotFoundSwitch(),
         const Divider(),
         const AutoExport(),
         const Export(),
@@ -358,6 +359,13 @@ class MoreOptionsButtonSwitch extends StatefulWidget {
       _MoreOptionsButtonSwitchState();
 }
 
+class NotFoundSwitch extends StatefulWidget {
+  const NotFoundSwitch({super.key});
+
+  @override
+  State<NotFoundSwitch> createState() => _NotFoundSwitchState();
+}
+
 class _MoreOptionsButtonSwitchState extends State<MoreOptionsButtonSwitch> {
   @override
   Widget build(BuildContext context) {
@@ -376,6 +384,23 @@ class _MoreOptionsButtonSwitchState extends State<MoreOptionsButtonSwitch> {
   }
 }
 
+class _NotFoundSwitchState extends State<NotFoundSwitch> {
+  @override
+  Widget build(BuildContext context) {
+    return SwitchListTile(
+      title: Text(AppLocalizations.of(context)!.showNotFoundWord),
+      value: settings.showNotFound,
+      onChanged: (value) async {
+        await prefs.setBool("showNotFound", value);
+        setState(() {
+          settings.showNotFound = value;
+        });
+      },
+      secondary: const Icon(Icons.book),
+    );
+  }
+}
+
 class _LanguageSelectorState extends State<LanguageSelector> {
   @override
   Widget build(BuildContext context) {

diff --git a/lib/pages/manage_dictionaries/main.dart b/lib/pages/manage_dictionaries/main.dart
@@ -417,7 +417,10 @@ class _ManageDictionariesState extends State<ManageDictionaries> {
             );
           },
           child: CheckboxListTile(
-            title: Text(dictManager.dicts[dictionary.id]!.title),
+            title: Text(dictionary.alias ??
+                (dictManager.contain(dictionary.id)
+                    ? dictManager.dicts[dictionary.id]!.title
+                    : basename(dictionary.path))),
             value: dictManager.contain(dictionary.id),
             secondary: ReorderableDragStartListener(
                 index: index,