Skip to content

Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.

fix(android): webcam buttons say what they do

Bee46eadae9dc87
diff --git a/android/app/src/main/kotlin/app/nectarlink/android/camera/ContinuityCameraActivity.kt b/android/app/src/main/kotlin/app/nectarlink/android/camera/ContinuityCameraActivity.kt
index 389cdc7..8d443ff 100644
--- a/android/app/src/main/kotlin/app/nectarlink/android/camera/ContinuityCameraActivity.kt
+++ b/android/app/src/main/kotlin/app/nectarlink/android/camera/ContinuityCameraActivity.kt
@@ -544,7 +544,7 @@ private fun ContinuityCameraScreen(
},
enabled = !busy,
) {
- Text(if (flashOn) stringResource(R.string.webcam_torch_on) else stringResource(R.string.webcam_torch_off))
+ Text(stringResource(if (flashOn) R.string.webcam_turn_torch_off else R.string.webcam_turn_torch_on))
}
// Shutter button
diff --git a/android/app/src/main/kotlin/app/nectarlink/android/ui/webcam/WebcamScreen.kt b/android/app/src/main/kotlin/app/nectarlink/android/ui/webcam/WebcamScreen.kt
index 09b7b25..e6c02c5 100644
--- a/android/app/src/main/kotlin/app/nectarlink/android/ui/webcam/WebcamScreen.kt
+++ b/android/app/src/main/kotlin/app/nectarlink/android/ui/webcam/WebcamScreen.kt
@@ -352,10 +352,12 @@ fun WebcamScreen(
WebcamService.setCamera(next, context)
},
) {
- val currentLabel = stringResource(
- if (session.camera == "front") R.string.webcam_camera_front else R.string.webcam_camera_back,
+ // Says what tapping does (#68), not which camera is on.
+ Text(
+ stringResource(
+ if (session.camera == "front") R.string.webcam_switch_to_back else R.string.webcam_switch_to_front,
+ ),
)
- Text(stringResource(R.string.webcam_switch_camera_current, currentLabel))
}
if (session.hasFlash) {
@@ -365,7 +367,7 @@ fun WebcamScreen(
) {
Text(
stringResource(
- if (session.torchOn) R.string.webcam_torch_on else R.string.webcam_torch_off,
+ if (session.torchOn) R.string.webcam_turn_torch_off else R.string.webcam_turn_torch_on,
),
)
}
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 0479e99..c57d97d 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -478,9 +478,11 @@
<string name="webcam_stop">Webcam beenden</string>
<string name="webcam_camera_back">Hinten</string>
<string name="webcam_camera_front">Vorne</string>
+ <string name="webcam_switch_to_front">Zur Frontkamera wechseln</string>
+ <string name="webcam_switch_to_back">Zur Rückkamera wechseln</string>
+ <string name="webcam_turn_torch_on">Taschenlampe einschalten</string>
+ <string name="webcam_turn_torch_off">Taschenlampe ausschalten</string>
<string name="webcam_switch_camera">Kamera wechseln</string>
- <string name="webcam_torch_on">Taschenlampe ein</string>
- <string name="webcam_torch_off">Taschenlampe aus</string>
<string name="webcam_zoom_label">Zoom %1$.1f×</string>
<string name="webcam_resolution_label">Auflösung</string>
<string name="webcam_denied_text">Die Webcam ist für dieses Gerät auf %1$s deaktiviert.</string>
@@ -637,7 +639,6 @@
<string name="webcam_stream_spec">%1$d × %2$d · %3$d fps</string>
<string name="webcam_stream_camera_spec">%1$d × %2$d · %3$s</string>
<string name="webcam_status_streaming_camera">Streame %1$d × %2$d an %3$s · %4$s</string>
- <string name="webcam_switch_camera_current">Kamera wechseln (%1$s)</string>
<string name="webcam_res_720p">720p</string>
<string name="webcam_res_1080p">1080p</string>
<string name="webcam_res_4k">4K</string>
diff --git a/android/app/src/main/res/values-zh-rCN/strings.xml b/android/app/src/main/res/values-zh-rCN/strings.xml
index eb79284..d56b5b5 100644
--- a/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -456,9 +456,11 @@
<string name="webcam_stop">停止摄像头</string>
<string name="webcam_camera_back">后置</string>
<string name="webcam_camera_front">前置</string>
+ <string name="webcam_switch_to_front">切换到前置摄像头</string>
+ <string name="webcam_switch_to_back">切换到后置摄像头</string>
+ <string name="webcam_turn_torch_on">打开闪光灯</string>
+ <string name="webcam_turn_torch_off">关闭闪光灯</string>
<string name="webcam_switch_camera">切换摄像头</string>
- <string name="webcam_torch_on">开启闪光灯</string>
- <string name="webcam_torch_off">关闭闪光灯</string>
<string name="webcam_zoom_label">缩放 %1$.1f×</string>
<string name="webcam_resolution_label">分辨率</string>
<string name="webcam_denied_text">%1$s 上已关闭此手机的摄像头。</string>
@@ -595,7 +597,6 @@
<string name="webcam_stream_spec">%1$d × %2$d · %3$d fps</string>
<string name="webcam_stream_camera_spec">%1$d × %2$d · %3$s</string>
<string name="webcam_status_streaming_camera">正在以 %1$d × %2$d 传输到 %3$s · %4$s</string>
- <string name="webcam_switch_camera_current">切换摄像头(%1$s)</string>
<string name="webcam_res_720p">720p</string>
<string name="webcam_res_1080p">1080p</string>
<string name="webcam_res_4k">4K</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 6593d69..7753916 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -478,9 +478,11 @@
<string name="webcam_stop">Stop webcam</string>
<string name="webcam_camera_back">Back</string>
<string name="webcam_camera_front">Front</string>
+ <string name="webcam_switch_to_front">Switch to front camera</string>
+ <string name="webcam_switch_to_back">Switch to back camera</string>
+ <string name="webcam_turn_torch_on">Turn torch on</string>
+ <string name="webcam_turn_torch_off">Turn torch off</string>
<string name="webcam_switch_camera">Flip camera</string>
- <string name="webcam_torch_on">Torch on</string>
- <string name="webcam_torch_off">Torch off</string>
<string name="webcam_zoom_label">Zoom %1$.1f×</string>
<string name="webcam_resolution_label">Resolution</string>
<string name="webcam_denied_text">Webcam is turned off for this phone on %1$s.</string>
@@ -637,7 +639,6 @@
<string name="webcam_stream_spec">%1$d × %2$d · %3$d fps</string>
<string name="webcam_stream_camera_spec">%1$d × %2$d · %3$s</string>
<string name="webcam_status_streaming_camera">Streaming %1$d × %2$d to %3$s · %4$s</string>
- <string name="webcam_switch_camera_current">Flip camera (%1$s)</string>
<string name="webcam_res_720p">720p</string>
<string name="webcam_res_1080p">1080p</string>
<string name="webcam_res_4k">4K</string>