Исправлено переключение локали на экране сканера

2017-09-21 13:09:38 +03:00
parent eba8c9e642
commit afc9cde20d
12 changed files with 85 additions and 49 deletions
--- a/lib/screens/languages.dart
+++ b/lib/screens/languages.dart
@@ -40,19 +40,23 @@ class LanguagesState extends SettingsBaseState<LanguagesScreen> {
  saveOption() async {
    await helper.saveLocale(languages[selectedItem]);
    Intl.defaultLocale = languages[selectedItem];
-    StringsLocalization.load(languages[selectedItem]).then((_) {
-      setState(() {
-
-      });
-    });
+    await StringsLocalization.load(languages[selectedItem]);
  }

  @override
  void getSelectedValue() {
    helper.getLocale().then((locale) {
-      setState(() {
-        selectedItem = getOptions().indexOf(getLocaleTitle(locale));
-      });
+      if (locale == null) {
+        platform.invokeMethod('getLocale').then((locale) {
+          setState(() {
+            selectedItem == locale;
+          });
+        });
+      } else {
+        setState(() {
+          selectedItem = getOptions().indexOf(getLocaleTitle(locale));
+        });
+      }
    });
  }
 }