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 0000000..5d1db1a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_arrow_right3.png differ 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"> +