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"> - @@ -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" /> - +