Skip to content

Update PhotoReasoningScreen.kt #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Android-PowerUser merged 1 commit into from
May 10, 2025
Merged

Update PhotoReasoningScreen.kt #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions app/src/main/kotlin/com/google/ai/sample/feature/multimodal/PhotoReasoningScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.content.Intent
import android.graphics.drawable.BitmapDrawable
import android.net.Uri
import android.provider.Settings
import android.widget.Toast // Added for Toast message
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.PickVisualMediaRequest
import androidx.activity.result.contract.ActivityResultContracts
Expand Down Expand Up @@ -148,13 +149,14 @@ internal fun PhotoReasoningRoute(
viewModel.reason(inputText, bitmaps)
}
},
isAccessibilityServiceEnabled = isAccessibilityServiceEffectivelyEnabled, // Use the collected state
isAccessibilityServiceEnabled = isAccessibilityServiceEffectivelyEnabled,
onEnableAccessibilityService = {
mainActivity?.let {
val intent = it.getAccessibilitySettingsIntent()
try {
accessibilitySettingsLauncher.launch(intent)
it.updateStatusMessage("Bitte aktivieren Sie den Dienst für 'Generative AI Sample'.")
// Removed the toast from here as it's now handled by the send button
// and the dedicated "activate" button on the warning card.
} catch (e: Exception) {
Log.e("PhotoReasoningRoute", "Error opening accessibility settings", e)
it.updateStatusMessage("Fehler beim Öffnen der Bedienungshilfen-Einstellungen.", true)
Expand All @@ -179,14 +181,14 @@ fun PhotoReasoningScreen(
chatMessages: List<PhotoReasoningMessage> = emptyList(),
onSystemMessageChanged: (String) -> Unit = {},
onReasonClicked: (String, List<Uri>) -> Unit = { _, _ -> },
isAccessibilityServiceEnabled: Boolean = false, // This will now be updated reactively
isAccessibilityServiceEnabled: Boolean = false,
onEnableAccessibilityService: () -> Unit = {},
onClearChatHistory: () -> Unit = {}
) {
var userQuestion by rememberSaveable { mutableStateOf("") }
val imageUris = rememberSaveable(saver = UriSaver()) { mutableStateListOf() }
val listState = rememberLazyListState()
// val context = LocalContext.current // Already available from Route
val context = LocalContext.current // Get context for Toast

val pickMedia = rememberLauncherForActivityResult(
ActivityResultContracts.PickVisualMedia()
Expand Down Expand Up @@ -234,7 +236,6 @@ fun PhotoReasoningScreen(
}
}

// Accessibility Service Status Card - visibility controlled by isAccessibilityServiceEnabled
if (!isAccessibilityServiceEnabled) {
Card(
modifier = Modifier
Expand All @@ -259,7 +260,11 @@ fun PhotoReasoningScreen(
)
Spacer(modifier = Modifier.height(8.dp))
TextButton(
onClick = onEnableAccessibilityService
onClick = {
onEnableAccessibilityService()
// Optionally, show a toast here as well if the user clicks this specific button
Toast.makeText(context, "Öffne Bedienungshilfen-Einstellungen...", Toast.LENGTH_SHORT).show()
}
) {
Text("Accessibility Service aktivieren")
}
Expand Down Expand Up @@ -356,10 +361,18 @@ fun PhotoReasoningScreen(
)
IconButton(
onClick = {
if (userQuestion.isNotBlank()) {
onReasonClicked(userQuestion, imageUris.toList())
userQuestion = ""
// START: Updated Send button logic
if (isAccessibilityServiceEnabled) {
if (userQuestion.isNotBlank()) {
onReasonClicked(userQuestion, imageUris.toList())
userQuestion = "" // Clear input after sending
}
} else {
// Accessibility service is not enabled
onEnableAccessibilityService() // Open settings
Toast.makeText(context, "Enable the Accessibility service for Screen Operator", Toast.LENGTH_LONG).show()
}
// END: Updated Send button logic
},
modifier = Modifier
.padding(all = 4.dp)
Expand Down Expand Up @@ -434,7 +447,6 @@ fun PhotoReasoningScreen(
is Command.ClickButton -> "Klick auf Button: \"${command.buttonText}\""
is Command.TapCoordinates -> "Tippen auf Koordinaten: (${command.x}, ${command.y})"
is Command.TakeScreenshot -> "Screenshot aufnehmen"
// ... (other command types remain the same)
is Command.PressHomeButton -> "Home-Button drücken"
is Command.PressBackButton -> "Zurück-Button drücken"
is Command.ShowRecentApps -> "Übersicht der letzten Apps öffnen"
Expand Down Expand Up @@ -554,9 +566,9 @@ fun ModelChatBubble(
.drawBehind {
drawCircle(color = Color.White)
}
.padding(end = 8.dp) // Added padding to separate icon from text
.padding(end = 8.dp)
)
Column { // Wrap Text and CircularProgressIndicator in a Column
Column {
Text(
text = text,
color = MaterialTheme.colorScheme.onSecondaryContainer
Expand Down