fix: handle repeated words, bump flutter version (#10)

custom words added: - 気分
jeroen-meijer · Jul 29, 2020 · 6480c8f · 6480c8f
1 parent c99e5ae
commit 6480c8f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 10 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,7 +18,7 @@ jobs:
         uses: subosito/flutter-action@v1.3.0
         with:
           channel: beta
-          flutter-version: 1.20.0-7.2.pre
+          flutter-version: 1.20.0-7.3.pre
 
       - name: Install dependencies
         run: flutter pub get

diff --git a/.github/workflows/publish_web.yaml b/.github/workflows/publish_web.yaml
@@ -18,7 +18,7 @@ jobs:
         uses: subosito/flutter-action@v1.3.0
         with:
           channel: beta
-          flutter-version: 1.20.0-7.2.pre
+          flutter-version: 1.20.0-7.3.pre
 
       - name: Install app dependencies
         run: flutter pub get

diff --git a/app/assets/dicts/dict_ja.json b/app/assets/dicts/dict_ja.json
diff --git a/app/lib/backend/models/game.dart b/app/lib/backend/models/game.dart
@@ -87,7 +87,9 @@ class Game extends ChangeNotifier {
       validity = GuessValidity.invalidWord;
     }
 
-    final hasBeenGuessed = allGuessesByPlayerIndex.contains(query);
+    final hasBeenGuessed = allGuessesByPlayerIndex
+        .map((entry) => entry.right.query)
+        .contains(query);
     if (hasBeenGuessed) {
       _log(4, 'alreadyGuessed...');
       validity = GuessValidity.alreadyGuessed;

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.13"
+    version: "0.39.15"
   animate_do:
     dependency: "direct main"
     description:
@@ -71,6 +71,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.3"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   clock:
     dependency: transitive
     description:
@@ -98,14 +105,14 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   csslib:
     dependency: transitive
     description:
       name: csslib
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.1"
+    version: "0.16.2"
   dart_style:
     dependency: transitive
     description:
@@ -401,4 +408,4 @@ packages:
     version: "2.2.1"
 sdks:
   dart: ">=2.9.0-14.0.dev <3.0.0"
-  flutter: "1.20.0-7.2.pre"
+  flutter: "1.20.0-7.3.pre"
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: "none"
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
-  flutter: 1.20.0-7.2.pre
+  flutter: 1.20.0-7.3.pre
 
 dependencies:
   flutter:

diff --git a/dict_parser/lib/generators/japanese.dart b/dict_parser/lib/generators/japanese.dart
@@ -36,6 +36,13 @@ final _japanese = Generator._(
         'ramen; Chinese-style noodles',
       ],
     ),
+    const WordEntry(
+      spellings: ['気分'],
+      phoneticSpellings: ['きぶん'],
+      definitions: [
+        'feeling; mood',
+      ],
+    ),
   ],
   generateEntries: (args) async {
     const _nounTag = '&n;';