Integrate reviewed mobile steering, browser, Chinese and trust features

android/app/src/main/AndroidManifest.xml

@@ -83,6 +83,7 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
+        android:localeConfig="@xml/locales_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"

android/app/src/main/kotlin/com/openmausbot/companion/ui/AgentProfileSheet.kt

@@ -1,5 +1,7 @@
 package com.openmausbot.companion.ui
 
+import androidx.compose.ui.res.stringResource
+
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -221,10 +223,10 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                         onClick = onDismiss,
                         modifier = Modifier.align(Alignment.CenterStart),
                     ) {
-                        Text("Done")
+                        Text(stringResource(R.string.mobile_done_e9b450d1))
                     }
                     Text(
-                        text = "Bot settings",
+                        text = stringResource(R.string.mobile_bot_settings_7092a294),
                         fontSize = 17.sp,
                         fontWeight = FontWeight.SemiBold,
                         modifier = Modifier.align(Alignment.Center),
@@ -280,7 +282,7 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                             modifier = Modifier.fillMaxWidth().heightIn(min = MIN_TOUCH_TARGET),
                             verticalAlignment = Alignment.CenterVertically,
                         ) {
-                            Text(ModelRules.LOADING, fontSize = 15.sp, modifier = Modifier.weight(1f))
+                            Text(localizedMobileCopy(ModelRules.LOADING), fontSize = 15.sp, modifier = Modifier.weight(1f))
                             CircularProgressIndicator(modifier = Modifier.size(20.dp))
                         }
                     } else if (instanceChoices.isEmpty()) {
@@ -309,7 +311,7 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                             }
                         }
                         ChoicePicker(
-                            label = "Provider",
+                            label = stringResource(R.string.mobile_provider_7ceee3f3),
                             choices = providerRows,
                             selected = selectedInstanceId,
                             onSelect = { id ->
@@ -318,7 +320,7 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                             },
                         )
                         ChoicePicker(
-                            label = "Model",
+                            label = stringResource(R.string.mobile_model_68c2cc7f),
                             choices = ModelRules.modelChoices(selectedInstance, selectedModelId).map {
                                 VoiceChoice(id = it.id, label = it.label, detail = null, enabled = true)
                             },
@@ -329,7 +331,7 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                         val effortLevels = ModelRules.effortLevels(selectedInstance)
                         if (effortLevels.isNotEmpty()) {
                             ChoicePicker(
-                                label = "Reasoning effort",
+                                label = stringResource(R.string.mobile_reasoning_effort_cd32c0f5),
                                 choices = buildList {
                                     add(VoiceChoice(id = "", label = ModelRules.DEFAULT_EFFORT_LABEL, detail = null, enabled = true))
                                     effortLevels.forEach {
@@ -381,7 +383,7 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                             bot = current,
                             size = 112.dp,
                             state = MausState.HAPPY,
-                            contentDescription = "${current.name} avatar",
+                            contentDescription = stringResource(R.string.mobile_current_name_avatar_de638954, current.name),
                         )
                     }
 
@@ -397,7 +399,7 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                                     count = AvatarCrop.entries.size,
                                 ),
                             ) {
-                                Text(ProfileRules.cropLabel(option))
+                                Text(localizedMobileCopy(ProfileRules.cropLabel(option)))
                             }
                         }
                     }
@@ -447,7 +449,7 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                     OutlinedTextField(
                         value = prompt,
                         onValueChange = { prompt = it },
-                        label = { Text("Art direction") },
+                        label = { Text(stringResource(R.string.mobile_art_direction_52d878a2)) },
                         minLines = 2,
                         maxLines = 5,
                         modifier = Modifier.fillMaxWidth(),
@@ -496,7 +498,7 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                     OutlinedTextField(
                         value = form.name,
                         onValueChange = { form = form.copy(name = it) },
-                        label = { Text("Name") },
+                        label = { Text(stringResource(R.string.mobile_name_709a2322)) },
                         singleLine = true,
                         keyboardOptions = KeyboardOptions(
                             capitalization = KeyboardCapitalization.Words,
@@ -506,20 +508,20 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                     OutlinedTextField(
                         value = form.title,
                         onValueChange = { form = form.copy(title = it) },
-                        label = { Text("Title") },
+                        label = { Text(stringResource(R.string.mobile_title_768e0c1c)) },
                         singleLine = true,
                         modifier = Modifier.fillMaxWidth(),
                     )
                     OutlinedTextField(
                         value = form.description,
                         onValueChange = { form = form.copy(description = it) },
-                        label = { Text("What this agent does") },
+                        label = { Text(stringResource(R.string.mobile_what_this_agent_does_82aa1b56)) },
                         minLines = 3,
                         maxLines = 8,
                         modifier = Modifier.fillMaxWidth(),
                     )
                     SwitchRow(
-                        label = "Agent notifications",
+                        label = stringResource(R.string.mobile_agent_notifications_a3bd8bd0),
                         checked = form.notifications,
                         onCheckedChange = { form = form.copy(notifications = it) },
                     )
@@ -558,13 +560,13 @@ internal fun AgentProfileSheet(bot: Bot, onDismiss: () -> Unit, onOpenOverview:
                     },
                 ) {
                     ChoicePicker(
-                        label = "Voice",
+                        label = stringResource(R.string.mobile_voice_3091c844),
                         choices = ProfileRules.voiceChoices(config, voices, form.voice),
                         selected = form.voice,
                         onSelect = { form = form.copy(voice = it) },
                     )
                     SwitchRow(
-                        label = "Speak replies",
+                        label = stringResource(R.string.mobile_speak_replies_90b05ae0),
                         checked = form.speakReplies,
                         enabled = ProfileRules.selectedVoiceCanSpeak(config, form.voice),
                         onCheckedChange = { form = form.copy(speakReplies = it) },
@@ -658,7 +660,7 @@ internal fun ChoicePicker(
     enabled: Boolean = true,
 ) {
     var expanded by remember { mutableStateOf(false) }
-    val selectedLabel = choices.firstOrNull { it.id == selected }?.label.orEmpty()
+    val selectedLabel = localizedMobileCopy(choices.firstOrNull { it.id == selected }?.label.orEmpty())
     ExposedDropdownMenuBox(
         expanded = expanded && enabled,
         onExpandedChange = { if (enabled) expanded = it },
@@ -669,7 +671,7 @@ internal fun ChoicePicker(
             onValueChange = {},
             readOnly = true,
             enabled = enabled,
-            label = { Text(label) },
+            label = { Text(localizedMobileCopy(label)) },
             trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
             modifier = Modifier
                 .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable)
@@ -680,9 +682,9 @@ internal fun ChoicePicker(
                 DropdownMenuItem(
                     text = {
                         Column {
-                            Text(choice.label)
+                            Text(localizedMobileCopy(choice.label))
                             choice.detail?.let {
-                                Text(it, fontSize = 13.sp, color = secondaryTint)
+                                Text(localizedMobileCopy(it), fontSize = 13.sp, color = secondaryTint)
                             }
                         }
                     },
@@ -721,7 +723,7 @@ internal fun VoiceSection(
     val copy = ProfileRules.voiceCopy(config)
     FormSection(header = "Voice", footer = copy.footer) {
         ChoicePicker(
-            label = "Voice engine",
+            label = stringResource(R.string.mobile_voice_engine_3b4d8dea),
             choices = ProfileRules.providerChoices(),
             selected = (config?.voiceProvider ?: VoiceProvider.ELEVENLABS).wire,
             onSelect = { next -> onSwitchEngine(VoiceProvider.fromWire(next)) },
@@ -751,15 +753,15 @@ internal fun FormSection(
     ) {
         header?.let {
             Text(
-                text = it.uppercase(),
+                text = localizedMobileCopy(it).uppercase(),
                 fontSize = 12.sp,
                 fontWeight = FontWeight.SemiBold,
                 color = secondaryTint,
             )
         }
         HorizontalDivider()
         content()
-        footer?.let { Text(text = it, fontSize = 13.sp, color = secondaryTint) }
+        footer?.let { Text(text = localizedMobileCopy(it), fontSize = 13.sp, color = secondaryTint) }
     }
 }
 
@@ -800,7 +802,7 @@ internal fun ActionRow(
                 modifier = Modifier.size(20.dp),
             )
         }
-        Text(text = text, fontSize = 15.sp, color = tint)
+        Text(text = localizedMobileCopy(text), fontSize = 15.sp, color = tint)
     }
 }
 
@@ -862,7 +864,7 @@ internal fun IconNote(
                 modifier = Modifier.size(18.dp),
             )
         }
-        Text(text = text, fontSize = 13.sp, color = resolved)
+        Text(text = localizedMobileCopy(text), fontSize = 13.sp, color = resolved)
     }
 }
 

android/app/src/main/kotlin/com/openmausbot/companion/ui/AttentionInbox.kt

@@ -15,6 +15,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.res.stringResource
+import com.openmausbot.companion.R
 import com.openmausbot.companion.core.Bot
 import com.openmausbot.companion.core.BotTask
 import com.openmausbot.companion.core.CompanionState
@@ -94,6 +96,12 @@ private fun attentionRank(entry: AttentionEntry): Int = when {
 /** Selection only: the row jumps; menus and management stay in the sheet. */
 @Composable
 internal fun AttentionRow(entry: AttentionEntry, onOpen: () -> Unit) {
+    val status = when {
+        entry.task.activity == "waiting-on-you" -> stringResource(R.string.mobile_waiting_on_you_edab5b72)
+        entry.task.busy == true || entry.task.activity == "working" -> stringResource(R.string.mobile_thread_working)
+        entry.queued -> stringResource(R.string.mobile_queued_6a599877)
+        else -> stringResource(R.string.mobile_unread_07b032b5)
+    }
     Row(
         modifier = Modifier
             .fillMaxWidth()
@@ -115,7 +123,7 @@ internal fun AttentionRow(entry: AttentionEntry, onOpen: () -> Unit) {
                 overflow = TextOverflow.Ellipsis,
             )
             Text(
-                text = "${entry.botName} · ${entry.statusLine()}",
+                text = "${entry.botName} · $status",
                 fontSize = 12.sp,
                 color = secondaryTint,
                 maxLines = 1,

android/app/src/main/kotlin/com/openmausbot/companion/ui/BotOverviewScreen.kt

@@ -24,6 +24,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -77,7 +78,7 @@ fun BotOverviewScreen(botId: String, onBack: () -> Unit) {
     }
 
     val name = overview?.who?.name ?: state.bot(botId)?.name.orEmpty()
-    val title = OverviewRules.title(name)
+    val title = stringResource(R.string.mobile_overview_title, name)
 
     Column(modifier = Modifier.fillMaxSize()) {
         Row(
@@ -114,7 +115,7 @@ fun BotOverviewScreen(botId: String, onBack: () -> Unit) {
                     }
                     current != null -> OverviewBody(current)
                     failed -> FormSection(header = null) {
-                        Text(OverviewRules.FAILED, color = secondaryTint)
+                        Text(localizedMobileCopy(OverviewRules.FAILED), color = secondaryTint)
                     }
                 }
             }
@@ -139,7 +140,7 @@ private fun OverviewBody(overview: BotOverview) {
 
     FormSection(header = OverviewRules.DOES) {
         if (overview.does.isEmpty()) {
-            Text(OverviewRules.EMPTY_DOES, color = secondaryTint)
+            Text(localizedMobileCopy(OverviewRules.EMPTY_DOES), color = secondaryTint)
         } else {
             overview.does.forEach { line ->
                 IconNote(text = line, painter = R.drawable.ic_schedule)
@@ -164,7 +165,7 @@ private fun OverviewBody(overview: BotOverview) {
 
     FormSection(header = OverviewRules.RECENT) {
         if (overview.recent.isEmpty()) {
-            Text(OverviewRules.EMPTY_RECENT, color = secondaryTint)
+            Text(localizedMobileCopy(OverviewRules.EMPTY_RECENT), color = secondaryTint)
         } else {
             overview.recent.forEach { entry ->
                 Column {

android/app/src/main/kotlin/com/openmausbot/companion/ui/BotThreadRow.kt

@@ -1,5 +1,7 @@
 package com.openmausbot.companion.ui
 
+import androidx.compose.ui.res.stringResource
+
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -21,6 +23,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.openmausbot.companion.R
 import com.openmausbot.companion.core.BotTask
 import com.openmausbot.companion.core.bylineLabel
 import com.openmausbot.companion.core.displayTitle
@@ -53,13 +56,20 @@ internal fun BotThreadRow(
      * it, so the row derives it here rather than parsing activity. */
     queued: Boolean = false,
 ) {
-    val runtime = task.runtimeLabel(queued)
+    val runtimeLabel = task.runtimeLabel(queued)
+    val runtime = when (runtimeLabel) {
+        "Waiting on you" -> stringResource(R.string.mobile_waiting_on_you_edab5b72)
+        "Waiting on teammate" -> stringResource(R.string.mobile_waiting_on_teammate_158d309b)
+        "Working" -> stringResource(R.string.mobile_thread_working)
+        "Queued" -> stringResource(R.string.mobile_queued_6a599877)
+        else -> null
+    }
     val snoozed = task.isSnoozed(now)
     val dimmed = (task.isClosed || task.isArchived || snoozed) && runtime == null && task.unread != true
     val foldedState = when {
-        task.isClosed -> "Closed"
-        task.isArchived -> "Archived"
-        snoozed -> "Snoozed"
+        task.isClosed -> stringResource(R.string.mobile_thread_closed)
+        task.isArchived -> stringResource(R.string.mobile_archived_eddc813f)
+        snoozed -> stringResource(R.string.mobile_thread_snoozed)
         else -> null
     }
     Row(
@@ -89,17 +99,16 @@ internal fun BotThreadRow(
                             text = runtime,
                             fontSize = 12.sp,
                             fontWeight = FontWeight.Medium,
-                            color = when (runtime) {
+                            color = when (runtimeLabel) {
                                 "Waiting on you" -> MaterialTheme.colorScheme.error
-                                "Waiting on teammate" -> secondaryTint
-                                "Queued" -> secondaryTint
+                                "Waiting on teammate", "Queued" -> secondaryTint
                                 else -> MaterialTheme.colorScheme.primary
                             },
                         )
                     }
                     if (task.unread == true) {
                         Text(
-                            "Unread",
+                            stringResource(R.string.mobile_unread_07b032b5),
                             fontSize = 12.sp,
                             fontWeight = FontWeight.Medium,
                             color = MaterialTheme.colorScheme.primary,
@@ -109,7 +118,7 @@ internal fun BotThreadRow(
             }
             val byline = listOfNotNull(
                 RelativeStamp.updated(task.listStamp).takeIf { it.isNotEmpty() },
-                "Pinned".takeIf { task.pinned == true },
+                stringResource(R.string.mobile_roster_pinned).takeIf { task.pinned == true },
                 task.bylineLabel(now),
             ).joinToString(" · ")
             if (byline.isNotEmpty()) {