Made loading progress indicator work everywhere

ManeraKai · Apr 7, 2024 · fbb76f9 · fbb76f9
1 parent 1fa66b6
commit fbb76f9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 28 deletions.
diff --git a/lib/data.dart b/lib/data.dart
@@ -71,10 +71,7 @@ Future<void> getSharedText() async {
       });
 
       final translatedText = await simplytranslate.translate(_translationInput, 'auto', toLangVal);
-      setStateOverlord(() {
-        googleOutput = translatedText;
-        loading = false;
-      });
+      setStateOverlord(() => googleOutput = translatedText);
     }
   } catch (_) {
     setStateOverlord(() => loading = false);

diff --git a/lib/main.dart b/lib/main.dart
@@ -283,10 +283,6 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
           preferredSize: Size(0, 60),
           child: Builder(
             builder: (context) => AppBar(
-              bottom: PreferredSize(
-                preferredSize: Size.fromHeight(2),
-                child: Container(height: 2, color: greenColor),
-              ),
               actions: [
                 PopupMenuButton(
                   icon: Icon(Icons.more_vert, color: Colors.white),

diff --git a/lib/screens/translate/widgets/input/input.dart b/lib/screens/translate/widgets/input/input.dart
@@ -74,13 +74,8 @@ class _TranslationInputState extends State<GoogleTranslationInput> {
                   if (input == googleInCtrl.text) {
                     if (googleInCtrl.text.length > 0 && googleInCtrl.text.length <= 5000) {
                       isTranslationCanceled = false;
-                      setStateOverlord(() => loading = true);
                       final translatedText = await simplytranslate.translate(googleInCtrl.text, fromLangVal, toLangVal);
-                      if (!isTranslationCanceled)
-                        setStateOverlord(() {
-                          googleOutput = translatedText;
-                          loading = false;
-                        });
+                      if (!isTranslationCanceled) setStateOverlord(() => googleOutput = translatedText);
                     }
                   }
                 });

diff --git a/lib/screens/translate/widgets/lang_selector/lang.dart b/lib/screens/translate/widgets/lang_selector/lang.dart
@@ -116,11 +116,7 @@ class _GoogleLangState extends State<GoogleLang> {
                                           changeToTxt!(toSelLangMap[toLangVal]!);
                                         }
                                         final translatedText = await translate(googleInCtrl.text, fromLangVal, toLangVal);
-                                        if (!isTranslationCanceled)
-                                          setStateOverlord(() {
-                                            googleOutput = translatedText;
-                                            loading = false;
-                                          });
+                                        if (!isTranslationCanceled) setStateOverlord(() => googleOutput = translatedText);
                                         break;
                                       }
                                     }
@@ -201,11 +197,7 @@ class _GoogleLangState extends State<GoogleLang> {
                 FocusScope.of(context).unfocus();
               }
               final translatedText = await translate(googleInCtrl.text, fromLangVal, toLangVal);
-              if (!isTranslationCanceled)
-                setStateOverlord(() {
-                  googleOutput = translatedText;
-                  loading = false;
-                });
+              if (!isTranslationCanceled) setStateOverlord(() => googleOutput = translatedText);
             },
             decoration: InputDecoration(contentPadding: const EdgeInsets.symmetric(vertical: 10, horizontal: 10), isDense: true),
             controller: txtCtrl,

diff --git a/lib/screens/translate/widgets/lang_selector/switch_lang.dart b/lib/screens/translate/widgets/lang_selector/switch_lang.dart
@@ -25,7 +25,6 @@ class GoogleSwitchLang extends StatelessWidget {
                     setStateOverlord(() {});
                   } else if (googleInCtrl.text.length <= 5000) {
                     FocusScope.of(context).unfocus();
-                    setStateOverlord(() => loading = true);
                     try {
                       final transInTmp = googleInCtrl.text;
                       final fromLangValTransTmp = fromLangVal;
@@ -50,7 +49,6 @@ class GoogleSwitchLang extends StatelessWidget {
                           translatedText2 = '';
                         }
                         setStateOverlord(() {
-                          loading = false;
                           googleInCtrl.text = translatedText['text'];
                           googleOutput = translatedText2;
                         });

diff --git a/lib/simplytranslate.dart b/lib/simplytranslate.dart
@@ -23,6 +23,8 @@ Future<Uint8List> tts(String text, String language) async {
 Future<Map<String, dynamic>> translate(String text, String from, String to) async {
   if (text.isEmpty) return {};
 
+  setStateOverlord(() => loading = true);
+
   final fromLast1 = session.read("fromLast1");
   final fromLast2 = session.read("fromLast2");
   final fromLast3 = session.read("fromLast3");
@@ -42,8 +44,9 @@ Future<Map<String, dynamic>> translate(String text, String from, String to) asyn
     session.write("toLast2", toLast1);
     session.write("toLast3", toLast2);
   }
-
-  return translate_(text, from, to);
+  final result = await translate_(text, from, to);
+  setStateOverlord(() => loading = false);
+  return result;
 }
 
 Future<Map<String, dynamic>> translate_(String text, String from, String to) async {