This commit is contained in:
2025-12-19 17:34:31 +08:00
parent af56fb4aeb
commit 960b429e69
18 changed files with 294 additions and 181 deletions
+1 -1
View File
@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#FFFF3232"/>
<corners android:radius="6dp"/>
<corners android:radius="10dp"/>
</shape>
+4 -3
View File
@@ -58,7 +58,7 @@
android:id="@+id/tv_food_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:layout_marginTop="50dp"
android:textStyle="bold"
android:textSize="52sp"
android:textColor="#FF0A1428"
@@ -67,9 +67,9 @@
<FrameLayout
android:id="@+id/foodDisplayLayout"
android:layout_width="match_parent"
android:layout_height="500dp"
android:layout_height="560dp"
android:layout_marginHorizontal="28dp"
android:layout_marginTop="100dp"
android:layout_marginTop="80dp"
android:visibility="visible">
<androidx.camera.view.PreviewView
@@ -100,6 +100,7 @@
android:layout_height="0dp"
app:spanCount="2"
tools:itemCount="8"
android:overScrollMode="never"
tools:listitem="@layout/list_item_search_food"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
android:layout_marginHorizontal="14dp"
+2 -1
View File
@@ -11,7 +11,8 @@
android:layout_width="39dp"
android:layout_height="39dp"
android:indeterminateTint="@color/teal_200"
android:indeterminateTintMode="src_atop" />
android:indeterminateTintMode="src_atop"
android:focusable="false"/>
<TextView
android:id="@+id/tvTip"
@@ -187,7 +187,7 @@
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnConfirm"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="87dp"
android:layout_marginHorizontal="32dp"
android:layout_marginBottom="48dp"
android:text="确定"
+1 -1
View File
@@ -175,7 +175,7 @@
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnSave"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="87dp"
android:layout_marginHorizontal="32dp"
android:layout_marginBottom="48dp"
android:text="保存"
+1 -1
View File
@@ -1,6 +1,6 @@
<resources>
<!-- Base application theme. -->
<style name="Base.Theme.DualScreen" parent="Theme.Material3.DayNight.NoActionBar">
<style name="Theme.DualScreen" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your dark theme here. -->
<!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
</style>
+6 -3
View File
@@ -1,13 +1,11 @@
<resources>
<!-- Base application theme. -->
<!-- <style name="Base.Theme.DualScreen" parent="Theme.Material3.DayNight.NoActionBar">-->
<style name="Base.Theme.DualScreen" parent="Theme.AppCompat.Light.NoActionBar">
<style name="Theme.DualScreen" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your light theme here. -->
<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
</style>
<style name="Theme.DualScreen" parent="Base.Theme.DualScreen" />
<style name="text_title_blob">
<item name="android:layout_width">match_parent</item>
<item name="android:textColor">@color/beige_ECE7D0</item>
@@ -177,4 +175,9 @@
<item name="cornerFamily">rounded</item>
<item name="cornerSize">10dp</item>
</style>
<style name="LoadingDialog" parent="Theme.AppCompat.Dialog">
<item name="android:windowIsFloating">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
</style>
</resources>