Bug fix, update changelog

Author: R-YaTian

universal/res/raw-b+zh+Hant/help_changelog.txt

@@ -1,3 +1,18 @@
+<b>版本 2.6.0.4a Rev 251204 (BY R-YaTian):
+- 修復 LCD3x HD 和 LCD3x 著色器的加載問題 (需刪除資料存儲目錄下的 LCD3x HD.dfx 和 LCD3x.dfx 文件才能生效)
+- 為 Android 10 及以上系統引入完整的深色主題支援
+- 当 DS 下螢幕不可見且右搖桿模式設為觸筆模式時, 隱藏觸筆圖像並禁用按下操作
+- 修復瀏海螢幕設備佈局編輯器無法使用底部區域的問題
+- 更新並改進主選單按鈕資源 (由 Handheld企鹅 製作)
+- 新的預設虛擬按鍵皮膚 (由 Handheld企鹅 製作), 保留原始皮膚並重命名為 "DraStic Classic"
+- 新增在單螢幕佈局中輸出 DS 下螢幕的選項
+- 移除過時的虛擬按鍵皮膚
+- 改進 TV 模式下的設定頁面和幫助頁面
+- 更新 TV 模式下的快捷選單資源 (由 Handheld企鹅 製作)
+- 調整橫屏模式下主選單選項的位置
+- 修復在 TV 模式下, 常規設定頁面配置預設佈局選項時崩潰的歷史問題
+- 切換上下螢幕功能現在對副螢幕有效
+
 <b>版本 2.6.0.4a Rev 251117 (BY R-YaTian):
 - 清理未使用的通知相關資源
 - 改進按鍵映射詳情頁面的文本顯示

universal/res/raw-zh/help_changelog.txt

@@ -1,3 +1,18 @@
+<b>版本 2.6.0.4a Rev 251204 (BY R-YaTian):
+- 修复 LCD3x HD 和 LCD3x 着色器的加载问题 (需删除数据存储目录下的 LCD3x HD.dfx 和 LCD3x.dfx 文件才能生效)
+- 为 Android 10 及以上系统引入完整的深色主题支持
+- 当 DS 下屏幕不可见且右摇杆模式设置为触笔时, 隐藏触笔图像并禁用触笔按下操作
+- 修复刘海屏设备上布局编辑器无法使用底部区域的问题
+- 更新并改进主菜单按钮图片 (由 Handheld企鹅 制作)
+- 添加新的默认虚拟按键皮肤 (由 Handheld企鹅 制作), 保留原始皮肤并重命名为 "DraStic Classic"
+- 添加新设置选项以支持单屏布局输出DS下屏幕
+- 移除过时的虚拟按键皮肤
+- 改进 TV 模式下的设置页面和帮助页面
+- 更新 TV 模式下的快捷菜单资源 (由 Handheld企鹅 制作)
+- 调整横屏模式下主菜单选项的位置
+- 解决 TV 模式下在常规设置页面配置默认布局选项出现崩溃的历史问题
+- 屏幕切换功能现在将对扩展屏幕生效
+
 <b>版本 2.6.0.4a Rev 251117 (BY R-YaTian):
 - 清理未使用的通知相关资源
 - 改进按键映射详情页面的文本显示

universal/res/raw/help_changelog.txt

@@ -1,3 +1,18 @@
+<b>Version 2.6.0.4a Rev 251204 (BY R-YaTian):
+- Fixed the loading issue with the LCD3x HD and LCD3x shaders (requires deleting LCD3x HD.dfx and LCD3x.dfx from the data directory to take effect)
+- Introduced full dark theme support for Android 10 and above
+- Hide the stylus image and disabled pointer-down actions when the bottom screen is not visible and the right-stick mode is set to Stylus Pointer
+- Removed buggy display cutout handling code from the Customizer activity, fixing the issue where the layout editor could not use the bottom area
+- Updated and improved main menu button images (BY Handheld企鹅)
+- Added new default virtual controller theme (Made by Handheld企鹅). Preserved the original theme and renamed it to "DraStic Classic"
+- Added new option for display the DS bottom screen in single-screen layout
+- Remove outdated virtual controller assets
+- Improve the settings and help pages in TV mode
+- Update Fast-Access menu images for TV mode (Made by Handheld企鹅)
+- Adjusted the position of menu options in the main menu when in landscape mode
+- Fixed a long-standing issue where selecting the Default Layout option in the General Settings page caused a crash in TV mode
+- The Screen-Swap feature now applies to the external display
+
 <b>Version 2.6.0.4a Rev 251117 (BY R-YaTian):
 - Clean up unused notification-related resources
 - Improve the text display on the MappingInfo page

universal/res/values-b+zh+Hant/strings.xml

@@ -257,7 +257,7 @@ DraStic正在努力生成一個恢復存檔。若成功的話, 您在下次打
     <string name="str_set_menu_game_options_delete">刪除單一遊戲設定</string>
     <string name="str_set_menu_global_options">全局設定</string>
     <string name="str_set_menu_override_msg">被單一遊戲設定覆蓋的選項已被劃掉</string>
-    <string name="str_set_menu_singlelayout_usebottom">在單螢幕佈局中輸出 DS 的下螢幕</string>
+    <string name="str_set_menu_singlelayout_usebottom">在單螢幕佈局中輸出 DS 下螢幕</string>
     <string name="str_set_menubtn">停用選單鍵</string>
     <string name="str_set_menubtn_pos">選單鍵位置</string>
     <string name="str_set_menubtn_warn">隱藏選單鍵, 請確保您已經設定好打開選單用的按鍵</string>

universal/smali/com/dsemu/drastic/DraSticExtGlView$TouchListener.smali

@@ -24,9 +24,18 @@
 .method public onTouch(Landroid/view/View;Landroid/view/MotionEvent;)Z
     .locals 10
 
-    sget v0, Lf0/h;->A:I
+    # Get the DraSticExtGlView instance
+    iget-object v0, p0, Lcom/dsemu/drastic/DraSticExtGlView$TouchListener;->this$0:Lcom/dsemu/drastic/DraSticExtGlView;
+
+    invoke-static {v0}, Lcom/dsemu/drastic/DraSticExtGlView;->a(Lcom/dsemu/drastic/DraSticExtGlView;)Landroid/content/Context;
+
+    move-result-object v1
 
-    if-eqz v0, :return_0
+    invoke-static {v1}, Lf0/h;->isBottomScreenDisplayedExt(Landroid/content/Context;)Z
+
+    move-result v1
+
+    if-eqz v1, :return_0
 
     # Get the subTouchX
     invoke-virtual {p2}, Landroid/view/MotionEvent;->getX()F
@@ -36,9 +45,6 @@
     invoke-virtual {p2}, Landroid/view/MotionEvent;->getY()F
     move-result v3
 
-    # Get the DraSticExtGlView instance
-    iget-object v0, p0, Lcom/dsemu/drastic/DraSticExtGlView$TouchListener;->this$0:Lcom/dsemu/drastic/DraSticExtGlView;
-
     # Get DraSticExtGlView$a
     invoke-virtual {v0}, Lcom/dsemu/drastic/DraSticExtGlView;->geta()Lcom/dsemu/drastic/DraSticExtGlView$a;
     move-result-object v4

universal/smali/f0/h.smali

@@ -3966,6 +3966,58 @@
     return v1
 .end method
 
+.method public static isBottomScreenDisplayedExt(Landroid/content/Context;)Z
+    .locals 4
+
+    sget-object v0, Lf0/h;->e:Lcom/dsemu/drastic/filesystem/b;
+
+    const/4 v1, 0x0
+
+    if-eqz v0, :cond_0
+
+    sget-object v0, Lf0/h;->a:Ljava/lang/String;
+
+    invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences;
+
+    move-result-object v0
+
+    sget-object v2, Lf0/h;->e:Lcom/dsemu/drastic/filesystem/b;
+
+    invoke-interface {v2, p0}, Lcom/dsemu/drastic/filesystem/b;->w(Landroid/content/Context;)Ljava/lang/String;
+
+    move-result-object p0
+
+    new-instance v2, Ljava/lang/StringBuilder;
+
+    invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+
+    const-string v3, "_ScreenSwap_"
+
+    invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+    move-result-object p0
+
+    invoke-interface {v0, p0, v1}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
+
+    move-result p0
+
+    sget v1, Lf0/h;->A:I
+
+    if-eqz v1, :not_use_bottom
+
+    xor-int/lit8 p0, p0, 0x1
+
+    :not_use_bottom
+    return p0
+
+    :cond_0
+    return v1
+.end method
+
 .method public static q(Landroid/content/Context;)I
     .locals 4