diff --git a/.skills/compose-ui/strings-index.txt b/.skills/compose-ui/strings-index.txt index f7216d831..7a4fdab44 100644 --- a/.skills/compose-ui/strings-index.txt +++ b/.skills/compose-ui/strings-index.txt @@ -1104,6 +1104,7 @@ store_forward store_forward_config store_forward_enabled subnet +success super_deep_sleep_duration_seconds supported supported_by_community diff --git a/core/resources/src/commonMain/composeResources/values/strings.xml b/core/resources/src/commonMain/composeResources/values/strings.xml index cf771f4d7..7d8347df8 100644 --- a/core/resources/src/commonMain/composeResources/values/strings.xml +++ b/core/resources/src/commonMain/composeResources/values/strings.xml @@ -1146,6 +1146,7 @@ Store & Forward Config Store & Forward enabled Subred + Success Super deep sleep duration Supported Supported by Meshtastic Community diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/component/FirmwareReleaseSheetContent.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/component/FirmwareReleaseSheetContent.kt index fe48b5ff6..f66700fb9 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/component/FirmwareReleaseSheetContent.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/component/FirmwareReleaseSheetContent.kt @@ -37,6 +37,7 @@ import org.jetbrains.compose.resources.stringResource import org.meshtastic.core.database.entity.FirmwareRelease import org.meshtastic.core.resources.Res import org.meshtastic.core.resources.download +import org.meshtastic.core.resources.firmware_version import org.meshtastic.core.resources.view_release import org.meshtastic.core.ui.icon.Download import org.meshtastic.core.ui.icon.LinkIcon @@ -52,7 +53,10 @@ fun FirmwareReleaseSheetContent(firmwareRelease: FirmwareRelease, modifier: Modi verticalArrangement = Arrangement.spacedBy(8.dp), ) { Text(text = firmwareRelease.title, style = MaterialTheme.typography.titleLarge) - Text(text = "Version: ${firmwareRelease.id}", style = MaterialTheme.typography.bodyMedium) + Text( + text = stringResource(Res.string.firmware_version, firmwareRelease.id), + style = MaterialTheme.typography.bodyMedium, + ) Markdown(modifier = Modifier.padding(8.dp), content = firmwareRelease.releaseNotes) Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { Button(onClick = { openUrl(firmwareRelease.pageUrl) }, modifier = Modifier.weight(1f)) { diff --git a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/NeighborInfoLog.kt b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/NeighborInfoLog.kt index 73b78eea6..a9a00ae9c 100644 --- a/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/NeighborInfoLog.kt +++ b/feature/node/src/commonMain/kotlin/org/meshtastic/feature/node/metrics/NeighborInfoLog.kt @@ -42,6 +42,7 @@ import org.meshtastic.core.model.getNeighborInfoResponse import org.meshtastic.core.resources.Res import org.meshtastic.core.resources.neighbor_info import org.meshtastic.core.resources.routing_error_no_response +import org.meshtastic.core.resources.success import org.meshtastic.core.ui.component.MainAppBar import org.meshtastic.core.ui.icon.Groups import org.meshtastic.core.ui.icon.MeshtasticIcons @@ -102,7 +103,12 @@ fun NeighborInfoLogScreen(modifier: Modifier = Modifier, viewModel: MetricsViewM } val time = DateFormatter.formatDateTime(log.received_date) - val text = if (result != null) "Success" else stringResource(Res.string.routing_error_no_response) + val text = + if (result != null) { + stringResource(Res.string.success) + } else { + stringResource(Res.string.routing_error_no_response) + } val icon = if (result != null) MeshtasticIcons.Groups else MeshtasticIcons.PersonOff val header = stringResource(Res.string.neighbor_info) var expanded by remember { mutableStateOf(false) }