android: add material 3 expressive theme

All of the new UI was written by hand!
also fixed upgraded being set to false in FOSS builds when opening App settings. should've been a different commit, but ¯\_(ツ)_/¯

Author: kavishdevar

android/app/build.gradle.kts

@@ -1,6 +1,6 @@
 import java.util.Properties
 
-val appVersionName = "0.3.0"
+val appVersionName = "1.0.0-rc1"
 
 plugins {
     alias(libs.plugins.android.application)
@@ -24,6 +24,14 @@ val releaseSigningAvailable = listOf(
     "RELEASE_KEY_PASSWORD"
 ).all { props[it]?.toString()?.isNotBlank() == true }
 
+kotlin {
+    compilerOptions {
+        optIn.add(
+            "androidx.compose.material3.ExperimentalMaterial3ExpressiveApi"
+        )
+    }
+}
+
 android {
     signingConfigs {
         if (releaseSigningAvailable) {
@@ -41,7 +49,7 @@ android {
     defaultConfig {
         applicationId = "me.kavishdevar.librepods"
         targetSdk = 37
-        versionCode = 56
+        versionCode = 61
         versionName = appVersionName
     }
     buildTypes {
@@ -117,6 +125,7 @@ android {
 dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.accompanist.permissions)
+    implementation(libs.androidx.compose.ui.text.google.fonts)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.process)
     implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -145,6 +154,10 @@ dependencies {
     implementation(libs.libxposed.service)
     implementation(libs.play.review)
     implementation(libs.play.review.ktx)
+    implementation(libs.androidx.navigation3.ui)
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
+    implementation(libs.androidx.navigationevent)
 }
 
 aboutLibraries {

android/app/src/main/java/me/kavishdevar/librepods/MainActivity.kt

@@ -1159,7 +1159,7 @@ class AACPManager {
                 )
             }
 
-            val socket = BluetoothConnectionManager.getAACPSocket() ?: return false
+            val socket = BluetoothConnectionManager.aacpSocket ?: return false
 
             if (socket.isConnected) {
                 socket.outputStream?.write(packet)

android/app/src/main/java/me/kavishdevar/librepods/bluetooth/AACPManager.kt

@@ -34,7 +34,7 @@ enum class ATTHandles(val value: Int) {
 
 enum class ATTCCCDHandles(val value: Int) {
     TRANSPARENCY(ATTHandles.TRANSPARENCY.value + 1),
-//    LOUD_SOUND_REDUCTION(ATTHandles.LOUD_SOUND_REDUCTION.value + 1), // doesn't work
+    //    LOUD_SOUND_REDUCTION(ATTHandles.LOUD_SOUND_REDUCTION.value + 1), // doesn't work
     HEARING_AID(ATTHandles.HEARING_AID.value + 1)
 }
 
@@ -86,7 +86,7 @@ class ATTManagerv2 {
     }
 
     fun readCharacteristic(handle: ATTHandles, timeoutMillis: Long = 2000): ByteArray? {
-        val socket = BluetoothConnectionManager.getATTSocket() ?: return null
+        val socket = BluetoothConnectionManager.attSocket ?: return null
         try {
             val output = socket.outputStream
             val pdu = byteArrayOf(0x0A, handle.value.toByte(), 0x00)
@@ -117,7 +117,7 @@ class ATTManagerv2 {
     }
 
     fun writeCharacteristic(handle: Byte, data: ByteArray, timeoutMillis: Long = 2000) {
-        val socket = BluetoothConnectionManager.getATTSocket() ?: return
+        val socket = BluetoothConnectionManager.attSocket ?: return
         try {
             val output = socket.outputStream
             val pdu = byteArrayOf(0x12, handle, 0x00) + data // 0x00 for LE
@@ -141,7 +141,7 @@ class ATTManagerv2 {
     fun disconnected() {
         characteristicList.clear()
         stopReader()
-        val socket = BluetoothConnectionManager.getATTSocket() ?: return
+        val socket = BluetoothConnectionManager.attSocket?: return
         try {
             socket.close()
         } catch (e: Exception) {
@@ -151,7 +151,7 @@ class ATTManagerv2 {
     }
 
     private fun runReaderLoop() {
-        val socket = BluetoothConnectionManager.getATTSocket() ?: run {
+        val socket = BluetoothConnectionManager.attSocket ?: run {
             Log.w(TAG, "ATT socket not available. stopping reader")
             readerRunning.set(false)
             return

android/app/src/main/java/me/kavishdevar/librepods/bluetooth/ATTManager.kt

@@ -18,22 +18,59 @@
 
 package me.kavishdevar.librepods.bluetooth
 
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothSocket
+import android.os.ParcelUuid
+import android.util.Log
 
 object BluetoothConnectionManager {
-    private var aacpSocket: BluetoothSocket? = null
-    private var attSocket: BluetoothSocket? = null
+    var aacpSocket: BluetoothSocket? = null
+    var attSocket: BluetoothSocket? = null
+}
 
-    fun setCurrentConnection(aacpSocket: BluetoothSocket?, attSocket: BluetoothSocket?) {
-        BluetoothConnectionManager.aacpSocket = aacpSocket
-        BluetoothConnectionManager.attSocket = attSocket
-    }
+fun createBluetoothSocket(
+    adapter: BluetoothAdapter, device: BluetoothDevice, uuid: ParcelUuid, psm: Int
+): BluetoothSocket {
+    val type = 3 // L2CAP
+    val constructorSpecs = listOf(
+        arrayOf(adapter, device, type, true, true, psm, uuid), // A16QPR3
+        arrayOf(device, type, true, true, psm, uuid),
+        arrayOf(device, type, 1, true, true, psm, uuid),
+        arrayOf(type, 1, true, true, device, psm, uuid),
+        arrayOf(type, true, true, device, psm, uuid)
+    )
 
-    fun getAACPSocket(): BluetoothSocket? {
-        return aacpSocket
+    val constructors = BluetoothSocket::class.java.declaredConstructors
+    Log.d("createSocket<psm>", "BluetoothSocket has ${constructors.size} constructors:")
+
+    constructors.forEachIndexed { index, constructor ->
+        val params = constructor.parameterTypes.joinToString(", ") { it.simpleName }
+        Log.d("createSocket<psm>", "Constructor $index: ($params)")
     }
 
-    fun getATTSocket(): BluetoothSocket? {
-        return attSocket
+    var lastException: Exception? = null
+    var attemptedConstructors = 0
+
+    for ((index, params) in constructorSpecs.withIndex()) {
+        try {
+            Log.d("createSocket<psm>", "Trying constructor signature #${index + 1}")
+            attemptedConstructors++
+
+            val paramTypes =
+                params.map { it::class.javaPrimitiveType ?: it::class.java }.toTypedArray()
+            val constructor = BluetoothSocket::class.java.getDeclaredConstructor(*paramTypes)
+            constructor.isAccessible = true
+            return constructor.newInstance(*params) as BluetoothSocket
+
+        } catch (e: Exception) {
+            Log.e("createSocket<psm>", "Constructor signature #${index + 1} failed: ${e.message}")
+            lastException = e
+        }
     }
+
+    val errorMessage =
+        "Failed to create BluetoothSocket after trying $attemptedConstructors constructor signatures"
+    Log.e("createSocket<psm>", errorMessage)
+    throw lastException ?: IllegalStateException(errorMessage)
 }

android/app/src/main/java/me/kavishdevar/librepods/bluetooth/BluetoothConnectionManager.kt

@@ -29,6 +29,7 @@ import me.kavishdevar.librepods.bluetooth.ATTHandles
 import java.io.IOException
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
+import kotlin.time.Duration.Companion.milliseconds
 
 private const val TAG = "HearingAidUtils"
 
@@ -144,7 +145,7 @@ fun sendHearingAidSettings(
 ) {
     debounceJob.value?.cancel()
     debounceJob.value = CoroutineScope(Dispatchers.IO).launch {
-        delay(100)
+        delay(100.milliseconds)
         try {
             Log.d(TAG, "Current data before update: ${currentData.joinToString(" ") { String.format("%02X", it) }}")
             if (currentData.size < 104) {

android/app/src/main/java/me/kavishdevar/librepods/data/HearingAid.kt

@@ -0,0 +1,9 @@
+package me.kavishdevar.librepods.data.updates
+
+import androidx.compose.runtime.Composable
+
+data class UpdateItem(
+    val titleRes: Int,
+    val descriptionRes: Int,
+    val demoComposeable: @Composable () -> Unit
+)

android/app/src/main/java/me/kavishdevar/librepods/data/updates/UpdateItem.kt

@@ -0,0 +1,35 @@
+package me.kavishdevar.librepods.data.updates
+
+import androidx.compose.runtime.Composable
+import me.kavishdevar.librepods.R
+import me.kavishdevar.librepods.presentation.screens.AirPodsSettingsScreenPreviewMaterial
+import me.kavishdevar.librepods.presentation.screens.EqualizerScreenPreviewApple
+import me.kavishdevar.librepods.presentation.screens.EqualizerScreenPreviewMaterial
+import me.kavishdevar.librepods.presentation.theme.DesignSystem
+import me.kavishdevar.librepods.presentation.theme.LocalDesignSystem
+
+val update0_3_1 = listOf(
+        UpdateItem(
+            titleRes = R.string.material3e,
+            descriptionRes = R.string.update_m3e_description,
+            demoComposeable = @Composable {
+                AirPodsSettingsScreenPreviewMaterial()
+            }
+        ),
+        UpdateItem(
+            titleRes = R.string.equalizer,
+            descriptionRes = R.string.update_equalizer_description,
+            demoComposeable = @Composable {
+                when (LocalDesignSystem.current) {
+                    DesignSystem.Apple -> {
+                        EqualizerScreenPreviewApple()
+                    }
+                    DesignSystem.Material -> {
+                        EqualizerScreenPreviewMaterial()
+                    }
+                }
+            }
+        ),
+    )
+
+val updates = update0_3_1