Add RTS touch controls

patches/diffs/res/layout/winemu_sidebar_controls_fragment.xml.patch

@@ -0,0 +1,15 @@
+diff --git a/res/layout/winemu_sidebar_controls_fragment.xml b/res/layout/winemu_sidebar_controls_fragment.xml
+index 65f220893..203786ab4 100644
+--- a/res/layout/winemu_sidebar_controls_fragment.xml
++++ b/res/layout/winemu_sidebar_controls_fragment.xml
+@@ -13,6 +13,10 @@
+             <com.xj.common.view.focus.focus.view.FocusableRecyclerView android:id="@id/rv_mapping" android:background="@drawable/winemu_bg_mapping_rv" android:padding="@dimen/dp_4" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_8" />
+             <com.xj.winemu.view.SidebarSwitchItemView android:id="@id/switch_touch_screen_mouse_control" android:layout_width="fill_parent" android:layout_height="@dimen/dp_56" app:switch_title="@string/winemu_sidebar_touch_screen_mouse_control" />
+             <com.xj.winemu.view.SidebarProgressItemView android:id="@id/key_cursor_speed" android:layout_width="fill_parent" android:layout_height="wrap_content" app:side_max="250" app:side_min="10" app:side_progress="100" app:side_title="@string/winemu_sidebar_key_mouse_speed" />
++            <LinearLayout android:orientation="horizontal" android:id="@id/rts_controls_container" android:layout_width="fill_parent" android:layout_height="@dimen/dp_56" android:gravity="center_vertical">
++                <com.xj.winemu.view.SidebarSwitchItemView android:id="@id/switch_rts_touch_controls" android:layout_width="0dp" android:layout_height="@dimen/dp_56" android:layout_weight="1" app:switch_title="@string/winemu_sidebar_rts_touch_controls" />
++                <ImageButton android:id="@id/btn_rts_gesture_settings" android:layout_width="@dimen/dp_40" android:layout_height="@dimen/dp_40" android:layout_marginEnd="@dimen/dp_8" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_settings" android:contentDescription="@string/rts_gesture_settings" android:visibility="gone" />
++            </LinearLayout>
+         </com.xj.common.view.focus.focus.view.FocusableLinearLayout>
+     </com.xj.common.view.focus.focus.view.FocusableNestedScrollView>
+ </com.xj.common.view.focus.focus.view.FocusableLinearLayout>

patches/diffs/res/values/ids.xml.patch

@@ -1,13 +1,45 @@
+diff --git a/res/values/ids.xml b/res/values/ids.xml
+index ef99687a9..c543aff14 100644
 --- a/res/values/ids.xml
 +++ b/res/values/ids.xml
-@@ -3338,4 +3338,10 @@
-     <item type="id" name="xy_together_max" />
-     <item type="id" name="yesTv" />
-     <item type="id" name="zh_bgImage" />
-+    <item type="id" name="tv_dashboard_label" />
-+    <item type="id" name="tv_battery_percent" />
-+    <item type="id" name="iv_emuready_logo" />
-+    <item type="id" name="tv_local_game_id" />
-+    <item type="id" name="ll_local_game_id_container" />
-+    <item type="id" name="btn_copy_local_game_id" />
- </resources>
+@@ -2309,6 +2309,18 @@
+     <item type="id" name="rvSteams" />
+     <item type="id" name="rvTips" />
+     <item type="id" name="rvUserMenu" />
++    <item type="id" name="rts_controls_container" />
++    <item type="id" name="btn_rts_gesture_settings" />
++    <item type="id" name="rts_gesture_tap_checkbox" />
++    <item type="id" name="rts_gesture_long_press_checkbox" />
++    <item type="id" name="rts_gesture_double_tap_checkbox" />
++    <item type="id" name="rts_gesture_drag_checkbox" />
++    <item type="id" name="rts_gesture_pinch_checkbox" />
++    <item type="id" name="rts_gesture_pinch_spinner" />
++    <item type="id" name="rts_gesture_two_finger_checkbox" />
++    <item type="id" name="rts_gesture_two_finger_spinner" />
++    <item type="id" name="btnClose" />
++    <item type="id" name="tvClose" />
+     <item type="id" name="rv_account_list" />
+     <item type="id" name="rv_all_icons" />
+     <item type="id" name="rv_area_code" />
+@@ -2596,6 +2608,7 @@
+     <item type="id" name="switch_keep_new" />
+     <item type="id" name="switch_key_map" />
+     <item type="id" name="switch_layout" />
++    <item type="id" name="switch_rts_touch_controls" />
+     <item type="id" name="switch_screen_brightness" />
+     <item type="id" name="switch_touch_screen_mouse_control" />
+     <item type="id" name="switch_view" />
+@@ -3344,4 +3357,13 @@
+     <item type="id" name="tv_local_game_id" />
+     <item type="id" name="ll_local_game_id_container" />
+     <item type="id" name="btn_copy_local_game_id" />
++    <item type="id" name="rts_action_option_0" />
++    <item type="id" name="rts_action_option_0_text" />
++    <item type="id" name="rts_action_option_0_check" />
++    <item type="id" name="rts_action_option_1" />
++    <item type="id" name="rts_action_option_1_text" />
++    <item type="id" name="rts_action_option_1_check" />
++    <item type="id" name="rts_action_option_2" />
++    <item type="id" name="rts_action_option_2_text" />
++    <item type="id" name="rts_action_option_2_check" />
+ </resources>

patches/diffs/res/values/strings.xml.patch

@@ -1,93 +1,32 @@
+diff --git a/res/values/strings.xml b/res/values/strings.xml
+index 5397bfabd..0ba13d3bb 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -134,7 +134,7 @@
-     <string name="ando_str_single_file_size">超过限定文件大小</string>
-     <string name="ando_str_single_file_type_mismatch">文件类型不匹配</string>
-     <string name="androidx_startup">androidx.startup</string>
--    <string name="app_name">GameHub</string>
-+    <string name="app_name">GameHub Lite</string>
-     <string name="app_update_background_downloading">Downloading new version in the background…</string>
-     <string name="app_update_click_hint">Click to install</string>
-     <string name="app_update_close">Close</string>
-@@ -787,7 +787,7 @@
-     <string name="fetching_info">Fetching info</string>
-     <string name="firmware_no_support_gtouch_hint">Current firmware does not support G-Touch. Update firmware before playing</string>
-     <string name="first_save_config_tips">Please save your config first</string>
--    <string name="follow_system">Follow system</string>
-+    <string name="follow_system">Default</string>
-     <string name="force_audio_track">Force audio track</string>
-     <string name="force_enable">Force Enable</string>
-     <string name="fps_120">120 FPS</string>
-@@ -1280,7 +1280,7 @@
-     <string name="llauncher_home_mobile_game_tips">Import mobile games, easy management</string>
-     <string name="llauncher_home_pc_add_device">Connect to your computer</string>
-     <string name="llauncher_home_pc_emulator_add_game">Import PC games</string>
--    <string name="llauncher_home_pc_emulator_join_us_tips">Join GameHub official community! All the latest player info awaits >>></string>
-+    <string name="llauncher_home_pc_emulator_join_us_tips">Read the report on telemetry removed &amp; behind-the-scenes >>></string>
-     <string name="llauncher_home_pc_emulator_tips">Import PC games, play AAA titles on mobile</string>
-     <string name="llauncher_home_pc_link_tips">Stream PC games to your phone, play anywhere</string>
-     <string name="llauncher_home_pc_link_title">PC Link Remote Play</string>
-@@ -1329,8 +1329,8 @@
-     <string name="llauncher_main_page_menu_dialog_hide">Hide game</string>
-     <string name="llauncher_main_page_menu_dialog_title">Please select an action for the games in the list？</string>
-     <string name="llauncher_main_page_menu_dialog_view_detail">View game details</string>
--    <string name="llauncher_main_page_title_explore">Discover</string>
--    <string name="llauncher_main_page_title_my">My</string>
-+    <string name="llauncher_main_page_title_explore">Free Games</string>
-+    <string name="llauncher_main_page_title_my">Dashboard</string>
-     <string name="llauncher_main_page_title_platform">Find games</string>
-     <string name="llauncher_main_page_top_button_goto_game">Continue Game</string>
-     <string name="llauncher_main_page_top_button_open_detail">View Details</string>
-@@ -1505,7 +1505,7 @@
-     <string name="llauncher_setting_notification_title4">Other Notifications</string>
-     <string name="llauncher_setting_notification_title5">Friend Notifications</string>
-     <string name="llauncher_setting_notification_title6">Highlight Notifications</string>
--    <string name="llauncher_setting_personal_information">Personal Information</string>
-+    <string name="llauncher_setting_personal_information">Credits</string>
-     <string name="llauncher_setting_record_bitrat_default">Automatic (Recommended)</string>
-     <string name="llauncher_setting_record_clear_cache">Clear Cache</string>
-     <string name="llauncher_setting_record_desc">By default, a one-minute video is approximately…</string>
-@@ -1517,12 +1517,12 @@
- · Size 75MB, Resolution 1080p, Frame Rate 30FPS
- · Size 50MB, Resolution 720p, Frame Rate 30FPS
- "</string>
--    <string name="llauncher_setting_record_go_active">Active</string>
-+    <string name="llauncher_setting_record_go_active" />
-     <string name="llauncher_setting_record_rate1">Resolution 1080p, Frame Rate 60FPS</string>
-     <string name="llauncher_setting_record_rate2">Resolution 1080p, Frame Rate 30FPS</string>
-     <string name="llauncher_setting_record_rate3">Resolution 720p, Frame Rate 30FPS</string>
-     <string name="llauncher_setting_record_reset">Reset</string>
--    <string name="llauncher_setting_record_reset_mapping">Reset Mapping Active</string>
-+    <string name="llauncher_setting_record_reset_mapping" />
-     <string name="llauncher_setting_record_title1">Record Video</string>
-     <string name="llauncher_setting_record_title2">Format</string>
-     <string name="llauncher_setting_record_title3">Bitrate</string>
-@@ -2230,8 +2230,8 @@
-     <string name="pc_scan_error">Scan Error</string>
-     <string name="pc_select_file">Select File</string>
-     <string name="pc_select_game_folder">Select Game Folder</string>
--    <string name="pc_setting_item_61">Steam Network Acceleration</string>
--    <string name="pc_setting_item_61_desc">Provide mitigation for network-restricted regions</string>
-+    <string name="pc_setting_item_61" />
-+    <string name="pc_setting_item_61_desc" />
-     <string name="pc_setting_item_62">Launch in Windowed Mode</string>
-     <string name="pc_setting_item_62_desc">Run programs in windowed mode, some programs require this option to work properly</string>
-     <string name="pc_setting_page_title">Game Settings</string>
-@@ -3153,7 +3153,7 @@
-     <string name="wheel_description">Press the mouse scroll button to switch between [Camera mode] and [Cursor mode]. Drag and place this icon to the dropdown list on the screen. In [Cursor mode],you can scroll down the list by scroll the scroll wheel of mouse.</string>
-     <string name="wheel_orientation">Wheel Orientation</string>
-     <string name="wheel_sensitivity">Wheel Sensitivity</string>
--    <string name="winemu_account_value">Account Value (￥)</string>
-+    <string name="winemu_account_value">Account Value ($)</string>
-     <string name="winemu_add">Add</string>
-     <string name="winemu_add_config">Add Configurations</string>
-     <string name="winemu_add_to_game_lib">Add To Game Library</string>
-@@ -3262,7 +3262,7 @@
-     <string name="winemu_game_library">Game Library</string>
-     <string name="winemu_game_manage">Game Management</string>
-     <string name="winemu_game_num">Game Count</string>
--    <string name="winemu_game_price">Game Price(￥)</string>
-+    <string name="winemu_game_price">Game Price ($)</string>
-     <string name="winemu_get_config_detail_failure">Failed to obtain the configuration scheme</string>
-     <string name="winemu_gpu_driver">GPU Driver</string>
-     <string name="winemu_guide_login_tips">Sync Steam play data, click to log in to your Steam account</string>
+@@ -3448,6 +3448,27 @@ Supports browsers on PC, mobile, and other devices."</string>
+     <string name="winemu_sidebar_key_map_alpha">Touch Control Opacity</string>
+     <string name="winemu_sidebar_key_mapping">Input Mapping</string>
+     <string name="winemu_sidebar_key_mouse_speed">Mouse Speed</string>
++    <string name="winemu_sidebar_rts_touch_controls">RTS Touch Controls</string>
++    <string name="rts_gesture_settings">RTS Gesture Settings</string>
++    <string name="rts_gesture_settings_title">RTS Gesture Settings</string>
++    <string name="rts_gesture_settings_close">Close</string>
++    <string name="rts_gesture_settings_reset">Reset to Defaults</string>
++    <string name="rts_gesture_tap">Tap</string>
++    <string name="rts_gesture_long_press">Long Press (300ms)</string>
++    <string name="rts_gesture_double_tap">Double-Tap</string>
++    <string name="rts_gesture_drag">Drag Finger</string>
++    <string name="rts_gesture_pinch">Pinch In/Out</string>
++    <string name="rts_gesture_two_finger_drag">Two-Finger Drag</string>
++    <string name="rts_action_left_click">Left Click</string>
++    <string name="rts_action_right_click">Right Click</string>
++    <string name="rts_action_double_left_click">Double Left Click</string>
++    <string name="rts_action_drag_left_click">Drag Left Click</string>
++    <string name="rts_action_scroll_wheel">Mouse Wheel Scroll</string>
++    <string name="rts_action_plus_minus">+/- Keys</string>
++    <string name="rts_action_page_up_down">Page Up/Down</string>
++    <string name="rts_action_middle_mouse">Middle Mouse Button</string>
++    <string name="rts_action_wasd_keys">WASD Keys</string>
++    <string name="rts_action_arrow_keys">Arrow Keys</string>
+     <string name="winemu_sidebar_performance">Performance</string>
+     <string name="winemu_sidebar_screen_brightness">Screen Brightness</string>
+     <string name="winemu_sidebar_switch_input_mapping">Switch Touch Control Layout</string>

patches/diffs/res/values/styles.xml.patch

@@ -1,12 +1,14 @@
+diff --git a/res/values/styles.xml b/res/values/styles.xml
+index 142ace1f1..0fb233366 100644
 --- a/res/values/styles.xml
 +++ b/res/values/styles.xml
-@@ -3067,9 +3067,6 @@
-     <style name="CheckBox" parent="@android:style/Widget.CompoundButton.CheckBox">
-         <item name="android:textSize">@dimen/sp_16</item>
+@@ -7977,4 +7977,9 @@
+     <style name="xja_ShapeRadioButtonStyle" parent="@style/Widget.AppCompat.CompoundButton.RadioButton">
+         <item name="xja_shape_buttonDrawable">@drawable/xja_shape_view_placeholder</item>
      </style>
--    <style name="CloudProgressStyle" parent="@style/Widget.AppCompat.ProgressBar.Horizontal">
--        <item name="android:progressDrawable">@drawable/cloud_progress_bar_style</item>
--    </style>
-     <style name="ComboBox">
-         <item name="android:textSize">@dimen/mw_14sp</item>
-         <item name="android:ellipsize">end</item>
++    <style name="RtsGestureConfigDialogTheme" parent="@style/_XPopup_TransparentDialog">
++        <item name="colorControlActivated">#ff3b82f6</item>
++        <item name="colorAccent">#ff3b82f6</item>
++        <item name="android:colorControlActivated">#ff3b82f6</item>
++    </style>
+ </resources>

patches/diffs/smali_classes4/com/winemu/core/controller/X11Controller.smali.patch

@@ -0,0 +1,21 @@
+diff --git a/smali_classes4/com/winemu/core/controller/X11Controller.smali b/smali_classes4/com/winemu/core/controller/X11Controller.smali
+index d35419214..38a426891 100644
+--- a/smali_classes4/com/winemu/core/controller/X11Controller.smali
++++ b/smali_classes4/com/winemu/core/controller/X11Controller.smali
+@@ -748,3 +748,16 @@
+     :cond_1
+     return-void
+ .end method
++
++.method public final setTrackpadInputMode(I)V
++    .locals 1
++
++    iget-object v0, p0, Lcom/winemu/core/controller/X11Controller;->b:Lcom/winemu/core/input/TouchInputManager;
++
++    if-eqz v0, :cond_end
++
++    invoke-virtual {v0, p1}, Lcom/winemu/core/input/TouchInputManager;->A(I)V
++
++    :cond_end
++    return-void
++.end method

patches/diffs/smali_classes4/com/winemu/openapi/WinUIBridge.smali.patch

@@ -0,0 +1,35 @@
+diff --git a/smali_classes4/com/winemu/openapi/WinUIBridge.smali b/smali_classes4/com/winemu/openapi/WinUIBridge.smali
+index 8ada83959..85fefcff4 100644
+--- a/smali_classes4/com/winemu/openapi/WinUIBridge.smali
++++ b/smali_classes4/com/winemu/openapi/WinUIBridge.smali
+@@ -2370,11 +2370,8 @@
+
+     if-nez v0, :cond_0
+
+-    const-string v0, "x11Controller"
+-
+-    invoke-static {v0}, Lkotlin/jvm/internal/Intrinsics;->y(Ljava/lang/String;)V
+-
+-    const/4 v0, 0x0
++    # X11Controller is null - just return silently instead of throwing
++    return-void
+
+     :cond_0
+     move-object v1, v0
+@@ -2678,3 +2675,16 @@
+     :goto_2
+     return-void
+ .end method
++
++.method public final setTrackpadInputMode(I)V
++    .locals 1
++
++    iget-object v0, p0, Lcom/winemu/openapi/WinUIBridge;->k:Lcom/winemu/core/controller/X11Controller;
++
++    if-eqz v0, :cond_end
++
++    invoke-virtual {v0, p1}, Lcom/winemu/core/controller/X11Controller;->setTrackpadInputMode(I)V
++
++    :cond_end
++    return-void
++.end method