From cbd8ddad08d1ebb810fa4dae662a577ca296627b Mon Sep 17 00:00:00 2001
From: sainw <sai.nawwun@mokkon.com>
Date: Tue, 5 Apr 2022 11:25:37 +0630
Subject: [PATCH] fix android config

---
 android/app/build.gradle               | 7 ++++++-
 android/build.gradle                   | 5 +++++
 assets/local/localization_mu.json      | 2 ++
 lib/localization/app_translations.dart | 6 +++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index a02cc42..4c4bd02 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -31,7 +31,11 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 30
+    lintOptions {
+        checkReleaseBuilds false
+    }
+
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 21
@@ -89,6 +93,7 @@ flutter {
 
 dependencies {
   implementation 'com.android.support:multidex:1.0.3'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/android/build.gradle b/android/build.gradle
index 9070705..493df9c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,4 +1,6 @@
 buildscript {
+    ext.kotlin_version = '1.6.10'
+
     repositories {
         google()
         jcenter()
@@ -7,6 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.0'
         classpath 'com.google.gms:google-services:4.3.8'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -26,3 +29,5 @@ subprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+apply plugin: 'com.google.gms.google-services'
diff --git a/assets/local/localization_mu.json b/assets/local/localization_mu.json
index ddbb6c0..ba64207 100644
--- a/assets/local/localization_mu.json
+++ b/assets/local/localization_mu.json
@@ -545,6 +545,8 @@
     "receiving.delete.confirm":"လက်ခံခြင်းကို ဖျက်မလား?",
     "receiving.return.btn":"ပစ္စည်း ပြန်ပို့မည်",
     "receiving.return.confirm":"ပစ္စည်းကို ပြန်ပို့မလား?",
+    "receiving.consignee.name":"Consignee name",
+    "receiving.shipper.name":"Sender name",
     "Receiving End ================================================================":"",
 
     "Processing Start ================================================================":"",
diff --git a/lib/localization/app_translations.dart b/lib/localization/app_translations.dart
index f578c5a..73242b2 100644
--- a/lib/localization/app_translations.dart
+++ b/lib/localization/app_translations.dart
@@ -28,15 +28,15 @@ class AppTranslations {
   get currentLanguage => locale.languageCode;
 
   String text(String key, {List<String>? translationVariables}) {
-    String value = _localisedValues[key];
+    String? value = _localisedValues[key];
     if (value == null) {
       return "$key not found";
     }
     if (translationVariables != null) {
       translationVariables.asMap().forEach((i, s) {
-        value = value.replaceAll("{$i}", s);
+        value = value!.replaceAll("{$i}", s);
       });
     }
-    return value;
+    return value!;
   }
 }