Merge pull request #24 from ReneeVandervelde/21-api

Older / API 21 bugfixes

Author: ReneeVandervelde

android-application/build.gradle.kts

@@ -58,12 +58,15 @@ android {
                 signingConfigs.getByName("debug")
             }
 
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
     }
     compileOptions {
         targetCompatibility = JavaVersion.VERSION_1_8
         sourceCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = true
     }
     kotlinOptions {
         jvmTarget = "1.8"
@@ -127,4 +130,5 @@ dependencies {
     testImplementation(thirdParty.junit)
     testImplementation(kotlinLibraries.coroutines.test)
     testImplementation(kotlinLibraries.kotlin.test.core)
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
 }

android-application/proguard-rules.pro

@@ -0,0 +1,27 @@
+# Kotlin
+-keepattributes InnerClasses # Needed for `getDeclaredClasses`.
+-keep public class kotlinx.serialization.* { public *; }
+-dontwarn kotlinx.serialization.**
+-keepnames class <1>$$serializer { # -keepnames suffices; class is kept when serializer() is kept.
+    static <1>$$serializer INSTANCE;
+}
+
+# Okhttp
+-keep public class org.bouncycastle.jsse.** { *; }
+-dontwarn org.bouncycastle.jsse.**
+-keep public class org.conscrypt.** { *; }
+-dontwarn org.conscrypt.**
+-keep public class org.openjsse.** { *; }
+-dontwarn org.openjsse.**
+
+# Mapbox
+-keep class com.mapbox.android.telemetry.**
+-keep class com.mapbox.android.core.location.**
+-keep class android.arch.lifecycle.** { *; }
+-keep class com.mapbox.android.core.location.** { *; }
+-dontnote com.mapbox.mapboxsdk.**
+-dontnote com.mapbox.android.gestures.**
+-dontnote com.mapbox.mapboxsdk.plugins.**
+
+-keep public class com.google.android.gms.* { public *; }
+-dontwarn com.google.android.gms.**

android-application/src/main/java/com/inkapplications/ack/android/ui/theme/AckTheme.kt

@@ -51,7 +51,7 @@ object AckTheme {
     val colors
         @Composable
         @ReadOnlyComposable
-        get() = if (isSystemInDarkTheme()) darkColors else lightColors
+        get() = if (isSystemInDarkTheme() || Build.VERSION.SDK_INT < Build.VERSION_CODES.N) darkColors else lightColors
 
     val spacing
         @Composable

android-extensions/src/main/java/com/inkapplications/android/extensions/ApplicationModule.kt

@@ -10,6 +10,7 @@ import android.location.LocationManager
 import androidx.preference.PreferenceManager
 import com.inkapplications.android.extensions.bluetooth.AndroidBluetoothAccess
 import com.inkapplications.android.extensions.bluetooth.BluetoothDeviceAccess
+import com.inkapplications.android.extensions.bluetooth.DummyBluetoothDeviceAccess
 import com.inkapplications.android.extensions.format.AndroidResourceDateTimeFormatter
 import com.inkapplications.android.extensions.format.DateTimeFormatter
 import com.inkapplications.android.extensions.location.AndroidLocationAccess
@@ -47,11 +48,13 @@ class ApplicationModule {
     @Reusable
     fun bluetoothAccess(
         context: Context,
-        bluetooth: BluetoothAdapter,
-    ): BluetoothDeviceAccess = AndroidBluetoothAccess(
-        context = context,
-        bluetoothAdapter = bluetooth,
-    )
+    ): BluetoothDeviceAccess {
+        val bluetooth = BluetoothAdapter.getDefaultAdapter() ?: return DummyBluetoothDeviceAccess
+        return AndroidBluetoothAccess(
+            context = context,
+            bluetoothAdapter = bluetooth,
+        )
+    }
 }
 
 @Module

android-extensions/src/main/java/com/inkapplications/android/extensions/bluetooth/BluetoothDeviceAccess.kt

@@ -3,6 +3,7 @@ package com.inkapplications.android.extensions.bluetooth
 import android.Manifest
 import androidx.annotation.RequiresPermission
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
 import java.io.InputStream
 import java.io.OutputStream
 import java.util.*
@@ -19,3 +20,15 @@ interface BluetoothDeviceAccess {
     )
 }
 
+/**
+ * No-op implementation of [BluetoothDeviceAccess].
+ */
+object DummyBluetoothDeviceAccess: BluetoothDeviceAccess {
+    override val devices: Flow<List<BluetoothDeviceData>> = flowOf()
+
+    override suspend fun connect(
+        device: BluetoothDeviceData,
+        uuid: UUID,
+        onConnect: suspend (InputStream, OutputStream) -> Unit,
+    ) = Unit
+}