From db839fd596a8d1c6a05218d256fe3f3c65628788 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Wed, 29 Apr 2026 10:10:57 +0800 Subject: [PATCH] =?UTF-8?q?style(ui):=20=E6=9B=B4=E6=96=B0=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=92=8C=E8=B0=83=E6=96=99=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整设置页面布局间距和背景样式 - 更换箭头图标资源文件 - 将调料列表改为网格布局显示 - 优化调料项目卡片样式和尺寸 - 修改RecyclerView为4列网格布局 --- .../dish/match/ui/SubmitFoodActivity.kt | 10 ++++---- .../res/drawable-xxxhdpi/ic_arrow_right3.png | Bin 0 -> 3503 bytes app/src/main/res/layout/activity_setting.xml | 18 +++++++------- .../main/res/layout/activity_submit_food.xml | 10 ++++++-- .../main/res/layout/item_seasoning_weight.xml | 22 ++++++++++-------- 5 files changed, 35 insertions(+), 25 deletions(-) create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_arrow_right3.png 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 b8a1b87..d078063 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 @@ -147,11 +147,13 @@ class SubmitFoodActivity : BaseActivity() { } } - /** 初始化 RecyclerView，2列 GridLayoutManager */ + /** 初始化 RecyclerView，24列 GridLayoutManager */ private fun setupRecyclerView() { - binding.rvSeasoning.itemAnimator = null - binding.rvSeasoning.layoutManager = GridLayoutManager(this, 2) - binding.rvSeasoning.adapter = seasoningAdapter + binding.rvSeasoning.let { + it.itemAnimator = null + it.layoutManager = GridLayoutManager(this, 4, GridLayoutManager.VERTICAL, false) + it.adapter = seasoningAdapter + } } /** diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_right3.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_right3.png new file mode 100644 index 0000000000000000000000000000000000000000..5d1db1a8d885aaadf34587722a2acaf6499667eb GIT binary patch literal 3503 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 KZsjhFp{Z+ literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index c35e545..ae422ad 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -13,9 +13,9 @@ android:layout_height="120dp" android:orientation="horizontal" android:gravity="center_vertical" - android:layout_marginTop="10dp" + android:layout_marginTop="30dp" android:layout_marginHorizontal="32dp" - android:background="@drawable/shape_white_e6_12_corners" + android:background="@drawable/shape_white_fb_15_corners2" android:foreground="?android:attr/selectableItemBackground" android:clipToOutline="true"> @@ -43,7 +43,7 @@ android:layout_height="40dp" android:layout_marginEnd="20dp" android:adjustViewBounds="true" - android:src="@drawable/ic_arrow_right2" + android:src="@drawable/ic_arrow_right3" tools:ignore="ContentDescription" /> @@ -54,8 +54,8 @@ android:orientation="horizontal" android:gravity="center_vertical" android:layout_marginHorizontal="32dp" - android:layout_marginTop="32dp" - android:background="@drawable/shape_white_e6_12_corners" + android:layout_marginTop="50dp" + android:background="@drawable/shape_white_fb_15_corners2" android:foreground="?android:attr/selectableItemBackground" android:clipToOutline="true"> @@ -74,7 +74,7 @@ android:layout_height="40dp" android:layout_marginEnd="20dp" android:adjustViewBounds="true" - android:src="@drawable/ic_arrow_right2" + android:src="@drawable/ic_arrow_right3" tools:ignore="ContentDescription" /> @@ -85,8 +85,8 @@ android:orientation="horizontal" android:gravity="center_vertical" android:layout_marginHorizontal="32dp" - android:layout_marginTop="32dp" - android:background="@drawable/shape_white_e6_12_corners" + android:layout_marginTop="50dp" + android:background="@drawable/shape_white_fb_15_corners2" android:foreground="?android:attr/selectableItemBackground" android:clipToOutline="true"> @@ -105,7 +105,7 @@ android:layout_height="40dp" android:layout_marginEnd="20dp" android:adjustViewBounds="true" - android:src="@drawable/ic_arrow_right2" + android:src="@drawable/ic_arrow_right3" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/activity_submit_food.xml b/app/src/main/res/layout/activity_submit_food.xml index 41ed38e..fb48f64 100644 --- a/app/src/main/res/layout/activity_submit_food.xml +++ b/app/src/main/res/layout/activity_submit_food.xml @@ -33,8 +33,14 @@ android:layout_height="660dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" - android:layout_marginHorizontal="12dp" - android:overScrollMode="never" /> + android:layout_marginHorizontal="20dp" + tools:itemCount="26" + app:spanCount="4" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + tools:listitem="@layout/item_seasoning_weight" + android:overScrollMode="never" + android:scrollbars="vertical" + android:scrollbarStyle="insideInset"/> diff --git a/app/src/main/res/layout/item_seasoning_weight.xml b/app/src/main/res/layout/item_seasoning_weight.xml index 7b2ce56..f9dbc76 100644 --- a/app/src/main/res/layout/item_seasoning_weight.xml +++ b/app/src/main/res/layout/item_seasoning_weight.xml @@ -2,19 +2,19 @@ + android:layout_height="110dp" + android:layout_marginHorizontal="5dp" + android:layout_marginVertical="5dp" + android:paddingHorizontal="10dp" + android:orientation="vertical" + android:gravity="center" + android:background="@drawable/shape_white_fb_15_corners2"> +