From 7d3cb27b6edf4e08b3128403182437cccb55460a Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Mon, 18 May 2026 14:17:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E8=B0=83=E6=96=99?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B8=83=E5=B1=80=E5=88=87=E6=8D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将布局容器从 LinearLayout 改为 FrameLayout 以支持更好的定位控制
- 调整标题文本的尺寸和对齐方式，设置固定高度 50dp
- 更新切换按钮的内边距并调整其在父容器中的位置
- 更改切换按钮的图标资源名称从 ic_switch_box 为 ic_layout_list
- 优化布局切换逻辑，图标始终显示目标布局样式
- 在切换时动态更新按钮图标以反映当前布局模式
---
 .../shuwei/dish/match/ui/SubmitFoodActivity.kt  |  6 +++++-
 .../main/res/layout/activity_submit_food.xml    | 17 +++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
index 56952f0..fef7b3e 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
@@ -12,6 +12,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.GridLayoutManager
+import com.shuwei.dish.match.R
 import com.shuwei.dish.match.adapter.SeasoningWeightAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
@@ -310,12 +311,15 @@ class SubmitFoodActivity : BaseActivity() {
     }
 
     private fun addViewListener() {
-        // 切换调料列表布局：4 列卡片 ↔ 2 列水平
+        // 切换调料列表布局：4 列卡片 ↔ 2 列水平，图标始终显示"目标布局"样式
         binding.ivSeasoningLayoutToggle.clickWithDebounce {
             seasoningAdapter.isListMode = !seasoningAdapter.isListMode
             val spanCount = if (seasoningAdapter.isListMode) 2 else 4
             (binding.rvSeasoning.layoutManager as? GridLayoutManager)?.spanCount = spanCount
             seasoningAdapter.notifyDataSetChanged()
+            binding.ivSeasoningLayoutToggle.setImageResource(
+                if (seasoningAdapter.isListMode) R.drawable.ic_layout_grid else R.drawable.ic_layout_list
+            )
         }
         binding.btnCook.clickWithDebounce {
             val content = getRemindSpannable("开始制作")
diff --git a/app/src/main/res/layout/activity_submit_food.xml b/app/src/main/res/layout/activity_submit_food.xml
index ac3e58c..2450f1c 100644
--- a/app/src/main/res/layout/activity_submit_food.xml
+++ b/app/src/main/res/layout/activity_submit_food.xml
@@ -16,7 +16,7 @@
         android:background="@drawable/shape_white_30_corners"
         android:orientation="vertical">
 
-        <LinearLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="22dp"
@@ -26,11 +26,11 @@
             android:orientation="horizontal">
 
             <TextView
-                android:id="@+id/tvTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
                 android:text="@string/seasoning"
+                android:gravity="center_vertical"
+                android:layout_gravity="start"
                 android:textColor="@color/black666"
                 android:textSize="28sp" />
 
@@ -38,12 +38,13 @@
                 android:id="@+id/ivSeasoningLayoutToggle"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:paddingVertical="8dp"
+                android:paddingVertical="2dp"
+                android:layout_gravity="end"
                 android:contentDescription="切换布局"
-                android:src="@drawable/ic_switch_box"
+                android:src="@drawable/ic_layout_list"
                 android:background="?android:attr/selectableItemBackgroundBorderless" />
 
-        </LinearLayout>
+        </FrameLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvSeasoning"