Fix up metadata

14 files changed, 173 insertions, 190 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 9c87981..6291d2e 100755..100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -1,60 +1,49 @@
-import java.util.Properties

-import java.io.FileInputStream

-

-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")

-}

-

-val keystoreProperties = Properties()

-val keystorePropertiesFile = rootProject.file("key.properties")

-if (keystorePropertiesFile.exists()) {

-    keystoreProperties.load(FileInputStream(keystorePropertiesFile))

-}

-

-android {

-    namespace = "com.botahamec.speedometer"

-    compileSdk = flutter.compileSdkVersion

-    ndkVersion = flutter.ndkVersion

-

-    compileOptions {

-        sourceCompatibility = JavaVersion.VERSION_11

-        targetCompatibility = JavaVersion.VERSION_11

-    }

-

-    kotlinOptions {

-        jvmTarget = JavaVersion.VERSION_11.toString()

-    }

-

-    defaultConfig {

-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).

-        applicationId = "com.botahamec.speedometer"

-        // 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

-        targetSdk = flutter.targetSdkVersion

-        versionCode = flutter.versionCode

-        versionName = flutter.versionName

-    }

-

-    signingConfigs {

-        create("release") {

-            keyAlias = keystoreProperties["keyAlias"] as String

-            keyPassword = keystoreProperties["keyPassword"] as String

-            storeFile = keystoreProperties["storeFile"]?.let { file(it) }

-            storePassword = keystoreProperties["storePassword"] as String

-        }

-    }

-

-    buildTypes {

-        release {

-            signingConfig = signingConfigs.getByName("release")

-        }

-    }

-}

-

-flutter {

-    source = "../.."

-}

+plugins {
+    id("com.android.application")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "dev.botahamec.speedometer"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "dev.botahamec.speedometer"
+        // 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
+        targetSdk = flutter.targetSdkVersion
+        // Uses the version code from pubspec.yaml. When using split APKs, 1000 * ABI_VERSION
+        // is added automatically by Flutter. (https://developer.android.com/studio/build/configure-apk-splits#configure-APK-versions)
+        // You can force using the value of versionCode by specifying the `-P force-version-code-ignoring-abi=true`
+        // flag during build.
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        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.getByName("debug")
+        }
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
+flutter {
+    source = "../.."
+}
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 8ffe024..399f698 100755..100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,7 +1,7 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">

-    <!-- The INTERNET permission is required for development. Specifically,

-         the Flutter tool 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>

+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool 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>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 25a7982..57052f1 100755..100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,51 +1,45 @@
-<manifest

-    xmlns:android="http://schemas.android.com/apk/res/android"

-    android:versionCode="1"

-    android:versionName="1.0">

-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />

-    <application

-        android:label="Simple Speedometer"

-        android:name="${applicationName}"

-        android:icon="@mipmap/ic_launcher">

-        <activity

-            android:name=".MainActivity"

-            android:exported="true"

-            android:launchMode="singleTop"

-            android:taskAffinity=""

-            android:theme="@style/LaunchTheme"

-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

-            android:hardwareAccelerated="true"

-            android:windowSoftInputMode="adjustResize">

-            <!-- 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.embedding.android.NormalTheme"

-              android:resource="@style/NormalTheme"

-              />

-            <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>

-    <!-- Required to query activities that can process text, see:

-         https://developer.android.com/training/package-visibility and

-         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.

-

-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->

-    <queries>

-        <intent>

-            <action android:name="android.intent.action.PROCESS_TEXT"/>

-            <data android:mimeType="text/plain"/>

-        </intent>

-    </queries>

-</manifest>

+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="speedometer"
+        android:name="${applicationName}"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:taskAffinity=""
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- 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.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <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>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+</manifest>
diff --git a/android/app/src/main/kotlin/com/example/speedometer/MainActivity.kt b/android/app/src/main/kotlin/dev/botahamec/speedometer/MainActivity.kt
index fe419d8..3d1318c 100755..100644
--- a/android/app/src/main/kotlin/com/example/speedometer/MainActivity.kt
+++ b/android/app/src/main/kotlin/dev/botahamec/speedometer/MainActivity.kt
@@ -1,5 +1,5 @@
-package com.botahamec.speedometer

-

-import io.flutter.embedding.android.FlutterActivity

-

-class MainActivity : FlutterActivity()

+package dev.botahamec.speedometer
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity : FlutterActivity()
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
index 1cb7aa2..f74085f 100755..100644
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,12 +1,12 @@
-<?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:colorBackground" />

-

-    <!-- You can insert your own image assets here -->

-    <!-- <item>

-        <bitmap

-            android:gravity="center"

-            android:src="@mipmap/launch_image" />

-    </item> -->

-</layer-list>

+<?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:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 8403758..304732f 100755..100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,12 +1,12 @@
-<?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/white" />

-

-    <!-- You can insert your own image assets here -->

-    <!-- <item>

-        <bitmap

-            android:gravity="center"

-            android:src="@mipmap/launch_image" />

-    </item> -->

-</layer-list>

+<?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/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index f46636f..f46636f 100755..100644
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 971f4b1..971f4b1 100755..100644
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 27e6067..27e6067 100755..100644
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index a1ef82c..a1ef82c 100755..100644
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index de788f9..de788f9 100755..100644
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 360a160..06952be 100755..100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>

-<resources>

-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->

-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">

-        <!-- Show a splash screen on the activity. Automatically removed when

-             the Flutter engine draws its first frame -->

-        <item name="android:windowBackground">@drawable/launch_background</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:colorBackground</item>

-    </style>

-</resources>

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</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:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 5fac679..cb1ef88 100755..100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>

-<resources>

-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->

-    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">

-        <!-- Show a splash screen on the activity. Automatically removed when

-             the Flutter engine draws its first frame -->

-        <item name="android:windowBackground">@drawable/launch_background</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.Light.NoTitleBar">

-        <item name="android:windowBackground">?android:colorBackground</item>

-    </style>

-</resources>

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</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.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 8ffe024..399f698 100755..100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,7 +1,7 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">

-    <!-- The INTERNET permission is required for development. Specifically,

-         the Flutter tool 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>

+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool 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>