diff --git a/.metadata b/.metadata new file mode 100644 index 000000000..6ac59d7fb --- /dev/null +++ b/.metadata @@ -0,0 +1,30 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "35c388afb57ef061d06a39b537336c87e0e3d1b1" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + - platform: android + create_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + base_revision: 35c388afb57ef061d06a39b537336c87e0e3d1b1 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 431857519..7e5007083 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -13,6 +13,7 @@ android { compileOptions { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 + // Enable core library desugaring isCoreLibraryDesugaringEnabled = true } @@ -25,11 +26,10 @@ android { applicationId = "com.example.deep_voice" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. - minSdk = flutter.minSdkVersion + minSdk = 23 // Updated to meet record_android plugin requirements targetSdk = flutter.targetSdkVersion versionCode = flutter.versionCode versionName = flutter.versionName - multiDexEnabled = true } buildTypes { @@ -41,10 +41,10 @@ android { } } -flutter { - source = "../.." -} - dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") } + +flutter { + source = "../.." +} diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9c6e2260c..e9093900d 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,39 +1,29 @@ - + - - + - + + - - - - - - - + + + android:name="${applicationName}" + android:icon="@mipmap/ic_launcher"> - - + + android:exported="true"> - - @@ -48,9 +38,7 @@ android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" - android:windowSoftInputMode="adjustResize" - android:showWhenLocked="true" - android:turnScreenOn="true"> + android:windowSoftInputMode="adjustResize"> - - - - - - - - - - -