fix: update internal picked language when a persisted locale exists (#39)

* fix: update internal picked language when a persisted locale exists

* fix: reload picked language earlier and if app open fails

* build: bumped gradle and switched java version

* chore: updated gradle wrapper

* fix: call `super.initState()`

Author: johsoe

example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -40,11 +40,20 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dk.nodes.nstack_example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
@@ -59,5 +68,5 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
 }

example/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.4.31'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

example/lib/nstack.dart

@@ -32,10 +32,10 @@ class _DefaultSection extends SectionKeyDelegate {
 class _Test extends SectionKeyDelegate {
 	const _Test(): super('test');
 
-	String get testDollarSign => get('testDollarSign', "\$testing again sdfsdf");
+	String get testDollarSign => get('testDollarSign', "\$testing again new");
 	String get testSingleQuotationMark => get('testSingleQuotationMark', "\'testing\'");
 	String get testDoubleQuotationMark => get('testDoubleQuotationMark', "\"testing\"");
-	String get testMultipleLines => get('testMultipleLines', "testing\nmultiple\nlines");
+	String get testMultipleLines => get('testMultipleLines', "testing\nmultiple\nlines\nupdated");
 }
 
 const _config = NStackConfig(projectId: 'h6wJremI2TGFM88gbLkdyljWQuwf2hxhxvCH', apiKey: 'zp2S18H32b67eYAbRQh94tVw76ZzaKKXlHjd');
@@ -46,7 +46,7 @@ final _languages = [
 ];
 
 const _bundledTranslations = {
-	'en-EN': r'''{"data":{"default":{"title":"NStack SDK Demo","test":"test"},"test":{"testDollarSign":"$testing again sdfsdf","testSingleQuotationMark":"'testing'","testDoubleQuotationMark":"\"testing\"","testMultipleLines":"testing\nmultiple\nlines"}},"meta":{"language":{"id":56,"name":"English","locale":"en-EN","direction":"LRM","is_default":false,"is_best_fit":false},"platform":{"id":515,"slug":"mobile"}}}''',
+	'en-EN': r'''{"data":{"default":{"title":"NStack SDK Demo","test":"test"},"test":{"testDollarSign":"$testing again new","testSingleQuotationMark":"'testing'","testDoubleQuotationMark":"\"testing\"","testMultipleLines":"testing\nmultiple\nlines\nupdated"}},"meta":{"language":{"id":56,"name":"English","locale":"en-EN","direction":"LRM","is_default":false,"is_best_fit":false},"platform":{"id":515,"slug":"mobile"}}}''',
 	'de-AT': r'''{"data":{"default":{"title":"NStack SDK Demo","test":"test"},"test":{"testDollarSign":"__testDollarSign","testSingleQuotationMark":"__testSingleQuotationMark","testDoubleQuotationMark":"__testDoubleQuotationMark","testMultipleLines":"__testMultipleLines"}},"meta":{"language":{"id":7,"name":"German (Austria)","locale":"de-AT","direction":"LRM","is_default":false,"is_best_fit":false},"platform":{"id":515,"slug":"mobile"}}}''',
 };
 
@@ -89,6 +89,12 @@ class NStackWidget extends StatefulWidget {
 class NStackState extends State<NStackWidget> {
 	final NStack<Localization> nstack = _nstack;
 
+  @override
+  void initState() {
+    super.initState();
+		_nstack.initClientLocale();
+  }
+
 	changeLanguage(Locale locale) async {
 		await _nstack.changeLocalization(locale).whenComplete(() => setState(() {}));
 	}

lib/nstack.dart

@@ -41,6 +41,8 @@ class NStack<T> {
 
   var _appOpenCalled = false;
 
+  Locale? clientLocale;
+
   NStack(
       {required this.config,
       required this.localization,
@@ -114,6 +116,8 @@ class NStack<T> {
   /// 4. Fallback to bundled localizations from last build
   Future changeLocalization(Locale locale) async {
     try {
+      clientLocale = locale;
+
       // Direct locale match
       var localLanguage = LocalizationRepository().localizeIndexes.firstWhere(
           (element) =>
@@ -172,6 +176,18 @@ class NStack<T> {
     }
   }
 
+  Future<String?> initClientLocale() async {
+    final prefs = await SharedPreferences.getInstance();
+    if (prefs.containsKey(_prefsSelectedLocale)) {
+      var languageTag = prefs.getString(_prefsSelectedLocale) ?? clientLocale?.toLanguageTag() ?? '';
+      LocalizationRepository().overridePickedLanguage(languageTag);
+      return languageTag;
+    } else if(clientLocale != null) {
+      return clientLocale!.toLanguageTag();
+    }
+    return null;
+  }
+
   Future<AppOpenResult> appOpen(
     Locale locale, {
     AppOpenPlatform? platformOverride,
@@ -191,6 +207,7 @@ class NStack<T> {
         languageTag =
             prefs.getString(_prefsSelectedLocale) ?? locale.toLanguageTag();
         _log("NStack --> User has overwritten device locale to: $languageTag");
+        LocalizationRepository().overridePickedLanguage(languageTag);
       }
 
       _log("NStack --> Calling App Open...");

lib/src/nstack_builder.dart

@@ -261,6 +261,12 @@ class NStackWidget extends StatefulWidget {
 class NStackState extends State<NStackWidget> {
 	final NStack<Localization> nstack = _nstack;
 
+  @override
+  void initState() {
+    super.initState();
+		_nstack.initClientLocale();
+  }
+
 	changeLanguage(Locale locale) async {
 		await _nstack.changeLocalization(locale).whenComplete(() => setState(() {}));
 	}

lib/src/repository.dart

@@ -71,6 +71,13 @@ class LocalizationRepository {
     _persistInternalMap();
   }
 
+  overridePickedLanguage(String locale) {
+    this._pickedLanguage = _availableLanguages.firstWhere(
+          (element) => element.locale == locale,
+      orElse: () => this._pickedLanguage,
+    );
+  }
+
   _setupInternalMap() async {
     try {
       WidgetsFlutterBinding.ensureInitialized();