app: harden mirroring lifecycle and state

3 files changed, 36 insertions, 16 deletions

diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
deleted file mode 100644
index f551102..0000000
--- a/app/src/main/res/values/ids.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- IDs referenced from Mirror.java that live only in the debug
-     layout (src/debug/res/layout/mirror.xml). Declaring them here
-     means R.id.* is stable across both build types; findViewById
-     returns null in release where the views are absent. -->
-<resources>
-    <item name="overlay_target" type="id"/>
-    <item name="overlay_stats"  type="id"/>
-    <item name="overlay_event"  type="id"/>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7c45ac..9b7e03b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">scrcpy</string>
     <string name="address_hint">192.168.1.42:41234</string>
     <string name="pair_port_hint">37123</string>
@@ -12,26 +12,56 @@
     <string name="bad_address">Enter the device address as 192.168.1.42:41234</string>
     <string name="bad_pair_port">Pairing port must be a number from 1 to 65535</string>
     <string name="bad_pair_code">Enter the 6-digit pairing code</string>
+    <string name="device_not_paired">This target is not paired. Pair it again from the device list.</string>
+    <string name="device_list_unreadable">The paired-device list could not be read; it was left unchanged.</string>
+    <string name="network_trust">Use only on a network you trust, or over a VPN. ADB cannot verify the target\'s identity, so anything answering this address could receive what you type.</string>
     <string name="pair_and_save">Pair and save</string>
     <string name="pair_a_device">Pair a device</string>
     <string name="saved_devices">Saved devices</string>
     <string name="notif_session_active">Mirroring active</string>
     <string name="settings">Settings</string>
+    <string name="licenses">Open-source licenses</string>
+    <string name="licenses_unavailable">Notices unavailable.</string>
     <string name="video_codec">Video codec</string>
     <string name="audio_codec">Audio codec</string>
+    <string name="video_h264">H.264 (default)</string>
+    <string name="video_h265">H.265</string>
+    <string name="video_av1" tools:ignore="Typos">AV1 (target Android 14+)</string>
+    <string name="audio_raw">Raw PCM (1.5 Mbps)</string>
+    <string name="audio_opus">Opus (~128 kbps, default)</string>
     <string name="forget_device">Forget device?</string>
     <string name="max_size">Max size (long edge, px)</string>
+    <string name="max_size_original">Original</string>
+    <string name="max_size_480">480</string>
+    <string name="max_size_720">720</string>
+    <string name="max_size_1080">1080 (default)</string>
+    <string name="max_size_1440">1440</string>
+    <string name="max_size_2160">2160</string>
     <string name="video_bit_rate">Video bit rate</string>
+    <string name="bit_rate_1m">1 Mbps</string>
+    <string name="bit_rate_2m">2 Mbps</string>
+    <string name="bit_rate_4m">4 Mbps (default)</string>
+    <string name="bit_rate_8m">8 Mbps</string>
+    <string name="bit_rate_16m">16 Mbps</string>
     <string name="max_fps">Max fps</string>
+    <string name="max_fps_unlimited">Unlimited (default)</string>
+    <string name="max_fps_30">30</string>
+    <string name="max_fps_60">60</string>
+    <string name="max_fps_90">90</string>
+    <string name="max_fps_120">120</string>
     <string name="reconnect">Reconnect</string>
+    <string name="nav_back">Back</string>
+    <string name="nav_home">Home</string>
+    <string name="nav_recents">Recents</string>
     <string name="connecting">connecting…</string>
     <string name="disconnected">disconnected</string>
-    <string name="record">Record</string>
-    <string name="record_on">Stop recording</string>
-    <string name="hint_long_press_back">Long-press Back to send it to the target device.</string>
+    <string name="session_error">Session error: %1$s</string>
+    <string name="session_stop_timeout">The old session did not stop. Reconnect was cancelled.</string>
+    <string name="hint_back">Back goes to the target. Press Back twice to leave. Home and Recents are in the bar above.</string>
     <string name="pairing">Pairing…</string>
     <string name="settings_apply_on_reconnect">Changes apply on the next connection.</string>
     <string name="display">Display</string>
-    <string name="show_status_bar">Show status bar (IP, resolution, Record) while mirroring</string>
+    <string name="clipboard_sync">Sync clipboard with the target</string>
+    <string name="show_status_bar">Show status bar (IP and resolution) while mirroring</string>
     <string name="no_devices_yet">No devices paired yet - fill the fields above and tap Pair.</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d0b07ac..6e81bf1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -45,7 +45,7 @@
         <item name="android:textSize">15sp</item>
         <item name="android:paddingTop">@dimen/space_sm</item>
         <item name="android:paddingBottom">@dimen/space_sm</item>
-        <item name="android:minHeight">44dp</item>
+        <item name="android:minHeight">@dimen/touch_min</item>
     </style>
 
     <style name="Note">