mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
Extracted hardcoded UI strings to resources (en/zh) (#247)
This commit is contained in:
TianhengZhuang authored and GitHub committed
1 parent
9cac33dae7
commit
796056a582
7 files changed
+73
-18
No files matched your search
@@ -49,6 +49,7 @@ import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.asImageBitmap
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
@@ -78,12 +79,12 @@ internal fun SstvPage(
|
||||
) {
|
||||
Text(text = "🎙️", fontSize = 48.sp)
|
||||
Text(
|
||||
text = "Microphone access needed",
|
||||
text = stringResource(R.string.sstv_mic_permission),
|
||||
fontSize = 16.sp,
|
||||
color = MaterialTheme.colorScheme.onSurface
|
||||
)
|
||||
Button(onClick = requestMicPermission) {
|
||||
Text("Grant permission")
|
||||
Text(stringResource(R.string.sstv_grant_permission))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -97,7 +98,7 @@ internal fun SstvPage(
|
||||
val allModes = remember(sstv.supportedModes) { listOf("Auto") + sstv.supportedModes }
|
||||
val dismiss = { showModeDialog.value = false }
|
||||
ConfirmDialog(
|
||||
title = "SSTV Mode",
|
||||
title = stringResource(R.string.sstv_mode_title),
|
||||
onAccept = dismiss,
|
||||
onCancel = dismiss
|
||||
) {
|
||||
@@ -167,7 +168,7 @@ internal fun SstvPage(
|
||||
)
|
||||
} else {
|
||||
Text(
|
||||
text = if (sstv.status == SstvStatus.Recording) "Listening…" else "No signal",
|
||||
text = if (sstv.status == SstvStatus.Recording) stringResource(R.string.sstv_listening) else stringResource(R.string.sstv_no_signal),
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
fontSize = 16.sp,
|
||||
modifier = Modifier.align(Alignment.Center)
|
||||
@@ -196,7 +197,7 @@ internal fun SstvPage(
|
||||
) {
|
||||
// Doppler-corrected downlink frequency hint
|
||||
OutlinedText(
|
||||
text = dopplerFrequency?.let { "RX: $it Hz" } ?: "No transceiver selected",
|
||||
text = dopplerFrequency?.let { stringResource(R.string.sstv_rx_format, it) } ?: stringResource(R.string.sstv_no_transceiver),
|
||||
fontSize = 18.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
fillColor = MaterialTheme.colorScheme.primary,
|
||||
@@ -227,7 +228,7 @@ internal fun SstvPage(
|
||||
) {
|
||||
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
||||
Text(
|
||||
text = "Mode: ${sstv.selectedMode}",
|
||||
text = stringResource(R.string.sstv_mode_format, sstv.selectedMode),
|
||||
fontSize = 14.sp,
|
||||
maxLines = 1,
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
|
||||
@@ -403,7 +403,7 @@ private fun ExpandedRadioControl(
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Text(
|
||||
text = "TX Base: ",
|
||||
text = stringResource(R.string.radar_tx_base),
|
||||
fontSize = 14.sp,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
@@ -460,7 +460,7 @@ private fun ExpandedRadioControl(
|
||||
onClick = { onAction(RadarAction.SetCtcssTone(null)) },
|
||||
label = {
|
||||
Text(
|
||||
text = "Off",
|
||||
text = stringResource(R.string.radar_off),
|
||||
fontSize = 12.sp,
|
||||
textAlign = TextAlign.Center,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
@@ -492,19 +492,19 @@ private fun ExpandedRadioControl(
|
||||
if (!radioControl.txPanel.isConnected && !radioControl.rxPanel.isConnected) {
|
||||
CardButton(
|
||||
onClick = { onAction(RadarAction.ConnectRadios) },
|
||||
text = "Connect",
|
||||
text = stringResource(R.string.radar_connect),
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
} else {
|
||||
CardButton(
|
||||
onClick = { onAction(RadarAction.DisconnectRadios) },
|
||||
text = "Disconnect",
|
||||
text = stringResource(R.string.radar_disconnect),
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
}
|
||||
CardButton(
|
||||
onClick = { onAction(RadarAction.ToggleTracking) },
|
||||
text = if (radioControl.isTracking) "Stop" else "Track",
|
||||
text = if (radioControl.isTracking) stringResource(R.string.radar_stop) else stringResource(R.string.radar_track),
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
}
|
||||
@@ -726,7 +726,7 @@ private fun DopplerFrequencyCalculator(
|
||||
decorationBox = { innerTextField ->
|
||||
if (offsetKHz.isEmpty()) {
|
||||
Text(
|
||||
text = "Offset (kHz)",
|
||||
text = stringResource(R.string.radar_doppler_offset_hint),
|
||||
fontSize = 16.sp,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
|
||||
+2
-2
@@ -980,7 +980,7 @@ fun RadioControlDialog(
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Text(
|
||||
text = "Split mode (IC-705 only)",
|
||||
text = stringResource(R.string.settings_split_mode),
|
||||
fontWeight = FontWeight.Medium,
|
||||
color = splitModeLabelColor
|
||||
)
|
||||
@@ -1020,7 +1020,7 @@ fun RadioControlDialog(
|
||||
|
||||
if (selectingFor.value.isNotBlank()) {
|
||||
Text(
|
||||
text = "Paired Bluetooth Devices:",
|
||||
text = stringResource(R.string.settings_paired_devices),
|
||||
fontWeight = FontWeight.Medium,
|
||||
color = MaterialTheme.colorScheme.primary
|
||||
)
|
||||
|
||||
+3
-3
@@ -342,9 +342,9 @@ private fun LocationCard(
|
||||
Text(text = formatUpdateTime(updateTime = settings.stationPos.timestamp))
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
|
||||
Text(text = "Lat: ${settings.stationPos.latitude}°")
|
||||
Text(text = "Lon: ${settings.stationPos.longitude}°")
|
||||
Text(text = "Qth: ${settings.stationPos.qthLocator}")
|
||||
Text(text = stringResource(R.string.prefs_lat_prefix, settings.stationPos.latitude))
|
||||
Text(text = stringResource(R.string.prefs_lon_prefix, settings.stationPos.longitude))
|
||||
Text(text = stringResource(R.string.prefs_qth_prefix, settings.stationPos.qthLocator))
|
||||
}
|
||||
Spacer(modifier = Modifier.height(1.dp))
|
||||
Row(horizontalArrangement = Arrangement.SpaceEvenly) {
|
||||
|
||||
Reference in new issue
Block a user