Fix Android CI: Kotlin 2.1, args parsing, screen imports, Material3 opt-in, heap

Author: Alex J Lennon

.github/workflows/android-build.yml

@@ -46,6 +46,7 @@ jobs:
           gradle assembleDebug --no-daemon --stacktrace
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PACKAGES_READ_TOKEN || secrets.GITHUB_TOKEN }}
+          GRADLE_OPTS: -Xmx3072m -XX:MaxMetaspaceSize=512m
 
       - name: Upload APK artifact
         uses: actions/upload-artifact@v4

samples/CameraAccessAndroid/app/src/main/java/com/dynamicdevices/visionclaw/gemini/GeminiLiveService.kt

@@ -250,7 +250,12 @@ class GeminiLiveService {
                 GeminiFunctionCall(
                     id = c.optString("id", ""),
                     name = c.optString("name", ""),
-                    args = c.optJSONObject("args")?.keySet()?.associateWith { c.opt(it) } ?: emptyMap()
+                    args = c.optJSONObject("args")?.let { argsObj ->
+                    val keys = mutableListOf<String>()
+                    val iter = argsObj.keys()
+                    while (iter.hasNext()) keys.add(iter.next())
+                    keys.associateWith { argsObj.opt(it) }
+                } ?: emptyMap()
                 )
             }
             onToolCall?.invoke(GeminiToolCall(list))

samples/CameraAccessAndroid/app/src/main/java/com/dynamicdevices/visionclaw/ui/NavGraph.kt

@@ -2,6 +2,9 @@ package com.dynamicdevices.visionclaw.ui
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
+import com.dynamicdevices.visionclaw.ui.screens.HomeScreen
+import com.dynamicdevices.visionclaw.ui.screens.SettingsScreen
+import com.dynamicdevices.visionclaw.ui.screens.StreamScreen
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController

samples/CameraAccessAndroid/app/src/main/java/com/dynamicdevices/visionclaw/ui/screens/SettingsScreen.kt

@@ -20,9 +20,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.ui.unit.dp
+import androidx.compose.material3.ExperimentalMaterial3Api
 import com.dynamicdevices.visionclaw.gemini.GeminiConfig
 import com.dynamicdevices.visionclaw.settings.SettingsProvider
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SettingsScreen(onBack: () -> Unit) {
     var apiKey by rememberSaveable { mutableStateOf(SettingsProvider.geminiApiKey) }

samples/CameraAccessAndroid/gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmArgs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3072m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true

samples/CameraAccessAndroid/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 agp = "8.7.2"
-kotlin = "1.9.22"
+kotlin = "2.1.0"
 coreKtx = "1.12.0"
 lifecycleRuntimeKtx = "2.7.0"
 activityCompose = "1.8.2"