From 24dcdb6ac00aac0d67a7bdb4297212528babd7ac Mon Sep 17 00:00:00 2001
From: Miguel Beltran <m@beltran.work>
Date: Fri, 18 Feb 2022 02:20:43 +0100
Subject: [PATCH] Update Android files in form_ap (#1016)

---
 form_app/android/.gitignore                       |  2 ++
 form_app/android/app/build.gradle                 | 15 ++++++++++++---
 form_app/android/app/src/main/AndroidManifest.xml | 11 ++---------
 .../app/src/main/res/values-night/styles.xml      |  2 +-
 .../android/app/src/main/res/values/styles.xml    |  2 +-
 form_app/android/build.gradle                     |  8 +++++---
 form_app/pubspec.lock                             |  9 ++++++++-
 7 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/form_app/android/.gitignore b/form_app/android/.gitignore
index 0a741cb43..6f568019d 100644
--- a/form_app/android/.gitignore
+++ b/form_app/android/.gitignore
@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+**/*.keystore
+**/*.jks
diff --git a/form_app/android/app/build.gradle b/form_app/android/app/build.gradle
index 16e2c223d..a56b2e215 100644
--- a/form_app/android/app/build.gradle
+++ b/form_app/android/app/build.gradle
@@ -26,7 +26,16 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion flutter.compileSdkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -35,8 +44,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dev.flutter.formApp.form_app"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/form_app/android/app/src/main/AndroidManifest.xml b/form_app/android/app/src/main/AndroidManifest.xml
index 5c81fe7d4..ff847faab 100644
--- a/form_app/android/app/src/main/AndroidManifest.xml
+++ b/form_app/android/app/src/main/AndroidManifest.xml
@@ -2,9 +2,11 @@
     package="dev.flutter.formApp.form_app">
    <application
         android:label="form_app"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -18,15 +20,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/form_app/android/app/src/main/res/values-night/styles.xml b/form_app/android/app/src/main/res/values-night/styles.xml
index 449a9f930..3db14bb53 100644
--- a/form_app/android/app/src/main/res/values-night/styles.xml
+++ b/form_app/android/app/src/main/res/values-night/styles.xml
@@ -10,7 +10,7 @@
          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>
diff --git a/form_app/android/app/src/main/res/values/styles.xml b/form_app/android/app/src/main/res/values/styles.xml
index d74aa35c2..d460d1e92 100644
--- a/form_app/android/app/src/main/res/values/styles.xml
+++ b/form_app/android/app/src/main/res/values/styles.xml
@@ -10,7 +10,7 @@
          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.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/form_app/android/build.gradle b/form_app/android/build.gradle
index 9b6ed06eb..4256f9173 100644
--- a/form_app/android/build.gradle
+++ b/form_app/android/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -14,13 +14,15 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(':app')
 }
 
diff --git a/form_app/pubspec.lock b/form_app/pubspec.lock
index 766f0ff21..e8d0a60ad 100644
--- a/form_app/pubspec.lock
+++ b/form_app/pubspec.lock
@@ -305,6 +305,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -435,7 +442,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   timing:
     dependency: transitive
     description: