From 0f8f2c39994ba3cb959cc96e02d53d095f922138 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <13865709+greenrobot-team@users.noreply.github.com>
Date: Tue, 13 Oct 2020 15:34:56 +0200
Subject: [PATCH] Migrate Android example from pre-1.12 created code.

https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects
---
 .../android/app/src/main/AndroidManifest.xml  | 26 ++++++++++---------
 .../example/objectbox_demo/MainActivity.kt    |  8 +-----
 .../app/src/main/res/values/styles.xml        |  3 +++
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/example/flutter/objectbox_demo/android/app/src/main/AndroidManifest.xml b/example/flutter/objectbox_demo/android/app/src/main/AndroidManifest.xml
index a39d3413d..fb9b3e129 100644
--- a/example/flutter/objectbox_demo/android/app/src/main/AndroidManifest.xml
+++ b/example/flutter/objectbox_demo/android/app/src/main/AndroidManifest.xml
@@ -1,14 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.objectbox_demo">
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         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="objectbox_demo"
         android:icon="@mipmap/ic_launcher">
+
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -16,13 +15,16 @@
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <!-- This keeps the window background of the activity showing
-                 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"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/example/flutter/objectbox_demo/android/app/src/main/kotlin/com/example/objectbox_demo/MainActivity.kt b/example/flutter/objectbox_demo/android/app/src/main/kotlin/com/example/objectbox_demo/MainActivity.kt
index b6f9d880a..cc868d541 100644
--- a/example/flutter/objectbox_demo/android/app/src/main/kotlin/com/example/objectbox_demo/MainActivity.kt
+++ b/example/flutter/objectbox_demo/android/app/src/main/kotlin/com/example/objectbox_demo/MainActivity.kt
@@ -1,12 +1,6 @@
 package com.example.objectbox_demo
 
-import android.os.Bundle
-import io.flutter.app.FlutterActivity
-import io.flutter.plugins.GeneratedPluginRegistrant
+import io.flutter.embedding.android.FlutterActivity
 
 class MainActivity: FlutterActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        GeneratedPluginRegistrant.registerWith(this)
-    }
 }
diff --git a/example/flutter/objectbox_demo/android/app/src/main/res/values/styles.xml b/example/flutter/objectbox_demo/android/app/src/main/res/values/styles.xml
index 00fa4417c..c745a5ef2 100644
--- a/example/flutter/objectbox_demo/android/app/src/main/res/values/styles.xml
+++ b/example/flutter/objectbox_demo/android/app/src/main/res/values/styles.xml
@@ -5,4 +5,7 @@
              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/launch_background</item>
+    </style>
 </resources>