2.8.5 fix

arianneorpilla · Jun 18, 2023 · 7261c40 · 7261c40
1 parent 7d40701
commit 7261c40
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 28 deletions.
diff --git a/yuuna/lib/src/creator/enhancements/tatoeba_example_sentences_enhancement.dart b/yuuna/lib/src/creator/enhancements/tatoeba_example_sentences_enhancement.dart
@@ -65,11 +65,9 @@ class TatoebaExampleSentencesEnhancement extends Enhancement {
           return;
         }
 
-        String currentSentence =
-            creatorModel.getFieldController(SentenceField.instance).text;
-
-        creatorModel.getFieldController(SentenceField.instance).text =
-            '${currentSentence.trim()}\n\n${selection.join('\n\n')}'.trim();
+        for (String result in selection) {
+          creatorModel.appendSentenceAndCloze(result);
+        }
       },
     );
   }

diff --git a/yuuna/lib/src/models/creator_model.dart b/yuuna/lib/src/models/creator_model.dart
@@ -81,12 +81,12 @@ class CreatorModel with ChangeNotifier {
 
   /// Append the appropriate fields for cloze compatibility.
   void appendSentenceAndCloze(String sentence) {
-    getFieldController(SentenceField.instance).text += '\n\n$sentence';
-    getFieldController(ClozeAfterField.instance).text += '\n\n$sentence';
-    getFieldController(SentenceField.instance).text =
-        getFieldController(SentenceField.instance).text.trim();
-    getFieldController(ClozeAfterField.instance).text =
-        getFieldController(SentenceField.instance).text.trim();
+    if (getFieldController(SentenceField.instance).text.trim().isNotEmpty) {
+      getFieldController(SentenceField.instance).text += '\n\n';
+      getFieldController(ClozeAfterField.instance).text += '\n\n';
+    }
+    getFieldController(SentenceField.instance).text += sentence;
+    getFieldController(ClozeAfterField.instance).text += sentence;
   }
 
   /// Get the [TextEditingController] for a particular field.

diff --git a/yuuna/pubspec.lock b/yuuna/pubspec.lock
@@ -1133,10 +1133,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "28386bbe89ab5a7919a47cea99cdd1128e5a6e0bbd7eaafe20440ead84a15de3"
+      sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1822,10 +1822,11 @@ packages:
   wakelock:
     dependency: "direct main"
     description:
-      name: wakelock
-      sha256: "769ecf42eb2d07128407b50cb93d7c10bd2ee48f0276ef0119db1d25cc2f87db"
-      url: "https://pub.dev"
-    source: hosted
+      path: wakelock
+      ref: "40464c75e908f57f458597ef4912f5273ab89b1a"
+      resolved-ref: "40464c75e908f57f458597ef4912f5273ab89b1a"
+      url: "https://github.com/diegotori/wakelock"
+    source: git
     version: "0.6.2"
   wakelock_macos:
     dependency: transitive
@@ -1855,9 +1856,9 @@ packages:
     dependency: "direct overridden"
     description:
       path: wakelock_windows
-      ref: win32-v5
-      resolved-ref: "2a9bca63a540771f241d688562351482b2cf234c"
-      url: "https://github.com/timsneath/wakelock"
+      ref: "40464c75e908f57f458597ef4912f5273ab89b1a"
+      resolved-ref: "40464c75e908f57f458597ef4912f5273ab89b1a"
+      url: "https://github.com/diegotori/wakelock"
     source: git
     version: "0.2.2"
   watcher:
@@ -1926,4 +1927,4 @@ packages:
     version: "1.12.4"
 sdks:
   dart: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.4"
+  flutter: ">=3.10.5"
diff --git a/yuuna/pubspec.yaml b/yuuna/pubspec.yaml
@@ -1,10 +1,10 @@
 name: yuuna
 description: A full-featured immersion language learning suite for mobile.
 publish_to: 'none'
-version: 2.8.5+99
+version: 2.8.5+100
 environment:
   sdk: ">=3.0.0<4.0.0"
-  flutter: "^3.10.4"
+  flutter: "^3.10.5"
 
 dependencies:
   audio_service: ^0.18.9
@@ -90,7 +90,7 @@ dependencies:
     git: 
       url: https://github.com/lrorpilla/nowplaying
       ref: 290ee1097d67cafc50f3aba1ba5bba01e758d877
-  package_info_plus: ^4.0.1
+  package_info_plus: ^4.0.2
   path: ^1.8.2
   path_provider: ^2.0.13
   permission_handler: ^10.2.0
@@ -129,7 +129,11 @@ dependencies:
       url: https://github.com/lrorpilla/ve_dart
       ref: c366bb1ae24f6fad4f5c7e3a1efad5f2b8122e58
   visibility_detector: ^0.4.0+2
-  wakelock: ^0.6.2
+  wakelock:
+    git:
+      url: https://github.com/diegotori/wakelock
+      ref: 40464c75e908f57f458597ef4912f5273ab89b1a
+      path: wakelock
   web_socket_channel: ^2.3.0
   youtube_explode_dart: ^1.12.4
 
@@ -139,10 +143,10 @@ dependency_overrides:
   gap: ^3.0.0 # Caused by spaces
   wakelock_windows:
     git:
-      url: https://github.com/timsneath/wakelock
-      ref: win32-v5
+      url: https://github.com/diegotori/wakelock
+      ref: 40464c75e908f57f458597ef4912f5273ab89b1a
       path: wakelock_windows
-  
+
 dev_dependencies:
   build_runner: ^2.3.3
   dependency_validator: ^3.0.0