feat(ui): 将采集页红色主题图标统一替换为绿色
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#FFFF3232"/>
|
||||
<!-- <solid android:color="#FFFF3232"/>-->
|
||||
<solid android:color="@color/dish_green"/>
|
||||
<corners android:radius="12dp"/>
|
||||
</shape>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 拍照按钮背景：圆角矩形，填充色 #00BC71 -->
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#00BC71" />
|
||||
<corners android:radius="12dp" />
|
||||
</shape>
|
||||
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 白色相机图标：外圆环 evenOdd 镂空，机身实心，镜头白色小圆 -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="56dp"
|
||||
android:height="56dp"
|
||||
android:viewportWidth="56"
|
||||
android:viewportHeight="56">
|
||||
|
||||
<!-- 外圆环：大圆 + 小圆 evenOdd，中间透明 -->
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="
|
||||
M28,4
|
||||
A24,24 0 1,1 27.9999,4 Z
|
||||
M28,10
|
||||
A18,18 0 1,0 28.0001,10 Z" />
|
||||
|
||||
<!-- 相机机身：evenOdd 在镜头位置挖透明圆孔 -->
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="
|
||||
M20,22 L22.5,18 L33.5,18 L36,22 L38,22
|
||||
A2,2 0 0,1 40,24 L40,36
|
||||
A2,2 0 0,1 38,38 L18,38
|
||||
A2,2 0 0,1 16,36 L16,24
|
||||
A2,2 0 0,1 18,22 Z
|
||||
M28,23
|
||||
A6,6 0 1,0 28.0001,23 Z" />
|
||||
|
||||
<!-- 镜头中心：白色小圆点 -->
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:pathData="M28,25.5 A3.5,3.5 0 1,0 28.0001,25.5 Z" />
|
||||
|
||||
</vector>
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 绿色圆角背景 + 白色垃圾桶图标，替代红色的 ic_delete_red.png -->
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- 绿色圆角背景 -->
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#00BC71" />
|
||||
<corners android:radius="10dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<!-- 白色垃圾桶图标，居中显示 -->
|
||||
<item
|
||||
android:drawable="@drawable/ic_trash_white"
|
||||
android:gravity="center" />
|
||||
|
||||
</layer-list>
|
||||
@@ -0,0 +1,32 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 白色垃圾桶图标：使用 evenOdd 填充规则实现条纹镂空，无硬编码背景色依赖 -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="40dp"
|
||||
android:height="40dp"
|
||||
android:viewportWidth="40"
|
||||
android:viewportHeight="40">
|
||||
|
||||
<!-- 桶盖 -->
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="
|
||||
M10,13 A1,1 0 0,1 10,11 L14,11 L14,9
|
||||
A2,2 0 0,1 16,7 L24,7
|
||||
A2,2 0 0,1 26,9 L26,11 L30,11
|
||||
A1,1 0 0,1 30,13 Z
|
||||
M16,9 L16,11 L24,11 L24,9 Z" />
|
||||
|
||||
<!-- 桶身：外轮廓 + 三条竖槽镂空，evenOdd 使竖槽透明 -->
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="
|
||||
M12,15 L13.5,33
|
||||
A2,2 0 0,0 15.5,35 L24.5,35
|
||||
A2,2 0 0,0 26.5,33 L28,15 Z
|
||||
M17,18 L17,32 L19,32 L19,18 Z
|
||||
M19.5,18 L19.5,32 L21.5,32 L21.5,18 Z
|
||||
M22,18 L22,32 L24,32 L24,18 Z" />
|
||||
|
||||
</vector>
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#FFFF3232"/>
|
||||
<solid android:color="@color/dish_green"/>
|
||||
<size android:width="10dp" android:height="40dp"/>
|
||||
<corners android:radius="5dp"/>
|
||||
</shape>
|
||||
@@ -98,15 +98,33 @@
|
||||
android:foreground="@drawable/ripple_effect"/>
|
||||
<!-- android:background="?android:attr/selectableItemBackgroundBorderless"-->
|
||||
|
||||
<ImageView
|
||||
<!-- 拍照按钮：绿色圆角背景 + 相机图标 + 文字 -->
|
||||
<LinearLayout
|
||||
android:id="@+id/btnTakePhoto"
|
||||
android:layout_width="212dp"
|
||||
android:layout_height="155dp"
|
||||
android:src="@drawable/ic_take_photo"
|
||||
android:background="@drawable/bg_take_photo"
|
||||
android:foreground="@drawable/ripple_effect"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="@id/flPreview"
|
||||
app:layout_constraintEnd_toEndOf="@id/btnCollectedFood"
|
||||
tools:ignore="ContentDescription"
|
||||
android:foreground="@drawable/ripple_effect"/>
|
||||
app:layout_constraintEnd_toEndOf="@id/btnCollectedFood">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="72dp"
|
||||
android:layout_height="72dp"
|
||||
android:src="@drawable/ic_camera_white"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:text="拍照"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="30sp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/rvFoodList"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
android:layout_height="52dp"
|
||||
android:layout_gravity="end|top"
|
||||
android:padding="6dp"
|
||||
android:src="@drawable/ic_delete_red" />
|
||||
android:src="@drawable/ic_delete_green" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivFinish"
|
||||
|
||||
Reference in New Issue
Block a user