Scroll bar and dictionary fixes

arianneorpilla · May 30, 2021 · fca6cb0 · fca6cb0
1 parent 99a1b3d
commit fca6cb0
Show file tree

Hide file tree

Showing 9 changed files with 284 additions and 268 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 <p align="center">A mobile video player and card creation toolkit tailored for language learners.</p>
 
 <p align="center" style="margin:0"><b>Latest GitHub Release:<br>
-<a href="https://github.com/lrorpilla/jidoujisho/releases/tag/0.17.3-beta">0.17.3-beta 🇯🇵 → 🇬🇧</a><br>
+<a href="https://github.com/lrorpilla/jidoujisho/releases/tag/0.17.4-beta">0.17.4-beta 🇯🇵 → 🇬🇧</a><br>
 <a href="https://github.com/lrorpilla/jidoujisho/releases/tag/0.16.7-beta-kren">0.16.7-beta 🇰🇷 → 🇬🇧</a></b><br>
 
 <p align="center" style="margin:0"><b>Release Archive:<br>
@@ -25,7 +25,7 @@
   <a href="https://github.com/lrorpilla/jidoujisho/releases/tag/0.14.2-beta">0.14</a> ·
   <a href="https://github.com/lrorpilla/jidoujisho/releases/tag/0.15.8-beta">0.15</a> ·
   <a href="https://github.com/lrorpilla/jidoujisho/releases/tag/0.16.7-beta">0.16</a> · 
-  <a href="https://github.com/lrorpilla/jidoujisho/releases/tag/0.17.3-beta">0.17</a>
+  <a href="https://github.com/lrorpilla/jidoujisho/releases/tag/0.17.4-beta">0.17</a>
 </b></p>
 
 # 📚 Uninterrupted language immersion at your fingertips

diff --git a/lib/dictionary.dart b/lib/dictionary.dart
@@ -205,16 +205,16 @@ DictionaryEntry getEntryFromJishoResult(JishoResult result, String searchTerm) {
     String term = word.word;
     String reading = word.reading;
 
-    if (!hasDuplicateReading(exportTerm, term)) {
-      exportTerm = "$exportTerm$term; ";
+    if (term == null) {
+      exportTerm += "";
+    } else {
+      if (!hasDuplicateReading(exportTerm, term)) {
+        exportTerm = "$exportTerm$term; ";
+      }
     }
     if (!hasDuplicateReading(exportReadings, reading)) {
       exportReadings = "$exportReadings$reading; ";
     }
-
-    if (term == null) {
-      exportTerm = "";
-    }
   });
 
   if (exportReadings.isNotEmpty) {
@@ -575,9 +575,9 @@ DictionaryEntry getEntryFromGooElement(
   }
   meaning = meaning.trim();
 
-  print(word);
-  print(reading);
-  print(meaning);
+  // print(word);
+  // print(reading);
+  // print(meaning);
 
   DictionaryEntry singleEntry = DictionaryEntry(
     word: word,

diff --git a/lib/globals.dart b/lib/globals.dart
@@ -33,5 +33,6 @@ Map<String, AsyncMemoizer> gMetadataCache = {};
 List<DictionaryEntry> gKanjiumDictionary;
 List<DictionaryEntry> gCustomDictionary;
 Fuzzy gCustomDictionaryFuzzy;
+ScrollController gCurrentScrollbar;
 
 ValueNotifier<bool> gPlayPause = ValueNotifier<bool>(true);