diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt index 46e5223..2984145 100644 --- a/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt +++ b/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt @@ -103,8 +103,9 @@ class Seasoning18GridAdapter( holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell) val normal = ContextCompat.getColor(holder.b.root.context, R.color.home_title) val sub = ContextCompat.getColor(holder.b.root.context, R.color.home_sub_title) + val black = ContextCompat.getColor(holder.b.root.context, R.color.black) holder.b.tvAddress.setTextColor(sub) - holder.b.tvName.setTextColor(sub) + holder.b.tvName.setTextColor(black) holder.b.tvWeight.setTextColor(normal) holder.b.tvState.setTextColor(sub) } diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt index f95c0f7..6b3b35a 100644 --- a/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt +++ b/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt @@ -109,8 +109,9 @@ class Seasoning22GridAdapter( holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell) val normal = ContextCompat.getColor(holder.b.root.context, R.color.home_title) val sub = ContextCompat.getColor(holder.b.root.context, R.color.home_sub_title) + val black = ContextCompat.getColor(holder.b.root.context, R.color.black) holder.b.tvAddress.setTextColor(sub) - holder.b.tvName.setTextColor(sub) + holder.b.tvName.setTextColor(black) holder.b.tvWeight.setTextColor(normal) holder.b.tvState.setTextColor(sub) } diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningWeightAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningWeightAdapter.kt index 1c239af..35cc841 100644 --- a/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningWeightAdapter.kt +++ b/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningWeightAdapter.kt @@ -6,6 +6,7 @@ import android.view.ViewGroup import com.chad.library.adapter4.BaseQuickAdapter import com.chad.library.adapter4.viewholder.QuickViewHolder import com.shuwei.dish.match.databinding.ItemSeasoningWeightBinding +import com.shuwei.dish.match.utils.ext.roundedDecimalPlace /** * 调料使用重量列表 Adapter @@ -50,7 +51,8 @@ class SeasoningWeightAdapter : BaseQuickAdapter() { /** 高亮自动恢复时间(毫秒) */ private const val HIGHLIGHT_DURATION_MS = 5_000L + + private const val RV_LEFT_RIGHT_SPACE = 10 } override fun inflateBinding( @@ -54,7 +56,7 @@ class SeasoningConfigFragment : BaseFragment() { private val adapter18 by lazy { Seasoning18GridAdapter( showNameOnly = true, - leftRightSpace = 20.dp + leftRightSpace = 1.dp * RV_LEFT_RIGHT_SPACE ) } @@ -245,7 +247,7 @@ class SeasoningConfigFragment : BaseFragment() { // } - private val size by lazy { SizeTool.getFlexLayoutSize(20.dp) } + private val size by lazy { SizeTool.getFlexLayoutSize(1.dp * RV_LEFT_RIGHT_SPACE) } /** 构建上层(22格)Adapter,需要先计算格子尺寸 */ private fun buildAdapter22(): Seasoning22GridAdapter { diff --git a/app/src/main/res/drawable/shape_scale_cell.xml b/app/src/main/res/drawable/shape_scale_cell.xml index acf43ea..d27b6e1 100644 --- a/app/src/main/res/drawable/shape_scale_cell.xml +++ b/app/src/main/res/drawable/shape_scale_cell.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/layout/activity_collected_food.xml b/app/src/main/res/layout/activity_collected_food.xml index 3368d0d..02ea35a 100644 --- a/app/src/main/res/layout/activity_collected_food.xml +++ b/app/src/main/res/layout/activity_collected_food.xml @@ -45,8 +45,7 @@ diff --git a/app/src/main/res/layout/fragment_seasoning_config.xml b/app/src/main/res/layout/fragment_seasoning_config.xml index f5c5e17..4d73f57 100644 --- a/app/src/main/res/layout/fragment_seasoning_config.xml +++ b/app/src/main/res/layout/fragment_seasoning_config.xml @@ -1,103 +1,83 @@ + android:orientation="vertical" + android:paddingHorizontal="5dp" + tools:background="@color/bg_color"> - + + + + + + + + android:overScrollMode="never" /> - + - + - - + - + - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_seasoning_weight.xml b/app/src/main/res/layout/item_seasoning_weight.xml index b598f84..7b2ce56 100644 --- a/app/src/main/res/layout/item_seasoning_weight.xml +++ b/app/src/main/res/layout/item_seasoning_weight.xml @@ -1,13 +1,14 @@ + android:paddingHorizontal="16dp"> + android:textColor="@color/black" + android:textSize="24sp" + android:textStyle="bold" + tools:text="土豆丝" /> + android:textColor="@color/dish_green" + android:textSize="26sp" + android:textStyle="bold" + tools:text="100g" /> diff --git a/app/src/main/res/layout/list_item_collected_food.xml b/app/src/main/res/layout/list_item_collected_food.xml index cbf4fc6..5d86900 100644 --- a/app/src/main/res/layout/list_item_collected_food.xml +++ b/app/src/main/res/layout/list_item_collected_food.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" tools:background="@color/white" android:orientation="vertical"> @@ -11,7 +12,6 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingHorizontal="32dp" android:paddingVertical="24dp"> @@ -19,6 +19,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" + android:layout_marginStart="64dp" android:orientation="vertical"> - + android:layout_marginHorizontal="64dp" + app:dividerColor="#FFE8EDF2" /> diff --git a/app/src/main/res/layout/list_item_scale22_row.xml b/app/src/main/res/layout/list_item_scale22_row.xml index 6bb7a87..3ad110d 100644 --- a/app/src/main/res/layout/list_item_scale22_row.xml +++ b/app/src/main/res/layout/list_item_scale22_row.xml @@ -25,7 +25,8 @@ android:layout_height="wrap_content" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/home_sub_title" /> + android:textColor="@color/black" + android:textStyle="bold"/> + android:textColor="@color/home_title"/> @@ -26,8 +26,9 @@ android:id="@+id/tvName" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/home_sub_title" - android:textSize="22sp" + android:textColor="@color/black" + android:textSize="26sp" + android:textStyle="bold" android:text="-" /> @@ -37,8 +38,7 @@ android:layout_height="wrap_content" android:gravity="center" android:textColor="@color/home_title" - android:textSize="26sp" - android:textStyle="bold" + android:textSize="22sp" tools:text="235.5 g" /> diff --git a/app/src/main/res/layout/list_type_scale1.xml b/app/src/main/res/layout/list_type_scale1.xml index f4bc301..b11409b 100644 --- a/app/src/main/res/layout/list_type_scale1.xml +++ b/app/src/main/res/layout/list_type_scale1.xml @@ -51,17 +51,17 @@ android:id="@+id/tvName" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="22sp" + android:textSize="26sp" + android:textStyle="bold" android:includeFontPadding="false" - android:textColor="@color/home_sub_title" + android:textColor="@color/black" android:text="-" /> #FF3700B3 #FF03DAC5 #FF018786 - #FF000000 - #FFFFFFFF + #000000 + #FFFFFF #F0F5FF #FF000A2D