diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/mirror.xml | 40 | ||||
| -rw-r--r-- | app/src/main/res/layout/settings.xml | 71 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 13 |
3 files changed, 10 insertions, 114 deletions
diff --git a/app/src/main/res/layout/mirror.xml b/app/src/main/res/layout/mirror.xml index d2355a8..0e1768a 100644 --- a/app/src/main/res/layout/mirror.xml +++ b/app/src/main/res/layout/mirror.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Video surface with optional target navigation and reconnect controls. --> +<!-- Video surface with transient connection status. --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root" @@ -38,44 +38,6 @@ android:singleLine="true" android:ellipsize="end" android:text="@string/connecting"/> - - - <Button - android:id="@+id/nav_back" - style="@style/Button.Secondary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/space_sm" - android:minWidth="0dp" - android:minHeight="@dimen/touch_min" - android:paddingHorizontal="@dimen/space_md" - android:paddingVertical="@dimen/space_xs" - android:text="@string/nav_back"/> - - <Button - android:id="@+id/nav_home" - style="@style/Button.Secondary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/space_sm" - android:minWidth="0dp" - android:minHeight="@dimen/touch_min" - android:paddingHorizontal="@dimen/space_md" - android:paddingVertical="@dimen/space_xs" - android:text="@string/nav_home"/> - - <Button - android:id="@+id/nav_recents" - style="@style/Button.Secondary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/space_sm" - android:minWidth="0dp" - android:minHeight="@dimen/touch_min" - android:paddingHorizontal="@dimen/space_md" - android:paddingVertical="@dimen/space_xs" - android:text="@string/nav_recents"/> - <Button android:id="@+id/reconnect" style="@style/Button.Secondary" diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml index aa2f117..0b70de3 100644 --- a/app/src/main/res/layout/settings.xml +++ b/app/src/main/res/layout/settings.xml @@ -16,13 +16,19 @@ <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/space_lg" android:text="@string/settings" android:textColor="@color/on_surface" android:textSize="22sp" android:textStyle="bold"/> <TextView + android:id="@+id/version" + style="@style/Caption" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/space_lg"/> + + <TextView style="@style/Note" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -228,62 +234,6 @@ <LinearLayout style="@style/Card" android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_fps"/> - - <RadioGroup - android:id="@+id/max_fps" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <RadioButton - android:id="@+id/max_fps_0" - style="@style/RadioOption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_fps_unlimited"/> - - <RadioButton - android:id="@+id/max_fps_30" - style="@style/RadioOption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_fps_30"/> - - <RadioButton - android:id="@+id/max_fps_60" - style="@style/RadioOption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_fps_60"/> - - <RadioButton - android:id="@+id/max_fps_90" - style="@style/RadioOption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_fps_90"/> - - <RadioButton - android:id="@+id/max_fps_120" - style="@style/RadioOption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/max_fps_120"/> - - </RadioGroup> - - </LinearLayout> - - <LinearLayout - style="@style/Card" - android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="0dp"> @@ -300,13 +250,6 @@ android:layout_height="wrap_content" android:text="@string/clipboard_sync"/> - <CheckBox - android:id="@+id/show_status_bar" - style="@style/RadioOption" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/show_status_bar"/> - </LinearLayout> <!-- Required, not decorative: the bundled SPAKE2 library is diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9b7e03b..ac1c22d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,6 +20,7 @@ <string name="saved_devices">Saved devices</string> <string name="notif_session_active">Mirroring active</string> <string name="settings">Settings</string> + <string name="version_format">Version %1$s (%2$d)</string> <string name="licenses">Open-source licenses</string> <string name="licenses_unavailable">Notices unavailable.</string> <string name="video_codec">Video codec</string> @@ -43,25 +44,15 @@ <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="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="hint_back">Back goes to the target. Press Back twice to leave.</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="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> |