From 40af0efa59e51bcbb52dc7439478f8a332e87d6f Mon Sep 17 00:00:00 2001
From: fuwa <fuwa25519@protonmail.com>
Date: Sun, 19 Jan 2020 20:45:59 +0000
Subject: [PATCH] update to kotlin

---
 cyberwow/android/.gitignore                       |  7 +++++++
 cyberwow/android/app/build.gradle                 | 10 ++++++----
 cyberwow/android/app/src/main/AndroidManifest.xml |  6 +++++-
 .../java/org/wownero/cyberwow/MainActivity.java   | 15 ---------------
 .../kotlin/org/wownero/cyberwow/MainActivity.kt   | 12 ++++++++++++
 cyberwow/android/build.gradle                     |  6 ++++--
 .../gradle/wrapper/gradle-wrapper.properties      |  2 +-
 7 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 cyberwow/android/.gitignore
 delete mode 100644 cyberwow/android/app/src/main/java/org/wownero/cyberwow/MainActivity.java
 create mode 100644 cyberwow/android/app/src/main/kotlin/org/wownero/cyberwow/MainActivity.kt

diff --git a/cyberwow/android/.gitignore b/cyberwow/android/.gitignore
new file mode 100644
index 0000000..bc2100d
--- /dev/null
+++ b/cyberwow/android/.gitignore
@@ -0,0 +1,7 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
diff --git a/cyberwow/android/app/build.gradle b/cyberwow/android/app/build.gradle
index 28ae677..78df0fd 100644
--- a/cyberwow/android/app/build.gradle
+++ b/cyberwow/android/app/build.gradle
@@ -22,11 +22,16 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 28
 
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
     lintOptions {
         disable 'InvalidPackage'
     }
@@ -38,7 +43,6 @@ android {
         targetSdkVersion 28
         versionCode 22
         versionName "0.7.0.0-i"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     if(project.hasProperty("RELEASE_STORE_FILE")) {
@@ -77,7 +81,5 @@ flutter {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/cyberwow/android/app/src/main/AndroidManifest.xml b/cyberwow/android/app/src/main/AndroidManifest.xml
index 583965b..42eed26 100644
--- a/cyberwow/android/app/src/main/AndroidManifest.xml
+++ b/cyberwow/android/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            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
@@ -29,6 +29,10 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/cyberwow/android/app/src/main/java/org/wownero/cyberwow/MainActivity.java b/cyberwow/android/app/src/main/java/org/wownero/cyberwow/MainActivity.java
deleted file mode 100644
index 88eddb1..0000000
--- a/cyberwow/android/app/src/main/java/org/wownero/cyberwow/MainActivity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.wownero.cyberwow;
-
-import android.os.Bundle;
-import android.graphics.Color;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
-
-public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    getWindow().setNavigationBarColor(Color.BLACK);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
-}
diff --git a/cyberwow/android/app/src/main/kotlin/org/wownero/cyberwow/MainActivity.kt b/cyberwow/android/app/src/main/kotlin/org/wownero/cyberwow/MainActivity.kt
new file mode 100644
index 0000000..47a837e
--- /dev/null
+++ b/cyberwow/android/app/src/main/kotlin/org/wownero/cyberwow/MainActivity.kt
@@ -0,0 +1,12 @@
+package org.wownero.cyberwow
+
+import androidx.annotation.NonNull;
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugins.GeneratedPluginRegistrant
+
+class MainActivity: FlutterActivity() {
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+        GeneratedPluginRegistrant.registerWith(flutterEngine);
+    }
+}
diff --git a/cyberwow/android/build.gradle b/cyberwow/android/build.gradle
index 1b33616..d82c176 100644
--- a/cyberwow/android/build.gradle
+++ b/cyberwow/android/build.gradle
@@ -1,11 +1,13 @@
 buildscript {
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -26,4 +28,4 @@ subprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
\ No newline at end of file
diff --git a/cyberwow/android/gradle/wrapper/gradle-wrapper.properties b/cyberwow/android/gradle/wrapper/gradle-wrapper.properties
index ecd5e10..e5b2f0f 100644
--- a/cyberwow/android/gradle/wrapper/gradle-wrapper.properties
+++ b/cyberwow/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip