diff options
| -rw-r--r-- | androidApp/build.gradle.kts | 8 | ||||
| -rw-r--r-- | androidApp/src/main/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt | 6 | ||||
| -rw-r--r-- | shared/build.gradle.kts | 6 |
4 files changed, 19 insertions, 7 deletions
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 3cec8c5..5713a6a 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -19,8 +19,8 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_20 - targetCompatibility = JavaVersion.VERSION_20 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } buildTypes { getByName("release") { @@ -58,11 +58,11 @@ dependencies { implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2") implementation("androidx.preference:preference-ktx:1.2.1") implementation("io.insert-koin:koin-android:3.1.4") - implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.activity:activity-ktx:1.7.2") implementation("androidx.fragment:fragment-ktx:1.6.1") implementation("io.ktor:ktor-client-serialization:1.6.6") - implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.1") + implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0") implementation("com.github.zerobranch:SwipeLayout:1.3.1") implementation("com.github.addisonElliott:SegmentedButton:3.1.9") implementation("mil.nga.sf:sf-wkt:1.0.1") diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml index d058321..0a3a539 100644 --- a/androidApp/src/main/AndroidManifest.xml +++ b/androidApp/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest +<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"> <uses-permission android:name="android.permission.INTERNET" /> @@ -11,7 +11,9 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + android:enableOnBackInvokedCallback="true" + tools:targetApi="tiramisu"> <activity android:name=".session.LoginActivity" android:exported="true"> diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt index b04bfbc..4915c49 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/MapFragment.kt @@ -114,6 +114,12 @@ open class MapFragment : GlobeMapFragment() { hasStarted = false } + override fun onDestroyView() { + super.onDestroyView() + loader?.shutdown() + loader = null + } + override fun mapDidStopMoving( mapControl: MapController?, corners: Array<out Point3d>?, diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index c47336d..94b8f09 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { androidTarget() - jvmToolchain(20) + jvmToolchain(17) listOf( iosX64(), @@ -68,4 +68,8 @@ android { } } namespace = "mx.trackermap.TrackerMap" + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } }
\ No newline at end of file |