canteen/StallDualScreen
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
lvmeng
2026-01-13 09:30:12 +08:00
parent ebc3d856d6
commit c38bead8a3
18 changed files with 180 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/color/color_search_food.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#FF5E7585" android:state_checked="false"/>
<item android:color="#FFFF3232" android:state_checked="true"/>
</selector>
app/src/main/res/color/color_text_dialog.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#FF0A1428" android:state_pressed="false"/>
<item android:color="#FFFF3232" android:state_pressed="true"/>
</selector>
app/src/main/res/drawable/bg_search_food.xml → app/src/main/res/drawable/bg_text_collect.xml
+3 -3
View File
@@ -2,14 +2,14 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false">
<shape android:shape="rectangle">
<corners android:radius="45dp"/>
<solid android:color="#FFE7EFF8"/>
<corners android:radius="50dp"/>
<solid android:color="@color/transparent"/>
<stroke android:color="#FFC4CFDA" android:width="2dp"/>
</shape>
</item>
<item android:state_checked="true">
<shape android:shape="rectangle">
<corners android:radius="45dp"/>
<corners android:radius="50dp"/>
<solid android:color="#FFFFF0F0"/>
<stroke android:color="#FFFF3232" android:width="2dp"/>
</shape>
app/src/main/res/drawable/bg_text_dialog.xml
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="50dp"/>
<solid android:color="@color/white"/>
<stroke android:color="#FFF5F6F8" android:width="2dp"/>
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="50dp"/>
<solid android:color="#FFFFF0F0"/>
<stroke android:color="#FFFF3232" android:width="2dp"/>
</shape>
</item>
</selector>
app/src/main/res/drawable/bg_text_main.xml
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false">
<shape android:shape="rectangle">
<corners android:radius="50dp"/>
<solid android:color="@color/white"/>
<!-- <stroke android:color="#FFC4CFDA" android:width="2dp"/>-->
</shape>
</item>
<item android:state_checked="true">
<shape android:shape="rectangle">
<corners android:radius="50dp"/>
<solid android:color="#FFFFF0F0"/>
<stroke android:color="#FFFF3232" android:width="2dp"/>
</shape>
</item>
</selector>
app/src/main/res/layout/activity_main.xml
+1 -1
View File
@@ -157,8 +157,8 @@
android:id="@+id/flPay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:visibility="gone">
<!-- android:background="@color/white"-->
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnPay"
app/src/main/res/layout/bottom_sheet_dialog.xml
+4 -5
View File
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/bottom_sheet_layout"
android:layout_width="match_parent"
android:layout_height="1000dp"
android:layout_height="wrap_content"
android:background="@drawable/bottom_sheet_background"
android:gravity="center_horizontal"
android:orientation="vertical">
@@ -62,10 +62,9 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="500dp"
android:layout_marginTop="48dp"
android:layout_marginBottom="20dp"
android:layout_height="700dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="5dp"
android:layout_marginHorizontal="14dp"
app:spanCount="2"
tools:itemCount="12"
app/src/main/res/layout/item_user_nutrition.xml
+3 -1
View File
@@ -40,12 +40,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:baselineAligned="false"
android:orientation="horizontal">
<!-- 热量 -->
<androidx.constraintlayout.widget.ConstraintLayout
style="@style/takeFoodLayout"
android:layout_weight="1.7">
android:layout_weight="1.7"
android:layout_width="0dp">
<LinearLayout
android:id="@+id/kcalValueLayout"
app/src/main/res/layout/list_item_search_food.xml
+3 -3
View File
@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tvFoodName"
android:layout_width="match_parent"
android:layout_height="90dp"
android:background="@drawable/bg_search_food"
android:layout_height="100dp"
tools:background="@drawable/bg_text_main"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
@@ -12,7 +12,7 @@
android:layout_marginVertical="14dp"
android:paddingHorizontal="15dp"
android:textAlignment="center"
android:textColor="@color/color_search_food"
tools:textColor="@color/black"
android:textSize="30sp"
android:textStyle="bold"
tools:text="肉沫干拌面" />
app/src/main/res/layout/list_item_search_food2.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tvFoodName"
android:layout_width="match_parent"
android:layout_height="100dp"
android:background="@drawable/bg_text_dialog"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:layout_marginHorizontal="14dp"
android:layout_marginVertical="14dp"
android:paddingHorizontal="15dp"
android:textAlignment="center"
android:textColor="@color/color_text_dialog"
android:textSize="30sp"
android:textStyle="bold"
tools:text="肉沫干拌面" />