merge development cleanup into development

.gitignore

@@ -347,4 +347,10 @@ backend/services/__pycache__/productkeys.cpython-39.pyc
 backend/services/__pycache__/socket.cpython-39.pyc
 
 *.pyc
-.vscode
+.vscode
+
+# reflected files
+app/lib/main.reflectable.dart
+
+# pubSpec override
+app/pubspec_overrides.yaml

app/android/app/build_local

@@ -34,21 +34,24 @@ android {
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     defaultConfig {
-        applicationId "org.jimber.threebotlogin.local"
-        minSdkVersion 23
+        applicationId "org.jimber.threebotlogin"
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -66,7 +69,6 @@ android {
 
         }
     }
-
     buildTypes {
         release {
             signingConfig signingConfigs.release
@@ -75,6 +77,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -89,6 +100,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }

app/android/app/build_production

@@ -34,21 +34,24 @@ android {
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     defaultConfig {
         applicationId "org.jimber.threebotlogin"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -74,6 +77,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -88,6 +100,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }

app/android/app/build_staging

@@ -34,21 +34,24 @@ android {
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     defaultConfig {
-        applicationId "org.jimber.threebotlogin.staging"
-        minSdkVersion 23
+        applicationId "org.jimber.threebotlogin"
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -74,6 +77,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -88,6 +100,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }

app/android/app/build_testing

@@ -34,21 +34,24 @@ android {
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     defaultConfig {
-        applicationId "org.jimber.threebotlogin.testing"
-        minSdkVersion 23
+        applicationId "org.jimber.threebotlogin"
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -57,10 +60,10 @@ android {
 
 		signingConfigs {
         release {
-            // keyAlias localProperties.getProperty('keyAlias')
-            // keyPassword localProperties.getProperty('keyPassword')
-            // storeFile file(localProperties.getProperty('storeFile'))
-            // storePassword localProperties.getProperty('storePassword')
+            keyAlias localProperties.getProperty('keyAlias')
+            keyPassword localProperties.getProperty('keyPassword')
+            storeFile file(localProperties.getProperty('storeFile'))
+            storePassword localProperties.getProperty('storePassword')
         }
         debug {
 
@@ -74,6 +77,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -88,6 +100,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }

app/android/app/src/main/AndroidManifest_local

@@ -1,7 +1,7 @@
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.local">
     <application tools:replace="android:label" android:label="3Bot Local" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
             <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
             <intent-filter>

app/android/app/src/main/AndroidManifest_production

@@ -1,7 +1,7 @@
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin">
     <application tools:replace="android:label" android:label="Threefold Connect" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
             <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
             <intent-filter>

app/android/app/src/main/AndroidManifest_staging

@@ -1,7 +1,7 @@
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.staging">
     <application tools:replace="android:label" android:label="3Bot Staging" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
             <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
             <intent-filter>

app/android/app/src/main/AndroidManifest_testing

@@ -1,7 +1,7 @@
 <manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.jimber.threebotlogin.testing">
     <application tools:replace="android:label" android:label="3Bot Testing" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
+            android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize" android:enableOnBackInvokedCallback="false">
             <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
             <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
             <intent-filter>

app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity.kt

@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}

app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_local

@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}

app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_production

@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}

app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_staging

@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}

app/android/app/src/main/kotlin/org/jimber/threebotlogin/MainActivity_testing

@@ -8,4 +8,4 @@ class MainActivity: FlutterFragmentActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
     }
-}
+}

app/android/app/src/main/res/drawable-night-v21/launch_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+</layer-list>

app/android/app/src/main/res/drawable-night/launch_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+</layer-list>

app/android/app/src/main/res/drawable-v21/launch_background.xml

@@ -3,7 +3,4 @@
     <item>
         <bitmap android:gravity="fill" android:src="@drawable/background"/>
     </item>
-    <item>
-        <bitmap android:gravity="center" android:src="@drawable/splash"/>
-    </item>
-</layer-list>
+</layer-list>

app/android/app/src/main/res/drawable/launch_background.xml

@@ -3,7 +3,4 @@
     <item>
         <bitmap android:gravity="fill" android:src="@drawable/background"/>
     </item>
-    <item>
-        <bitmap android:gravity="center" android:src="@drawable/splash"/>
-    </item>
-</layer-list>
+</layer-list>

app/android/app/src/main/res/values-night-v31/styles.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>