update to AndroidX, work on OBS overlay

.flutter-plugins-dependencies

@@ -0,0 +1 @@
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_keyboard_visibility","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-0.7.0\\\\","dependencies":[]},{"name":"flutter_local_notifications","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_local_notifications-1.4.3\\\\","dependencies":[]},{"name":"open_file","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\open_file-3.0.1\\\\","dependencies":[]},{"name":"package_info","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info-0.4.0+18\\\\","dependencies":[]},{"name":"path_provider","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.9\\\\","dependencies":[]},{"name":"permission_handler","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler-5.0.0+hotfix.6\\\\","dependencies":[]},{"name":"sensors","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sensors-0.4.2+2\\\\","dependencies":[]},{"name":"share","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"shared_preferences","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.3.0+1\\\\","dependencies":[]},{"name":"video_player","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_player-0.10.11+1\\\\","dependencies":[]},{"name":"wakelock","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\wakelock-0.1.4+1\\\\","dependencies":[]}],"android":[{"name":"flutter_keyboard_visibility","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_keyboard_visibility-0.7.0\\\\","dependencies":[]},{"name":"flutter_local_notifications","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_local_notifications-1.4.3\\\\","dependencies":[]},{"name":"open_file","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\open_file-3.0.1\\\\","dependencies":[]},{"name":"package_info","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info-0.4.0+18\\\\","dependencies":[]},{"name":"path_provider","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider-1.6.9\\\\","dependencies":[]},{"name":"permission_handler","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\permission_handler-5.0.0+hotfix.6\\\\","dependencies":[]},{"name":"sensors","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sensors-0.4.2+2\\\\","dependencies":[]},{"name":"share","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\share-0.6.4+3\\\\","dependencies":[]},{"name":"shared_preferences","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"sqflite","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.3.0+1\\\\","dependencies":[]},{"name":"video_player","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_player-0.10.11+1\\\\","dependencies":[]},{"name":"wakelock","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\wakelock-0.1.4+1\\\\","dependencies":[]}],"macos":[{"name":"path_provider_macos","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_macos-0.0.1+9\\\\","dependencies":[]},{"name":"sqflite","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\sqflite-1.3.0+1\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"video_player_web","path":"D:\\\\ZAPS\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\video_player_web-0.1.3+1\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_keyboard_visibility","dependencies":[]},{"name":"flutter_local_notifications","dependencies":[]},{"name":"open_file","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"sensors","dependencies":[]},{"name":"share","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"video_player","dependencies":["video_player_web"]},{"name":"video_player_web","dependencies":[]},{"name":"wakelock","dependencies":[]}],"date_created":"2020-05-29 18:12:42.728253","version":"1.17.2"}

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 5391447fae6209bb21a89e6a5a6583cac1af9b4b
+  revision: f7a6a7906be96d2288f5d63a5a54c515a6e987fe
   channel: stable
 
 project_type: app

android/.gitignore

@@ -0,0 +1,7 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java

android/app/build.gradle

@@ -21,49 +21,35 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
 
     lintOptions {
         disable 'InvalidPackage'
     }
 
     defaultConfig {
-        // Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "es.bacchant.mahjong.zapsscorer"
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId "info.azps.mahjong.zapsscorer"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-    signingConfigs {
-
-        debug {
-            //storeFile file("debug.keystore")
-        }
-
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
     }
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig signingConfigs.debug
         }
     }
 }
@@ -73,7 +59,5 @@ flutter {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.azps.mahjong.zapsscorer">
+    <!-- Flutter needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>

android/app/src/main/AndroidManifest.xml

@@ -1,40 +1,47 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="es.bacchant.mahjong.zapsscorer">
-
-    <!-- The INTERNET permission is required for development. Specifically,
-         flutter needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-
+    package="info.azps.mahjong.zapsscorer">
     <!-- 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="ZAPS Riichi Mahjong Scorer"
+        android:label="zapsscorer"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
+            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). -->
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
             <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
+              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"/>
             </intent-filter>
         </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
-</manifest>
+</manifest>

android/app/src/main/kotlin/info/azps/mahjong/zapsscorer/MainActivity.kt

@@ -0,0 +1,6 @@
+package info.azps.mahjong.zapsscorer
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}

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

@@ -1,10 +1,18 @@
 <?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/black" />
+    <item android:drawable="@mipmap/chipmunk" />
+</layer-list>
+<!--
     <item>
         <bitmap
-            android:gravity="fill"
-            android:src="@drawable/chipmunk" />
+            android:gravity="center"
+            android:src="@mipmap/chipmunk" />
     </item>
-</layer-list>
+    <item>
+        <shape>
+            <solid android:color="#040004" />
+        </shape>
+    </item>
+    <item android:drawable="@android:color/white" />
+-->

android/app/src/main/res/values/styles.xml

@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Theme applied to the Android Window while the process is starting -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name= "android:windowFullscreen">true</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:color/black</item>
     </style>
 </resources>