diff --git a/example/.metadata b/example/.metadata index bead5eef..ddccdffc 100644 --- a/example/.metadata +++ b/example/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled and should not be manually edited. version: - revision: "2524052335ec76bb03e04ede244b071f1b86d190" - channel: "stable" + revision: "29babcb32a591b9e5be8c6a6075d4fe605d46ad3" + channel: "beta" project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: 2524052335ec76bb03e04ede244b071f1b86d190 - base_revision: 2524052335ec76bb03e04ede244b071f1b86d190 - - platform: windows - create_revision: 2524052335ec76bb03e04ede244b071f1b86d190 - base_revision: 2524052335ec76bb03e04ede244b071f1b86d190 + create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 + base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 + - platform: android + create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 + base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3 # User provided section diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 8db3c5c8..6408bdf1 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,77 +1,53 @@ +plugins { + id "com.android.application" + id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') +def localPropertiesFile = rootProject.file("local.properties") if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> + localPropertiesFile.withReader("UTF-8") { reader -> localProperties.load(reader) } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +def flutterVersionCode = localProperties.getProperty("flutter.versionCode") if (flutterVersionCode == null) { - flutterVersionCode = '9' + flutterVersionCode = "9" } -def flutterVersionName = localProperties.getProperty('flutter.versionName') +def flutterVersionName = localProperties.getProperty("flutter.versionName") if (flutterVersionName == null) { - flutterVersionName = '9.0.0' -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -def keystoreProperties = new Properties() -def keystorePropertiesFile = rootProject.file('key.properties') -if (keystorePropertiesFile.exists()) { - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + flutterVersionName = "9.0" } android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - multiDexEnabled true - } + namespace = "dev.jaffaketchup.fmtc.demo" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion compileOptions { - coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } defaultConfig { - applicationId "dev.jaffaketchup.fmtc.demo" - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + applicationId = "dev.jaffaketchup.fmtc.demo" + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutterVersionCode.toInteger() + versionName = flutterVersionName } buildTypes { release { - signingConfig signingConfigs.debug + signingConfig = signingConfigs.debug } } } flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + source = "../.." } diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml index 2c45d295..bbd7ee77 100644 --- a/example/android/app/src/debug/AndroidManifest.xml +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -1,10 +1,3 @@ - + - - - - - - diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 804d6826..93ed5100 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,16 +1,22 @@ - + + + + - - + + - + diff --git a/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt new file mode 100644 index 00000000..70f8f08f --- /dev/null +++ b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() diff --git a/example/android/app/src/main/kotlin/dev/org/fmtc/example/fmtc_example/MainActivity.kt b/example/android/app/src/main/kotlin/dev/org/fmtc/example/fmtc_example/MainActivity.kt deleted file mode 100644 index 46d583b8..00000000 --- a/example/android/app/src/main/kotlin/dev/org/fmtc/example/fmtc_example/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package dev.jaffaketchup.fmtc.demo - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/example/android/app/src/main/res/mipmap-hdpi/ic_notification_icon.png b/example/android/app/src/main/res/mipmap-hdpi/ic_notification_icon.png deleted file mode 100644 index 7da7ce30..00000000 Binary files a/example/android/app/src/main/res/mipmap-hdpi/ic_notification_icon.png and /dev/null differ diff --git a/example/android/app/src/main/res/mipmap-mdpi/ic_notification_icon.png b/example/android/app/src/main/res/mipmap-mdpi/ic_notification_icon.png deleted file mode 100644 index 49cb004e..00000000 Binary files a/example/android/app/src/main/res/mipmap-mdpi/ic_notification_icon.png and /dev/null differ diff --git a/example/android/app/src/main/res/mipmap-xhdpi/ic_notification_icon.png b/example/android/app/src/main/res/mipmap-xhdpi/ic_notification_icon.png deleted file mode 100644 index 4669ec86..00000000 Binary files a/example/android/app/src/main/res/mipmap-xhdpi/ic_notification_icon.png and /dev/null differ diff --git a/example/android/app/src/main/res/mipmap-xxhdpi/ic_notification_icon.png b/example/android/app/src/main/res/mipmap-xxhdpi/ic_notification_icon.png deleted file mode 100644 index 1f94dd6b..00000000 Binary files a/example/android/app/src/main/res/mipmap-xxhdpi/ic_notification_icon.png and /dev/null differ diff --git a/example/android/app/src/main/res/mipmap-xxxhdpi/ic_notification_icon.png b/example/android/app/src/main/res/mipmap-xxxhdpi/ic_notification_icon.png deleted file mode 100644 index 8a48025d..00000000 Binary files a/example/android/app/src/main/res/mipmap-xxxhdpi/ic_notification_icon.png and /dev/null differ diff --git a/example/android/app/src/main/res/values-night/styles.xml b/example/android/app/src/main/res/values-night/styles.xml index 449a9f93..06952be7 100644 --- a/example/android/app/src/main/res/values-night/styles.xml +++ b/example/android/app/src/main/res/values-night/styles.xml @@ -3,14 +3,14 @@