Address Live sample compose comments

Author: lethargicpanda

ai-catalog/samples/gemini-live-todo/src/main/java/com/android/ai/samples/geminilivetodo/ui/TodoScreen.kt

@@ -15,7 +15,10 @@
  */
 package com.android.ai.samples.geminilivetodo.ui
 
+import android.Manifest
 import android.app.Activity
+import android.content.pm.PackageManager
+import android.widget.Toast
 import androidx.activity.compose.LocalActivity
 import androidx.compose.animation.Animatable
 import androidx.compose.animation.animateColor
@@ -71,6 +74,8 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.ai.samples.geminilivetodo.R
@@ -90,7 +95,8 @@ fun TodoScreen(viewModel: TodoScreenViewModel = hiltViewModel()) {
     val activity = LocalActivity.current as Activity
 
     LaunchedEffect(Unit) {
-        viewModel.initializeGeminiLive(activity)
+        requestAudioPermissionIfNeeded(activity)
+        viewModel.initializeGeminiLive()
     }
 
     Scaffold(
@@ -106,7 +112,18 @@ fun TodoScreen(viewModel: TodoScreenViewModel = hiltViewModel()) {
         floatingActionButton = {
             MicButton(
                 uiState = uiState,
-                onToggle = { viewModel.toggleLiveSession(activity) },
+                modifier = Modifier,
+                onToggle = {
+                    if (ContextCompat.checkSelfPermission(
+                            activity,
+                            Manifest.permission.RECORD_AUDIO,
+                        ) == PackageManager.PERMISSION_GRANTED
+                    ) {
+                        viewModel.toggleLiveSession()
+                    } else {
+                        Toast.makeText(activity, R.string.error_permission, Toast.LENGTH_SHORT).show()
+                    }
+                },
             )
         },
         floatingActionButtonPosition = FabPosition.Center,
@@ -121,6 +138,7 @@ fun TodoScreen(viewModel: TodoScreenViewModel = hiltViewModel()) {
         ) {
             TodoInput(
                 text = text,
+                modifier = Modifier,
                 onTextChange = { text = it },
                 onAddClick = {
                     viewModel.addTodo(text)
@@ -176,7 +194,7 @@ fun TodoScreen(viewModel: TodoScreenViewModel = hiltViewModel()) {
 }
 
 @Composable
-fun TodoInput(text: String, onTextChange: (String) -> Unit, onAddClick: () -> Unit) {
+fun TodoInput(text: String, modifier: Modifier, onTextChange: (String) -> Unit, onAddClick: () -> Unit) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
@@ -201,7 +219,7 @@ fun TodoInput(text: String, onTextChange: (String) -> Unit, onAddClick: () -> Un
 }
 
 @Composable
-fun MicButton(uiState: TodoScreenUiState, onToggle: () -> Unit) {
+fun MicButton(uiState: TodoScreenUiState, modifier: Modifier, onToggle: () -> Unit) {
     if (uiState is TodoScreenUiState.Success) {
         val micIcon = when {
             uiState.liveSessionState is LiveSessionState.Ready -> Icons.Filled.MicOff
@@ -283,3 +301,13 @@ fun TodoItem(modifier: Modifier, task: Todo, onToggle: () -> Unit, onDelete: ()
         }
     }
 }
+
+private fun requestAudioPermissionIfNeeded(activity: Activity) {
+    if (ContextCompat.checkSelfPermission(
+            activity,
+            Manifest.permission.RECORD_AUDIO,
+        ) != PackageManager.PERMISSION_GRANTED
+    ) {
+        ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.RECORD_AUDIO), 1)
+    }
+}

ai-catalog/samples/gemini-live-todo/src/main/java/com/android/ai/samples/geminilivetodo/ui/TodoScreenViewModel.kt

@@ -83,20 +83,14 @@ class TodoScreenViewModel @Inject constructor(private val todoRepository: TodoRe
     }
 
     @SuppressLint("MissingPermission")
-    fun toggleLiveSession(activity: Activity) {
+    fun toggleLiveSession() {
         viewModelScope.launch {
             if (liveSessionState.value is LiveSessionState.NotReady) return@launch
 
             session?.let {
                 if (liveSessionState.value is LiveSessionState.Ready) {
-                    if (ContextCompat.checkSelfPermission(
-                            activity,
-                            Manifest.permission.RECORD_AUDIO,
-                        ) == PackageManager.PERMISSION_GRANTED
-                    ) {
-                        it.startAudioConversation(::handleFunctionCall)
-                        liveSessionState.value = LiveSessionState.Running
-                    }
+                    it.startAudioConversation(::handleFunctionCall)
+                    liveSessionState.value = LiveSessionState.Running
                 } else {
                     it.stopAudioConversation()
                     liveSessionState.value = LiveSessionState.Ready
@@ -105,8 +99,7 @@ class TodoScreenViewModel @Inject constructor(private val todoRepository: TodoRe
         }
     }
 
-    fun initializeGeminiLive(activity: Activity) {
-        requestAudioPermissionIfNeeded(activity)
+    fun initializeGeminiLive() {
         viewModelScope.launch {
             Log.d(TAG, "Start Gemini Live initialization")
             val liveGenerationConfig = liveGenerationConfig {
@@ -233,14 +226,4 @@ class TodoScreenViewModel @Inject constructor(private val todoRepository: TodoRe
             }
         }
     }
-
-    fun requestAudioPermissionIfNeeded(activity: Activity) {
-        if (ContextCompat.checkSelfPermission(
-                activity,
-                Manifest.permission.RECORD_AUDIO,
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.RECORD_AUDIO), 1)
-        }
-    }
 }

ai-catalog/samples/gemini-live-todo/src/main/res/values/strings.xml

@@ -21,6 +21,7 @@
     <string name="add_button">Add</string>
     <string name="error_title">Error</string>
     <string name="error_message">The live session model could not be initialized.</string>
+    <string name="error_permission">Enable audio recording permission.</string>
     <string name="dismiss_button">Dismiss</string>
     <string name="interact_with_todolist_by_voice">Button to start the live session and interact with the todo list by voice</string>
 </resources>