From 0c5d9076a8fa5773a59176de2c139f85bad43520 Mon Sep 17 00:00:00 2001
From: dongliang <dongliang@dongliangdeMac-mini.local>
Date: Thu, 7 May 2026 16:45:17 +0930
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=95=B4=E4=B8=AA=E6=A0=87=E9=A2=98=E6=A0=8F?=
 =?UTF-8?q?=E5=B7=A6=E5=8D=8A=E8=BE=B9=E5=8F=AF=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

去掉 TouchDelegate，改用 FrameLayout 占标题栏左半边(weight=1)
图标靠左显示，但整个左半边 48dp 高的区域都能触发返回

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../xiaoqu/watch/ui/task/TaskListFragment.kt  | 11 +-------
 .../main/res/layout/fragment_task_list.xml    | 27 ++++++++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt
index 3492796..54276a5 100644
--- a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt
+++ b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt
@@ -87,19 +87,10 @@ class TaskListFragment : BaseFragment<FragmentTaskListBinding>() {
         val dialogContainer = requireActivity().findViewById<FrameLayout>(R.id.dialog_container)
         tipDialog = QuTipDialog(dialogContainer)
 
-        // 返回按钮（扩大触摸区域，图标大小不变）
+        // 返回按钮（整个左半边都可点击）
         binding.btnBack.setOnClickListener {
             findNavController().popBackStack()
         }
-        // 用 TouchDelegate 向下和向右扩展点击区域
-        binding.btnBack.post {
-            val parent = binding.btnBack.parent as View
-            val rect = android.graphics.Rect()
-            binding.btnBack.getHitRect(rect)
-            rect.bottom += (20 * resources.displayMetrics.density).toInt()
-            rect.right += (40 * resources.displayMetrics.density).toInt()
-            parent.touchDelegate = android.view.TouchDelegate(rect, binding.btnBack)
-        }
 
         // 左右滑手势（切换任务），上下滑留给内容滚动
         gestureDetector = GestureDetector(requireContext(), object : GestureDetector.SimpleOnGestureListener() {
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index bc5edf5..cd24c95 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -19,16 +19,25 @@
         android:paddingEnd="21dp"
         android:paddingBottom="4dp">
 
-        <!-- 返回按钮：iconfont 图标，点击区域由 TouchDelegate 扩展 -->
-        <TextView
+        <!-- 返回按钮：整个左半边可点击，图标靠左 -->
+        <FrameLayout
             android:id="@+id/btnBack"
-            android:layout_width="64dp"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="\ue6bd"
-            android:fontFamily="@font/iconfont"
-            android:textColor="@color/text_primary"
-            android:textSize="28sp" />
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:focusable="true">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingStart="21dp"
+                android:text="\ue6bd"
+                android:fontFamily="@font/iconfont"
+                android:textColor="@color/text_primary"
+                android:textSize="28sp" />
+        </FrameLayout>
 
         <TextView
             android:id="@+id/tvTitle"