refactor: 提取净材种类弹窗为工具类并统一各页面选择逻辑
- 新增 RawMaterialsDialogUtils,包含 showRawMaterialsDialog、 buildSingleChoiceChipGroup、buildMockGoodsList 三个顶层函数 - FoodAdapter/list_item_food 新增净材种类选中结果展示 - VectorCollectionFragment、FoodRecognizeActivity、FoodSearchDialog 的食材点击均改为弹出净材种类单选弹窗后再确认选中 - FoodSearchDialog 空布局补充点击加载测试数据 - setting_border 新增圆角
This commit is contained in:
@@ -3,4 +3,5 @@
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#FFF4FAFF"/>
|
||||
<stroke android:width="2dp" android:color="@color/white"/>
|
||||
<corners android:radius="8dp"/>
|
||||
</shape>
|
||||
@@ -1,35 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="100dp"
|
||||
android:layout_margin="15dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvGoodsInfo"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="100dp"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/shape_white_12_corners"
|
||||
android:ellipsize="end"
|
||||
android:gravity="center"
|
||||
android:maxLines="1"
|
||||
android:paddingHorizontal="5dp"
|
||||
android:textColor="@color/black666"
|
||||
android:textSize="30sp"
|
||||
android:paddingHorizontal="5dp"
|
||||
android:gravity="center"
|
||||
android:layout_margin="15dp"
|
||||
tools:text="椒盐"
|
||||
android:maxLines="1"
|
||||
tools:text="椒盐" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvRawMaterialsType"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:ellipsize="end"
|
||||
android:background="@drawable/shape_white_12_corners"/>
|
||||
android:gravity="center"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/black999"
|
||||
android:textSize="18sp"
|
||||
android:visibility="gone"
|
||||
android:layout_marginBottom="5dp"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/tvFoodScore"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
tools:text="切丝" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvFoodScore"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/black666"
|
||||
android:textSize="16sp"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:layout_gravity="bottom|center_horizontal"
|
||||
tools:text="100%"
|
||||
android:maxLines="1"
|
||||
android:ellipsize="end"
|
||||
android:visibility="gone"/>
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/black666"
|
||||
android:layout_marginStart="10dp"
|
||||
android:textSize="16sp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintTop_toTopOf="@id/tvRawMaterialsType"
|
||||
app:layout_constraintBottom_toBottomOf="@id/tvRawMaterialsType"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/tvRawMaterialsType"
|
||||
tools:text="100%" />
|
||||
|
||||
|
||||
</FrameLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Reference in New Issue
Block a user