From 2d462788b70f8b2d3c8fb3aeb9b0cd61256a408f Mon Sep 17 00:00:00 2001
From: Ben Goldsworthy <b.r.goldsworthy@lancaster.ac.uk>
Date: Wed, 29 Jul 2020 21:47:11 +0100
Subject: [PATCH] Upgrade to new Android platform-side wrappers

---
 android/app/src/main/AndroidManifest.xml      | 20 ++++++++++++++-----
 .../localspend/localspend/MainActivity.java   |  9 +--------
 .../main/res/drawable/normal_background.xml   | 12 +++++++++++
 android/app/src/main/res/values/styles.xml    |  4 ++++
 4 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/normal_background.xml

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 184c9d7..53c13db 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -13,17 +13,18 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
         android:label="SpendTracker"
         android:icon="@mipmap/ic_launcher">
 
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
 
         <meta-data android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyD0vsoT6Omnn01hbUiCjAhiS47uFYWnEHE"/>
         <!-- Please don't be stupid with the above key-->
 
-        <activity
-            android:name=".MainActivity"
+        <activity android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
@@ -33,9 +34,18 @@
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
                  defined in @style/LaunchTheme). -->
+
+            <!-- Specify that the launch screen should continue being displayed -->
+            <!-- until Flutter renders its first frame. -->
             <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
+                android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                android:resource="@drawable/launch_background" />
+
+            <!-- Theme to apply as soon as Flutter begins rendering frames -->
+            <meta-data
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"
+                />
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
diff --git a/android/app/src/main/java/uk/co/localspend/localspend/MainActivity.java b/android/app/src/main/java/uk/co/localspend/localspend/MainActivity.java
index 361cc1c..238a3b4 100644
--- a/android/app/src/main/java/uk/co/localspend/localspend/MainActivity.java
+++ b/android/app/src/main/java/uk/co/localspend/localspend/MainActivity.java
@@ -1,13 +1,6 @@
 package uk.co.localspend.localspend;
 
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.embedding.android.FlutterActivity;
 
 public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
 }
diff --git a/android/app/src/main/res/drawable/normal_background.xml b/android/app/src/main/res/drawable/normal_background.xml
new file mode 100644
index 0000000..331d9ff
--- /dev/null
+++ b/android/app/src/main/res/drawable/normal_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!--<item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item>-->
+</layer-list>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 00fa441..2032af9 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,4 +5,8 @@
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">@drawable/normal_background</item>
+    </style>
 </resources>