From 106f4c93c3e8af3871f774c2c17404937f78cd85 Mon Sep 17 00:00:00 2001
From: ljxx <65693759+neighbor-bear@users.noreply.github.com>
Date: Mon, 1 Jul 2024 11:00:02 +0800
Subject: [PATCH 1/2] Add corresponding text to String to facilitate
 multi-language translation

---
 app/src/main/res/values/strings.xml  |  72 ++++++++++++++
 app/src/main/res/xml/preferences.xml | 140 +++++++++++++--------------
 2 files changed, 142 insertions(+), 70 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f9c54c33e..40ea4ba47 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,4 +47,76 @@
     <string name="log_level_verbose">Verbose</string>
     <string name="log_level_unknown">*Unknown*</string>
     <string name="log_level_value">Logcat log level set to \"%1$s\"</string>
+
+    <!-- Preferences -->
+    <string name="display_resolution_mode">Display resolution mode</string>
+    <string name="display_scale">Display scale, %</string>
+    <string name="display_resolution">Display resolution</string>
+    <string name="adjust_the_set_resolution_to_fit_screen_orientation">Adjust the set resolution to fit screen orientation</string>
+    <string name="stretch_to_fit_display">Stretch to fit display</string>
+    <string name="reseed_screen_while_soft_keyboard_is_open">Reseed screen while soft keyboard is open</string>
+    <string name="the_screen_size_will_be_adjusted_while_soft_keyboard_is_open">The screen size will be adjusted while Soft Keyboard is open.</string>
+    <string name="pip_mode">PIP mode</string>
+    <string name="show_app_in_picture_in_picture_mode">Show app in picture-in-picture mode when home button or recents button is pressed</string>
+    <string name="fullscreen">Fullscreen</string>
+    <string name="toggles_immersive_mode">Toggles immersive mode in your device display</string>
+    <string name="force_landscape_orientation">Force landscape orientation</string>
+    <string name="hide_display_cutout">Hide display cutout (if any)</string>
+    <string name="keep_screen_on">Keep Screen On</string>
+    <string name="output">Output</string>
+    <string name="pointer">Pointer</string>
+    <string name="touchscreen_input_mode">Touchscreen input mode</string>
+    <string name="apply_display_scale_factor_to_touchpad">Apply display scale factor to touchpad</string>
+    <string name="show_stylus_click_options">Show stylus click options</string>
+    <string name="stylus_touch_override">Stylus touch override, left, middle or right click (Stylus only)</string>
+    <string name="enable_stylus_mouse_mode">Enable stylus mouse mode</string>
+    <string name="make_your_stylus_work">Make your stylus work like a mouse. When activated, stylus will only move the cursor and send mouse clicks, ignoring pressure, angle, and tilt.</string>
+    <string name="stylus_button_contact_modifier_mode">Stylus button contact modifier mode</string>
+    <string name="enable_this_option">Enable this option to send right or middle mouse buttons only when stylus touches the screen while the button is pressed.</string>
+    <string name="show_mouse_click_helper_overlay">Show mouse click helper overlay</string>
+    <string name="onscreen_mouse_buttons_usable_with_touchpad">Onscreen mouse buttons usable with touchpad</string>
+    <string name="capture_external_pointer_devices_when_possible">Capture external pointer devices when possible</string>
+    <string name="intercept_all_hardware_pointer_events_pointer">Intercept all hardware pointer events. Pointer is back to Android after pressing Escape key.</string>
+    <string name="transform_captured_pointer_movements">Transform captured pointer movements</string>
+    <string name="captured_pointer_speed_factor">Captured pointer speed factor, %</string>
+    <string name="enable_tap_to_move_for_touchpads">Enable tap-to-move for touchpads</string>
+    <string name="keyboard">Keyboard</string>
+    <string name="show_additional_keyboard">Show additional keyboard</string>
+    <string name="show_keyboard_with_additional_keys">Show keyboard with additional keys.</string>
+    <string name="show_ime_with_external_keyboard">Show IME with external keyboard</string>
+    <string name="show_software_keyboard">Show software keyboard while hardware keyboard is connected.</string>
+    <string name="prefer_scancodes_when_possible">Prefer scancodes when possible</string>
+    <string name="hardware_keyboard_layout">Let X server handle hardware keyboard layout (with DE settings or setxkbmap).</string>
+    <string name="hardware_keyboard_scancodes_workaround">Hardware keyboard scancodes workaround</string>
+    <string name="fixes_scancodes_on_some_devices">Fixes scancodes on some devices. Might cause problems with multiple layouts.</string>
+    <string name="intercept_system_shortcuts">Intercept system shortcuts</string>
+    <string name="samsung_dex_only_allows_interception">Samsung Dex only. Allows interception of \"Alt+F4\", \"Meta+D\", \"Meta+E\", etc.</string>
+    <string name="enable_accessibility_service">Enable Accessibility service for intercepting system shortcuts manually.</string>
+    <string name="open_accessibility_settings">Open Accessibility settings.</string>
+    <string name="enable_accessibility_service_for_intercepting">Enable Accessibility service for intercepting system shortcuts automatically.</string>
+    <string name="requires_write_secure_settings_permission">Requires WRITE_SECURE_SETTINGS permission.</string>
+    <string name="pause_key_intercepting_with_esc_key">Pause key intercepting with Esc key</string>
+    <string name="filter_out_intercepted_win_meta_mod4_key">Filter out intercepted Win (Meta/Mod4) key.</string>
+    <string name="allows_you_to_use_dex_shortcuts">Allows you to use Dex shortcuts while intercepting. Requires Accessibility service to work.</string>
+    <string name="workaround_to_enable_cjk_gboard">Workaround to enable CJK Gboard</string>
+    <string name="may_require_android_14">May require Android 14 and Gboard 14</string>
+    <string name="other">Other</string>
+    <string name="clipboard_sharing">Clipboard sharing</string>
+    <string name="request_notification_permission">Request notification permission</string>
+    <string name="configure_response_to_user_actions">Configure response to user actions</string>
+    <string name="store_preferences_for_secondary">Store preferences for secondary displays separately</string>
+    <string name="open_this_screen_on_display">Open this screen on display you want to configure</string>
+    <string name="extra_key_bar_preferences">Extra key bar preferences</string>
+    <string name="adjust_display_height">Adjust display height for extra keys bar</string>
+    <string name="may_cause_screen_flickering">May cause screen flickering during toggling EK bar</string>
+    <string name="deactivate_special_keys_on_additional">Deactivate special keys on additional key bar after each keypress</string>
+    <string name="use_long_tap">Use long-tap to lock special keys</string>
+    <string name="opacity_of_extra_keys_bar">Opacity of extra keys bar, %</string>
+    <string name="extra_keys_config">Extra keys config</string>
+    <string name="response_to_user_actions">Response to user actions</string>
+    <string name="three_finger_swipe_up">Three finger swipe up</string>
+    <string name="three_finger_swipe_down">Three finger swipe down</string>
+    <string name="volume_up">Volume up</string>
+    <string name="volume_down">Volume down</string>
+    <string name="back_button">Back button</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 0177a67ff..09b410b5e 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory android:key="output" android:title="Output" android:singleLineTitle="false" android:iconSpaceReserved="false" >
+    <PreferenceCategory android:key="output" android:title="@string/output" android:singleLineTitle="false" android:iconSpaceReserved="false" >
         <ListPreference
-            android:title="Display resolution mode"
+            android:title="@string/display_resolution_mode"
             android:key="displayResolutionMode"
             android:defaultValue="native"
             android:entries="@array/displayResolutionVariants"
             android:entryValues="@array/displayResolutionVariants" />
 
         <SeekBarPreference
-            android:title="Display scale, %"
+            android:title="@string/display_scale"
             android:key="displayScale"
             android:max="300"
             android:defaultValue="100" />
 
         <ListPreference
-            android:title="Display resolution"
+            android:title="@string/display_resolution"
             android:key="displayResolutionExact"
             android:defaultValue="1280x1024"
             android:entries="@array/displayResolution"
@@ -29,113 +29,113 @@
             android:summary="Example: 1280x1024" />
 
         <SwitchPreferenceCompat
-            android:title="Adjust the set resolution to fit screen orientation"
+            android:title="@string/adjust_the_set_resolution_to_fit_screen_orientation"
             android:defaultValue="false"
             android:key="adjustResolution" />
 
         <SwitchPreferenceCompat
-            android:title="Stretch to fit display"
+            android:title="@string/stretch_to_fit_display"
             android:defaultValue="false"
             android:key="displayStretch" />
 
         <SwitchPreferenceCompat
-            android:title="Reseed screen while soft keyboard is open"
-            android:summary="The screen size will be adjusted while Soft Keyboard is open."
+            android:title="@string/reseed_screen_while_soft_keyboard_is_open"
+            android:summary="@string/the_screen_size_will_be_adjusted_while_soft_keyboard_is_open"
             android:defaultValue="true"
             android:key="Reseed" />
 
         <SwitchPreferenceCompat
-            android:title="PIP mode"
-            android:summary="Show app in picture-in-picture mode when home button or recents button is pressed"
+            android:title="@string/pip_mode"
+            android:summary="@string/show_app_in_picture_in_picture_mode"
             android:defaultValue="false"
             android:key="PIP" />
 
         <SwitchPreferenceCompat
-            android:title="Fullscreen"
-            android:summary="Toggles immersive mode in your device display"
+            android:title="@string/fullscreen"
+            android:summary="@string/toggles_immersive_mode"
             android:defaultValue="false"
             android:key="fullscreen" />
 
         <SwitchPreferenceCompat
-            android:title="Force landscape orientation"
+            android:title="@string/force_landscape_orientation"
             android:defaultValue="false"
             android:key="forceLandscape" />
 
         <SwitchPreferenceCompat
-            android:title="Hide display cutout (if any)"
+            android:title="@string/hide_display_cutout"
             android:defaultValue="false"
             android:key="hideCutout" />
         
         <SwitchPreferenceCompat
-	        android:title="Keep Screen On"
+	        android:title="@string/keep_screen_on"
             android:defaultValue="true"
             android:key="keepScreenOn" />
     </PreferenceCategory>
-    <PreferenceCategory android:key="pointer" android:title="Pointer">
+    <PreferenceCategory android:key="pointer" android:title="@string/pointer">
         <ListPreference
-            android:title="Touchscreen input mode"
+            android:title="@string/touchscreen_input_mode"
             android:key="touchMode"
             android:defaultValue="1"
             android:entries="@array/touchscreenInputModesEntries"
             android:entryValues="@array/touchscreenInputModesValues" />
 
         <SwitchPreferenceCompat
-            android:title="Apply display scale factor to touchpad"
+            android:title="@string/apply_display_scale_factor_to_touchpad"
             android:defaultValue="true"
             android:key="scaleTouchpad" />
 
         <SwitchPreferenceCompat
-            android:title="Show stylus click options"
-            android:summary="Stylus touch override, left, middle or right click (Stylus only)"
+            android:title="@string/show_stylus_click_options"
+            android:summary="@string/stylus_touch_override"
             android:defaultValue="false"
             android:key="showStylusClickOverride" />
 
         <SwitchPreferenceCompat
-            android:title="Enable stylus mouse mode"
-            android:summary="Make your stylus work like a mouse. When activated, stylus will only move the cursor and send mouse clicks, ignoring pressure, angle, and tilt."
+            android:title="@string/enable_stylus_mouse_mode"
+            android:summary="@string/make_your_stylus_work"
             android:defaultValue="false"
             android:key="stylusIsMouse" />
 
         <SwitchPreferenceCompat
-            android:title="Stylus button contact modifier mode"
-            android:summary="Enable this option to send right or middle mouse buttons only when stylus touches the screen while the button is pressed."
+            android:title="@string/stylus_button_contact_modifier_mode"
+            android:summary="@string/enable_this_option"
             android:defaultValue="false"
             android:key="stylusButtonContactModifierMode" />
 
         <SwitchPreferenceCompat
-            android:title="Show mouse click helper overlay"
-            android:summary="Onscreen mouse buttons usable with touchpad"
+            android:title="@string/show_mouse_click_helper_overlay"
+            android:summary="@string/onscreen_mouse_buttons_usable_with_touchpad"
             android:defaultValue="false"
             android:key="showMouseHelper" />
 
         <SwitchPreferenceCompat
-            android:title="Capture external pointer devices when possible"
-            android:summary="Intercept all hardware pointer events. Pointer is back to Android after pressing Escape key."
+            android:title="@string/capture_external_pointer_devices_when_possible"
+            android:summary="@string/intercept_all_hardware_pointer_events_pointer"
             android:defaultValue="false"
             android:key="pointerCapture" />
 
         <ListPreference
-            android:title="Transform captured pointer movements"
+            android:title="@string/transform_captured_pointer_movements"
             android:key="transformCapturedPointer"
             android:defaultValue="no"
             android:entries="@array/transformCapturedPointerEntries"
             android:entryValues="@array/transformCapturedPointerValues" />
 
         <SeekBarPreference
-            android:title="Captured pointer speed factor, %"
+            android:title="@string/captured_pointer_speed_factor"
             android:key="capturedPointerSpeedFactor"
             android:max="200"
             android:defaultValue="100" />
 
         <SwitchPreferenceCompat
-            android:title="Enable tap-to-move for touchpads"
+            android:title="@string/enable_tap_to_move_for_touchpads"
             android:defaultValue="false"
             android:key="tapToMove" />
     </PreferenceCategory>
-    <PreferenceCategory android:key="kbd" android:title="Keyboard">
+    <PreferenceCategory android:key="kbd" android:title="@string/keyboard">
         <SwitchPreferenceCompat
-            android:title="Show additional keyboard"
-            android:summary="Show keyboard with additional keys."
+            android:title="@string/show_additional_keyboard"
+            android:summary="@string/show_keyboard_with_additional_keys"
             android:defaultValue="true"
             android:key="showAdditionalKbd" />
 
@@ -146,136 +146,136 @@
             android:key="additionalKbdVisible" />
 
         <SwitchPreferenceCompat
-            android:title="Show IME with external keyboard"
-            android:summary="Show software keyboard while hardware keyboard is connected."
+            android:title="@string/show_ime_with_external_keyboard"
+            android:summary="@string/show_software_keyboard"
             android:defaultValue="true"
             android:key="showIMEWhileExternalConnected" />
 
         <SwitchPreferenceCompat
-            android:title="Prefer scancodes when possible"
-            android:summary="Let X server handle hardware keyboard layout (with DE settings or setxkbmap)."
+            android:title="@string/prefer_scancodes_when_possible"
+            android:summary="@string/hardware_keyboard_layout"
             android:defaultValue="false"
             android:key="preferScancodes"/>
 
         <SwitchPreferenceCompat
-            android:title="Hardware keyboard scancodes workaround"
-            android:summary="Fixes scancodes on some devices. Might cause problems with multiple layouts."
+            android:title="@string/hardware_keyboard_scancodes_workaround"
+            android:summary="@string/fixes_scancodes_on_some_devices"
             android:defaultValue="true"
             android:key="hardwareKbdScancodesWorkaround"/>
 
         <SwitchPreferenceCompat
-            android:title="Intercept system shortcuts"
-            android:summary="Samsung Dex only. Allows interception of &quot;Alt+F4&quot;, &quot;Meta+D&quot;, &quot;Meta+E&quot;, etc. "
+            android:title="@string/intercept_system_shortcuts"
+            android:summary="@string/samsung_dex_only_allows_interception"
             android:defaultValue="false"
             android:key="dexMetaKeyCapture" />
 
         <Preference
-            android:title="Enable Accessibility service for intercepting system shortcuts manually."
-            android:summary="Open Accessibility settings."
+            android:title="@string/enable_accessibility_service"
+            android:summary="@string/open_accessibility_settings"
             android:key="enableAccessibilityService">
             <intent android:action="android.settings.ACCESSIBILITY_SETTINGS"/>
         </Preference>
 
         <SwitchPreferenceCompat
-            android:title="Enable Accessibility service for intercepting system shortcuts automatically."
-            android:summary="Requires WRITE_SECURE_SETTINGS permission."
+            android:title="@string/enable_accessibility_service_for_intercepting"
+            android:summary="@string/requires_write_secure_settings_permission"
             android:defaultValue="false"
             android:key="enableAccessibilityServiceAutomatically" />
 
         <SwitchPreferenceCompat
-            android:title="Pause key intercepting with Esc key"
+            android:title="@string/pause_key_intercepting_with_esc_key"
             android:defaultValue="false"
             android:key="pauseKeyInterceptingWithEsc" />
 
         <SwitchPreferenceCompat
-            android:title="Filter out intercepted Win (Meta/Mod4) key."
-            android:summary="Allows you to use Dex shortcuts while intercepting. Requires Accessibility service to work."
+            android:title="@string/filter_out_intercepted_win_meta_mod4_key"
+            android:summary="@string/allows_you_to_use_dex_shortcuts"
             android:defaultValue="false"
             android:key="filterOutWinkey" />
 
         <SwitchPreferenceCompat
-            android:title="Workaround to enable CJK Gboard"
-            android:summary="May require Android 14 and Gboard 14"
+            android:title="@string/workaround_to_enable_cjk_gboard"
+            android:summary="@string/may_require_android_14"
             android:defaultValue="false"
             android:key="enableGboardCJK" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:key="other" android:title="Other">
+    <PreferenceCategory android:key="other" android:title="@string/other">
         <SwitchPreferenceCompat
-            android:title="Clipboard sharing"
+            android:title="@string/clipboard_sharing"
             android:defaultValue="false"
             android:key="clipboardEnable" />
 
         <Preference
-            android:title="Request notification permission"
+            android:title="@string/request_notification_permission"
             android:key="requestNotificationPermission" />
 
         <Preference
-            android:title="Configure response to user actions"
+            android:title="@string/configure_response_to_user_actions"
             android:key="configureResponseToUserActions" />
 
         <SwitchPreferenceCompat
-            android:title="Store preferences for secondary displays separately"
-            android:summary="Open this screen on display you want to configure"
+            android:title="@string/store_preferences_for_secondary"
+            android:summary="@string/open_this_screen_on_display"
             android:defaultValue="false"
             android:key="storeSecondaryDisplayPreferencesSeparately" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:key="ekbar" android:title="Extra key bar preferences" app:isPreferenceVisible="false">
+    <PreferenceCategory android:key="ekbar" android:title="@string/extra_key_bar_preferences" app:isPreferenceVisible="false">
         <SwitchPreferenceCompat
-            android:title="Adjust display height for extra keys bar"
-            android:summary="May cause screen flickering during toggling EK bar"
+            android:title="@string/adjust_display_height"
+            android:summary="@string/may_cause_screen_flickering"
             android:defaultValue="false"
             android:key="adjustHeightForEK" />
 
         <SwitchPreferenceCompat
-            android:title="Deactivate special keys on additional key bar after each keypress"
-            android:summary="Use long-tap to lock special keys"
+            android:title="@string/deactivate_special_keys_on_additional"
+            android:summary="@string/use_long_tap"
             android:defaultValue="false"
             android:key="useTermuxEKBarBehaviour" />
 
         <SeekBarPreference
-            android:title="Opacity of extra keys bar, %"
+            android:title="@string/opacity_of_extra_keys_bar"
             android:key="opacityEKBar"
             android:max="100"
             android:defaultValue="100" />
 
         <Preference
-            android:title="Extra keys config"
+            android:title="@string/extra_keys_config"
             android:key="extra_keys_config" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:key="userActions" android:title="Response to user actions" app:isPreferenceVisible="false">
+    <PreferenceCategory android:key="userActions" android:title="@string/response_to_user_actions" app:isPreferenceVisible="false">
         <ListPreference
-            android:title="Three finger swipe up"
+            android:title="@string/three_finger_swipe_up"
             android:key="swipeUpAction"
             android:defaultValue="no action"
             android:entries="@array/userActionsValues"
             android:entryValues="@array/userActionsValues" />
 
         <ListPreference
-            android:title="Three finger swipe down"
+            android:title="@string/three_finger_swipe_down"
             android:key="swipeDownAction"
             android:defaultValue="toggle additional key bar"
             android:entries="@array/userActionsValues"
             android:entryValues="@array/userActionsValues" />
 
         <ListPreference
-            android:title="Volume up"
+            android:title="@string/volume_up"
             android:key="volumeUpAction"
             android:defaultValue="no action"
             android:entries="@array/userActionsVolumeUpValues"
             android:entryValues="@array/userActionsVolumeUpValues" />
 
         <ListPreference
-            android:title="Volume down"
+            android:title="@string/volume_down"
             android:key="volumeDownAction"
             android:defaultValue="no action"
             android:entries="@array/userActionsVolumeDownValues"
             android:entryValues="@array/userActionsVolumeDownValues" />
 
         <ListPreference
-            android:title="Back button"
+            android:title="@string/back_button"
             android:key="backButtonAction"
             android:defaultValue="toggle soft keyboard"
             android:entries="@array/userActionsValues"

From b04d09fc32958af566d5e5bc4722edc394847a4a Mon Sep 17 00:00:00 2001
From: ljxx <65693759+neighbor-bear@users.noreply.github.com>
Date: Mon, 1 Jul 2024 11:31:50 +0800
Subject: [PATCH 2/2] Add corresponding text to String to facilitate
 multi-language translation

---
 app/src/main/res/values/strings.xml  | 2 ++
 app/src/main/res/xml/preferences.xml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 40ea4ba47..3a639bd82 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -119,4 +119,6 @@
     <string name="volume_up">Volume up</string>
     <string name="volume_down">Volume down</string>
     <string name="back_button">Back button</string>
+    <string name="display_resolution_custom">Display resolution</string>
+    <string name="example_1280x1024">Example: 1280x1024</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 09b410b5e..6c941660e 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -23,10 +23,10 @@
             android:entryValues="@array/displayResolution" />
 
         <EditTextPreference
-            android:title="Display resolution"
+            android:title="@string/display_resolution_custom"
             android:key="displayResolutionCustom"
             android:defaultValue="1280x1024"
-            android:summary="Example: 1280x1024" />
+            android:summary="@string/example_1280x1024" />
 
         <SwitchPreferenceCompat
             android:title="@string/adjust_the_set_resolution_to_fit_screen_orientation"