Feature/webview command type updates

app-mappings-overrides.json

@@ -0,0 +1 @@
+{}

app/src/main/kotlin/com/google/ai/sample/ApiKeyDialog.kt

@@ -114,11 +114,11 @@ fun ApiKeyDialog(
                             val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
                             val clip = ClipData.newPlainText("Puter Link", url)
                             clipboard.setPrimaryClip(clip)
-                            Toast.makeText(context, "Link is in the clipboard.", Toast.LENGTH_SHORT).show()
-                            Toast.makeText(context, "After the sign up paste the link in the Browser", Toast.LENGTH_LONG).show()
+                            Toast.makeText(context, com.google.ai.sample.util.UiStringsConfig.get("toast_link_copied", "Link is in the clipboard."), Toast.LENGTH_SHORT).show()
+                            Toast.makeText(context, com.google.ai.sample.util.UiStringsConfig.get("toast_paste_link_in_browser", "After the sign up paste the link in the Browser"), Toast.LENGTH_LONG).show()
                         }
                         if (selectedProvider == ApiProvider.CLOUDFLARE) {
-                            Toast.makeText(context, "After sign up use the search bar to find \"API token\"", Toast.LENGTH_LONG).show()
+                            Toast.makeText(context, com.google.ai.sample.util.UiStringsConfig.get("toast_find_api_token", "After sign up use the search bar to find \"API token\""), Toast.LENGTH_LONG).show()
                         }
 
                         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
@@ -171,7 +171,7 @@ fun ApiKeyDialog(
                             }
                         }
                     ) {
-                        Text("Add")
+                        Text(com.google.ai.sample.util.UiStringsConfig.get("apikey_add_button", "Add"))
                     }
                 }
 
@@ -223,7 +223,7 @@ fun ApiKeyDialog(
                                         loadKeysForProvider(selectedProvider)
                                     }
                                 ) {
-                                    Text("✕", textAlign = TextAlign.Center)
+                                    Text(com.google.ai.sample.util.UiStringsConfig.get("apikey_close_icon", "\u2715"), textAlign = TextAlign.Center)
                                 }
                             }
                         }
@@ -238,7 +238,7 @@ fun ApiKeyDialog(
                     horizontalArrangement = Arrangement.End
                 ) {
                         TextButton(onClick = onDismiss) {
-                        Text("Close")
+                        Text(com.google.ai.sample.util.UiStringsConfig.get("apikey_close_button", "Close"))
                     }
                 }
             }

app/src/main/kotlin/com/google/ai/sample/GenerativeAiViewModelFactory.kt

@@ -163,7 +163,7 @@ val GenerativeViewModelFactory = object : ViewModelProvider.Factory {
                         // Live API models
                         val liveApiManager = LiveApiManager(
                             apiKey = apiKey,
-                            modelName = currentModel.modelName,
+                            modelName = com.google.ai.sample.util.ModelIdentifierOverrides.resolve(currentModel),
                             temperature = genSettings.temperature.toDouble(),
                             topP = genSettings.topP.toDouble(),
                             topK = genSettings.topK.coerceAtLeast(1)
@@ -173,7 +173,7 @@ val GenerativeViewModelFactory = object : ViewModelProvider.Factory {
                         // or we use a fallback model for non-live operations
                         // Using the first non-live model as fallback
                         val fallbackModel = GenerativeModel(
-                            modelName = ModelOption.GEMINI_FLASH_PREVIEW.modelName, // Using Gemini 2.5 Flash as fallback
+                            modelName = com.google.ai.sample.util.ModelIdentifierOverrides.resolve(ModelOption.GEMINI_FLASH_PREVIEW), // Using Gemini 2.5 Flash as fallback
                             apiKey = apiKey,
                             generationConfig = config
                         )
@@ -190,7 +190,7 @@ val GenerativeViewModelFactory = object : ViewModelProvider.Factory {
                     } else {
                         // Regular generative models
                         val generativeModel = GenerativeModel(
-                            modelName = currentModel.modelName,
+                            modelName = com.google.ai.sample.util.ModelIdentifierOverrides.resolve(currentModel),
                             apiKey = apiKey,
                             generationConfig = config
                         )

app/src/main/kotlin/com/google/ai/sample/MainActivity.kt

@@ -307,7 +307,7 @@ class MainActivity : ComponentActivity() {
 
     private fun handleMediaProjectionPermissionDenied() {
         Log.w(TAG, "MediaProjection permission denied or cancelled by user.")
-        Toast.makeText(this, "Screen capture permission denied", Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, com.google.ai.sample.util.UiStringsConfig.get("toast_screen_capture_permission_denied", "Screen capture permission denied"), Toast.LENGTH_SHORT).show()
         resetExplicitScreenshotRequestFlagIfNeeded("explicit denial")
         _isMediaProjectionPermissionGranted.value = false
     }
@@ -332,7 +332,7 @@ class MainActivity : ComponentActivity() {
 
     private fun handleWebRtcMediaProjectionPermissionDenied() {
         Log.w(TAG, "WebRTC MediaProjection permission denied.")
-        Toast.makeText(this, "Screen capture permission denied", Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, com.google.ai.sample.util.UiStringsConfig.get("toast_screen_capture_permission_denied", "Screen capture permission denied"), Toast.LENGTH_SHORT).show()
         onWebRtcMediaProjectionResult = null
     }
 
@@ -354,18 +354,18 @@ class MainActivity : ComponentActivity() {
     private fun registerPermissionLaunchers() {
         requestNotificationPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
             if (isGranted) {
-                Toast.makeText(this, "Notification permission granted.", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, com.google.ai.sample.util.UiStringsConfig.get("toast_notification_permission_granted", "Notification permission granted."), Toast.LENGTH_SHORT).show()
             } else {
-                Toast.makeText(this, "Notification permission denied. Stop via notification will not be available.", Toast.LENGTH_LONG).show()
+                Toast.makeText(this, com.google.ai.sample.util.UiStringsConfig.get("toast_notification_permission_denied", "Notification permission denied. Stop via notification will not be available."), Toast.LENGTH_LONG).show()
             }
         }
 
         requestForegroundServicePermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
             if (isGranted) {
-                Toast.makeText(this, "Foreground service permission granted.", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, com.google.ai.sample.util.UiStringsConfig.get("toast_foreground_service_permission_granted", "Foreground service permission granted."), Toast.LENGTH_SHORT).show()
                 launchCaptureIntent(mediaProjectionLauncher, "requestForegroundServicePermissionLauncher")
             } else {
-                Toast.makeText(this, "Foreground service permission denied. The app may not function correctly.", Toast.LENGTH_LONG).show()
+                Toast.makeText(this, com.google.ai.sample.util.UiStringsConfig.get("toast_foreground_service_permission_denied", "Foreground service permission denied. The app may not function correctly."), Toast.LENGTH_LONG).show()
             }
         }
     }
@@ -465,7 +465,7 @@ class MainActivity : ComponentActivity() {
             // This situation (service not running but takeAdditionalScreenshot called directly)
             // should ideally be handled by the caller checking isRunning() first.
             // If called from screenshotRequestHandler, it would have called requestMediaProjectionPermission instead.
-            Toast.makeText(this, "Screenshot service not active. Please grant permission first.", Toast.LENGTH_LONG).show()
+            Toast.makeText(this, com.google.ai.sample.util.UiStringsConfig.get("toast_screenshot_service_not_active", "Screenshot service not active. Please grant permission first."), Toast.LENGTH_LONG).show()
             // Optionally, trigger permission request again if appropriate for the use case.
             // requestMediaProjectionPermission() // This might be too aggressive if called from unexpected places.
         }
@@ -560,10 +560,10 @@ class MainActivity : ComponentActivity() {
             }
         } else if (billingResult.responseCode == BillingClient.BillingResponseCode.USER_CANCELED) {
             Log.i(TAG, "purchasesUpdatedListener: User cancelled the purchase flow.")
-            Toast.makeText(this, "Support cancelled.", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, com.google.ai.sample.util.UiStringsConfig.get("toast_support_cancelled", "Support cancelled."), Toast.LENGTH_SHORT).show()
         } else {
             Log.e(TAG, "purchasesUpdatedListener: Billing error: ${billingResult.debugMessage} (Code: ${billingResult.responseCode})")
-            Toast.makeText(this, "Error during donation process: ${billingResult.debugMessage}", Toast.LENGTH_LONG).show()
+            Toast.makeText(this, com.google.ai.sample.util.UiStringsConfig.get("toast_donation_error", "Error during donation process: {0}", billingResult.debugMessage), Toast.LENGTH_LONG).show()
         }
     }
 
@@ -744,7 +744,7 @@ class MainActivity : ComponentActivity() {
                             onDismiss = { showPaymentMethodDialog = false },
                             onPayPalClick = {
                                 showPaymentMethodDialog = false
-                                Toast.makeText(this@MainActivity, "PayPal ist in dieser Fallback-UI noch nicht verfügbar.", Toast.LENGTH_LONG).show()
+                                Toast.makeText(this@MainActivity, com.google.ai.sample.util.UiStringsConfig.get("toast_paypal_fallback_unavailable", "PayPal ist in dieser Fallback-UI noch nicht verfügbar."), Toast.LENGTH_LONG).show()
                             },
                             onGooglePlayClick = {
                                 showPaymentMethodDialog = false
@@ -1202,15 +1202,15 @@ class MainActivity : ComponentActivity() {
                         updateTrialState(TrialManager.getTrialState(this, null))
                         if (currentTrialState == TrialManager.TrialState.EXPIRED_INTERNET_TIME_CONFIRMED) {
                             Log.i(TAG, "queryActiveSubscriptions: Subscription deactivated (no active sub and trial expired). Showing Toast.")
-                            Toast.makeText(this@MainActivity, "Subscription is deactivated", Toast.LENGTH_LONG).show()
+                            Toast.makeText(this@MainActivity, com.google.ai.sample.util.UiStringsConfig.get("toast_subscription_deactivated", "Subscription is deactivated"), Toast.LENGTH_LONG).show()
                         }
                         startTrialServiceIfNeeded()
                     } else {
                          Log.w(TAG, "queryActiveSubscriptions: No active sub from Google, but TrialManager says PURCHASED. This could be due to restored SharedPreferences without active subscription. Re-evaluating trial logic based on no internet time.")
                          updateTrialState(TrialManager.getTrialState(this, null))
                          if (currentTrialState == TrialManager.TrialState.EXPIRED_INTERNET_TIME_CONFIRMED) {
                             Log.i(TAG, "queryActiveSubscriptions: Subscription deactivated (no active sub, was purchased, now trial expired). Showing Toast.")
-                            Toast.makeText(this@MainActivity, "Subscription is deactivated", Toast.LENGTH_LONG).show()
+                            Toast.makeText(this@MainActivity, com.google.ai.sample.util.UiStringsConfig.get("toast_subscription_deactivated", "Subscription is deactivated"), Toast.LENGTH_LONG).show()
                          }
                          startTrialServiceIfNeeded()
                     }
@@ -1226,7 +1226,7 @@ class MainActivity : ComponentActivity() {
                     updateTrialState(TrialManager.getTrialState(this, null))
                     if (currentTrialState == TrialManager.TrialState.EXPIRED_INTERNET_TIME_CONFIRMED) {
                         Log.i(TAG, "queryActiveSubscriptions: Subscription deactivated (query failed, trial expired). Showing Toast.")
-                        Toast.makeText(this@MainActivity, "Subscription is deactivated", Toast.LENGTH_LONG).show()
+                        Toast.makeText(this@MainActivity, com.google.ai.sample.util.UiStringsConfig.get("toast_subscription_deactivated", "Subscription is deactivated"), Toast.LENGTH_LONG).show()
                     }
                     startTrialServiceIfNeeded()
                 }
@@ -1432,6 +1432,16 @@ class MainActivity : ComponentActivity() {
         Toast.makeText(this, toastMessage, Toast.LENGTH_SHORT).show()
     }
 
+    /**
+     * Evaluates a JavaScript expression in the active WebView on the UI thread.
+     * No-op if no WebView is currently loaded.
+     */
+    fun evaluateWebViewJs(js: String) {
+        webViewInstance?.post {
+            webViewInstance?.evaluateJavascript(js, null)
+        }
+    }
+
     /**
      * Escapes a string so it can be safely embedded inside a single-quoted JS string literal
      * passed to [WebView.evaluateJavascript]. Delegates to [WebViewBridge.jsEscape] so both

app/src/main/kotlin/com/google/ai/sample/MainActivityDialogs.kt

@@ -56,9 +56,10 @@ internal fun PaymentMethodDialog(
     onPayPalClick: () -> Unit,
     onGooglePlayClick: () -> Unit
 ) {
+    val ui = com.google.ai.sample.util.TrialUiConfig.current()
     androidx.compose.material3.AlertDialog(
         onDismissRequest = onDismiss,
-        title = { Text("Choose Payment Method") },
+        title = { Text(ui.paymentMethodDialogTitle) },
         text = {
             Column {
                 Button(
@@ -69,20 +70,20 @@ internal fun PaymentMethodDialog(
                         containerColor = Color.Gray
                     )
                 ) {
-                    Text("PayPal (2,90 €/Month)")
+                    Text(ui.paymentMethodPayPalButtonLabel)
                 }
                 Button(
                     onClick = onGooglePlayClick,
                     modifier = Modifier.fillMaxWidth()
                 ) {
-                    Text("Google Play (2,90 €/Month)")
+                    Text(ui.paymentMethodGooglePlayButtonLabel)
                 }
             }
         },
         confirmButton = {},
         dismissButton = {
             TextButton(onClick = onDismiss) {
-                Text("Cancel")
+                Text(ui.paymentMethodCancelButtonLabel)
             }
         }
     )
@@ -106,6 +107,7 @@ internal fun ApiKeyDialogSection(
 @Composable
 fun FirstLaunchInfoDialog(onDismiss: () -> Unit) {
     Log.d("FirstLaunchInfoDialog", "Composing FirstLaunchInfoDialog")
+    val ui = com.google.ai.sample.util.TrialUiConfig.current()
     Dialog(onDismissRequest = {
         Log.d("FirstLaunchInfoDialog", "onDismissRequest called")
         onDismiss()
@@ -123,12 +125,12 @@ fun FirstLaunchInfoDialog(onDismiss: () -> Unit) {
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
                 Text(
-                    text = "Trial Information",
+                    text = ui.firstLaunchDialogTitle,
                     style = MaterialTheme.typography.titleLarge
                 )
                 Spacer(modifier = Modifier.height(16.dp))
                 Text(
-                    text = "You can try Screen Operator for 7 days before you have to subscribe to support the development of more features.",
+                    text = ui.firstLaunchDialogBody,
                     style = MaterialTheme.typography.bodyMedium,
                     modifier = Modifier.align(Alignment.CenterHorizontally)
                 )
@@ -140,7 +142,7 @@ fun FirstLaunchInfoDialog(onDismiss: () -> Unit) {
                     },
                     modifier = Modifier.fillMaxWidth()
                 ) {
-                    Text("OK")
+                    Text(ui.firstLaunchDialogButton)
                 }
             }
         }
@@ -155,6 +157,7 @@ fun TrialExpiredDialog(
     @Suppress("UNUSED_PARAMETER") onDismiss: () -> Unit
 ) {
     Log.d("TrialExpiredDialog", "Composing TrialExpiredDialog")
+    val ui = com.google.ai.sample.util.TrialUiConfig.current()
     Dialog(onDismissRequest = {
         Log.d("TrialExpiredDialog", "onDismissRequest called (persistent dialog - user tried to dismiss)")
     }) {
@@ -171,12 +174,12 @@ fun TrialExpiredDialog(
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
                 Text(
-                    text = "Trial period expired",
+                    text = ui.trialExpiredDialogTitle,
                     style = MaterialTheme.typography.titleLarge
                 )
                 Spacer(modifier = Modifier.height(16.dp))
                 Text(
-                    text = "Please support the development of the app so that you can continue using it \uD83C\uDF89",
+                    text = ui.trialExpiredDialogBody,
                     style = MaterialTheme.typography.bodyMedium,
                     modifier = Modifier.align(Alignment.CenterHorizontally)
                 )
@@ -188,7 +191,7 @@ fun TrialExpiredDialog(
                     },
                     modifier = Modifier.fillMaxWidth()
                 ) {
-                    Text("Subscribe")
+                    Text(ui.trialExpiredDialogSubscribeButton)
                 }
             }
         }
@@ -201,6 +204,7 @@ fun InfoDialog(
     onDismiss: () -> Unit
 ) {
     Log.d("InfoDialog", "Composing InfoDialog with message: $message")
+    val ui = com.google.ai.sample.util.TrialUiConfig.current()
     Dialog(onDismissRequest = {
         Log.d("InfoDialog", "onDismissRequest called")
         onDismiss()
@@ -218,7 +222,7 @@ fun InfoDialog(
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
                 Text(
-                    text = "Information",
+                    text = ui.infoDialogTitle,
                     style = MaterialTheme.typography.titleMedium
                 )
                 Spacer(modifier = Modifier.height(16.dp))
@@ -232,7 +236,7 @@ fun InfoDialog(
                     Log.d("InfoDialog", "OK button clicked")
                     onDismiss()
                 }) {
-                    Text("OK")
+                    Text(com.google.ai.sample.util.UiStringsConfig.get("apikey_dialog_ok", "OK"))
                 }
             }
         }