From 3c888c67f759b8b5a33b45316ae244d8d8d1a500 Mon Sep 17 00:00:00 2001 From: amos Date: Wed, 3 Jun 2026 00:31:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=8E=B0=E4=BB=A3=E7=AE=80=E7=BA=A6=20?= =?UTF-8?q?UI=20=E8=AE=BE=E8=AE=A1=20-=20=E4=BC=98=E5=8C=96=E5=B8=83?= =?UTF-8?q?=E5=B1=80/=E5=9B=BE=E6=A0=87/=E9=85=8D=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/bg_card.xml | 10 +- .../main/res/drawable/bg_function_icon.xml | 12 +- app/src/main/res/drawable/bg_gradient.xml | 10 +- app/src/main/res/drawable/bg_menu_button.xml | 15 +- app/src/main/res/drawable/bg_search.xml | 10 +- app/src/main/res/drawable/ic_accounting.xml | 17 +- app/src/main/res/drawable/ic_anniversary.xml | 14 +- .../main/res/drawable/ic_center_button.xml | 20 +- app/src/main/res/drawable/ic_express.xml | 17 +- app/src/main/res/drawable/ic_home_active.xml | 9 +- app/src/main/res/drawable/ic_materials.xml | 11 +- app/src/main/res/drawable/ic_memo.xml | 21 +- app/src/main/res/drawable/ic_more.xml | 11 +- app/src/main/res/drawable/ic_profile.xml | 9 +- app/src/main/res/drawable/ic_pve.xml | 11 +- app/src/main/res/drawable/ic_qrcode.xml | 14 +- app/src/main/res/drawable/ic_scan.xml | 11 +- app/src/main/res/drawable/ic_search.xml | 9 +- app/src/main/res/drawable/ic_speaker.xml | 11 +- app/src/main/res/drawable/ic_star.xml | 11 +- app/src/main/res/layout/activity_main.xml | 215 +++++++++++------- 21 files changed, 290 insertions(+), 178 deletions(-) diff --git a/app/src/main/res/drawable/bg_card.xml b/app/src/main/res/drawable/bg_card.xml index 4b9777f..ac600b5 100644 --- a/app/src/main/res/drawable/bg_card.xml +++ b/app/src/main/res/drawable/bg_card.xml @@ -1,6 +1,12 @@ + - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_function_icon.xml b/app/src/main/res/drawable/bg_function_icon.xml index c229b98..c9f1502 100644 --- a/app/src/main/res/drawable/bg_function_icon.xml +++ b/app/src/main/res/drawable/bg_function_icon.xml @@ -1,6 +1,12 @@ + - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_gradient.xml b/app/src/main/res/drawable/bg_gradient.xml index 9a60534..59f0a8d 100644 --- a/app/src/main/res/drawable/bg_gradient.xml +++ b/app/src/main/res/drawable/bg_gradient.xml @@ -1,7 +1,9 @@ + - + android:angle="135" + android:startColor="#F8F9FA" + android:endColor="#E9ECEF" + android:type="linear"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_menu_button.xml b/app/src/main/res/drawable/bg_menu_button.xml index 9cfaba5..397cd9c 100644 --- a/app/src/main/res/drawable/bg_menu_button.xml +++ b/app/src/main/res/drawable/bg_menu_button.xml @@ -1,5 +1,14 @@ + - - + android:shape="rectangle"> + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_search.xml b/app/src/main/res/drawable/bg_search.xml index 3d8176e..ac0e863 100644 --- a/app/src/main/res/drawable/bg_search.xml +++ b/app/src/main/res/drawable/bg_search.xml @@ -1,6 +1,12 @@ + - + - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_accounting.xml b/app/src/main/res/drawable/ic_accounting.xml index b87b42a..21363a6 100644 --- a/app/src/main/res/drawable/ic_accounting.xml +++ b/app/src/main/res/drawable/ic_accounting.xml @@ -1,10 +1,17 @@ + - + android:fillColor="#14B8A6" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/> + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_anniversary.xml b/app/src/main/res/drawable/ic_anniversary.xml index d376e91..8e12ab2 100644 --- a/app/src/main/res/drawable/ic_anniversary.xml +++ b/app/src/main/res/drawable/ic_anniversary.xml @@ -1,13 +1,11 @@ + - - + android:fillColor="#EC4899" + android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_center_button.xml b/app/src/main/res/drawable/ic_center_button.xml index 06fb273..fa3a6be 100644 --- a/app/src/main/res/drawable/ic_center_button.xml +++ b/app/src/main/res/drawable/ic_center_button.xml @@ -1,15 +1,11 @@ + - + android:width="64dp" + android:height="64dp" + android:viewportWidth="24" + android:viewportHeight="24"> - - - + android:fillColor="#6366F1" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4H7v-2h4V7h2v4h4V13z"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_express.xml b/app/src/main/res/drawable/ic_express.xml index 649a11d..fc420f6 100644 --- a/app/src/main/res/drawable/ic_express.xml +++ b/app/src/main/res/drawable/ic_express.xml @@ -1,10 +1,17 @@ + - + android:fillColor="#3B82F6" + android:pathData="M19,3H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM5,19V5h14v14H5z"/> + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_active.xml b/app/src/main/res/drawable/ic_home_active.xml index 979ebde..543e529 100644 --- a/app/src/main/res/drawable/ic_home_active.xml +++ b/app/src/main/res/drawable/ic_home_active.xml @@ -1,10 +1,11 @@ + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_materials.xml b/app/src/main/res/drawable/ic_materials.xml index 56381bb..ef375c6 100644 --- a/app/src/main/res/drawable/ic_materials.xml +++ b/app/src/main/res/drawable/ic_materials.xml @@ -1,10 +1,11 @@ + - + android:fillColor="#8B5CF6" + android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_memo.xml b/app/src/main/res/drawable/ic_memo.xml index 970cf7f..d92b9b6 100644 --- a/app/src/main/res/drawable/ic_memo.xml +++ b/app/src/main/res/drawable/ic_memo.xml @@ -1,13 +1,20 @@ + + android:fillColor="#6366F1" + android:pathData="M14,2H6C4.9,2 4,2.9 4,4v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V8L14,2zM6,20V4h7v5h5v11H6z"/> - + android:fillColor="#6366F1" + android:pathData="M8,12h8v1H8z"/> + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml index 005d4b4..b8f05bb 100644 --- a/app/src/main/res/drawable/ic_more.xml +++ b/app/src/main/res/drawable/ic_more.xml @@ -1,10 +1,11 @@ + - + android:fillColor="#6B7280" + android:pathData="M4,4h4v4H4V4zM10,4h4v4h-4V4zM16,4h4v4h-4V4zM4,10h4v4H4v-4zM10,10h4v4h-4v-4zM16,10h4v4h-4v-4zM4,16h4v4H4v-4zM10,16h4v4h-4v-4zM16,16h4v4h-4v-4z"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_profile.xml b/app/src/main/res/drawable/ic_profile.xml index 20cfbb0..494a0bc 100644 --- a/app/src/main/res/drawable/ic_profile.xml +++ b/app/src/main/res/drawable/ic_profile.xml @@ -1,10 +1,11 @@ + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_pve.xml b/app/src/main/res/drawable/ic_pve.xml index 636f0dc..943b4a8 100644 --- a/app/src/main/res/drawable/ic_pve.xml +++ b/app/src/main/res/drawable/ic_pve.xml @@ -1,10 +1,11 @@ + - + android:fillColor="#EF4444" + android:pathData="M21,6H3C1.9,6 1,6.9 1,8v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2V8C23,6.9 22.1,6 21,6zM7,14H5v-2h2v-2h2v2h2v2H9v2H7V14zM15.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5S16.33,15 15.5,15zM19,13h-2v2h-2v-2h-2v-2h2V9h2v2h2V13z"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_qrcode.xml b/app/src/main/res/drawable/ic_qrcode.xml index 350c540..ba9f695 100644 --- a/app/src/main/res/drawable/ic_qrcode.xml +++ b/app/src/main/res/drawable/ic_qrcode.xml @@ -1,13 +1,11 @@ + - - + android:fillColor="#10B981" + android:pathData="M3,3h6v6H3V3zM5,5v2h2V5H5zM3,15h6v6H3V15zM5,17v2h2v-2H5zM15,3h6v6h-6V3zM17,5v2h2V5h-2zM15,15h2v2h-2V15zM19,15h2v2h-2V15zM15,19h2v2h-2V19zM19,19h2v2h-2V19z"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml index a911ed4..ab5d34a 100644 --- a/app/src/main/res/drawable/ic_scan.xml +++ b/app/src/main/res/drawable/ic_scan.xml @@ -1,10 +1,11 @@ + - + android:fillColor="#6366F1" + android:pathData="M3,5v4h2V5H3zM3,15h2v-4H3V15zM3,19h2v-2H3V19zM5,3H3v2h2V3zM19,3v2h2V3H19zM15,3v2h4V3H15zM11,3v2h4V3H11zM7,3v2h4V3H7zM19,15h2v-4H19V15zM19,19h2v-2H19V19zM19,5v4h2V5H19z"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index d9a217a..ab3e374 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -1,10 +1,11 @@ + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_speaker.xml b/app/src/main/res/drawable/ic_speaker.xml index 533cbcd..1cece9f 100644 --- a/app/src/main/res/drawable/ic_speaker.xml +++ b/app/src/main/res/drawable/ic_speaker.xml @@ -1,10 +1,11 @@ + - + android:fillColor="#F59E0B" + android:pathData="M3,9v6h4l5,5V4L7,9H3zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml index 21cd2c7..ffda804 100644 --- a/app/src/main/res/drawable/ic_star.xml +++ b/app/src/main/res/drawable/ic_star.xml @@ -1,10 +1,11 @@ + - + android:fillColor="#F59E0B" + android:pathData="M12,2l3.09,6.26L22,9.27l-5,4.87 1.18,6.88L12,17.77l-6.18,3.25L7,14.14 2,9.27l6.91,-1.01L12,2z"/> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 97d03ef..bd10da4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,27 +5,47 @@ android:orientation="vertical" android:background="@drawable/bg_gradient"> - + + + + + + + + + - - + android:paddingHorizontal="24dp" + android:gravity="center_vertical" + android:layout_marginBottom="20dp"> + android:textColor="#9CA3AF" + android:textSize="15sp" + android:layout_marginStart="12dp"/> + android:padding="10dp" + android:layout_marginStart="12dp" + android:background="@drawable/bg_card"/> @@ -55,7 +78,8 @@ android:layout_weight="1" android:rowCount="3" android:columnCount="3" - android:padding="16dp"> + android:paddingHorizontal="16dp" + android:alignmentMode="alignMargins"> + android:layout_margin="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#374151" + android:textSize="14sp" + android:layout_marginTop="8dp"/> @@ -92,19 +119,22 @@ android:orientation="vertical" android:gravity="center" android:background="@drawable/bg_function_icon" - android:layout_margin="8dp"> + android:layout_margin="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#374151" + android:textSize="14sp" + android:layout_marginTop="8dp"/> @@ -117,19 +147,22 @@ android:orientation="vertical" android:gravity="center" android:background="@drawable/bg_function_icon" - android:layout_margin="8dp"> + android:layout_margin="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#374151" + android:textSize="14sp" + android:layout_marginTop="8dp"/> @@ -142,19 +175,22 @@ android:orientation="vertical" android:gravity="center" android:background="@drawable/bg_function_icon" - android:layout_margin="8dp"> + android:layout_margin="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#374151" + android:textSize="14sp" + android:layout_marginTop="8dp"/> @@ -167,19 +203,22 @@ android:orientation="vertical" android:gravity="center" android:background="@drawable/bg_function_icon" - android:layout_margin="8dp"> + android:layout_margin="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#374151" + android:textSize="14sp" + android:layout_marginTop="8dp"/> @@ -192,19 +231,22 @@ android:orientation="vertical" android:gravity="center" android:background="@drawable/bg_function_icon" - android:layout_margin="8dp"> + android:layout_margin="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#374151" + android:textSize="14sp" + android:layout_marginTop="8dp"/> @@ -217,19 +259,22 @@ android:orientation="vertical" android:gravity="center" android:background="@drawable/bg_function_icon" - android:layout_margin="8dp"> + android:layout_margin="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#374151" + android:textSize="14sp" + android:layout_marginTop="8dp"/> @@ -242,19 +287,22 @@ android:orientation="vertical" android:gravity="center" android:background="@drawable/bg_function_icon" - android:layout_margin="8dp"> + android:layout_margin="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#374151" + android:textSize="14sp" + android:layout_marginTop="8dp"/> @@ -267,19 +315,22 @@ android:orientation="vertical" android:gravity="center" android:background="@drawable/bg_function_icon" - android:layout_margin="8dp"> + android:layout_margin="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#374151" + android:textSize="14sp" + android:layout_marginTop="8dp"/> @@ -289,8 +340,10 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" - android:padding="8dp" - android:background="@drawable/bg_menu_button"> + android:padding="12dp" + android:background="@drawable/bg_menu_button" + android:layout_marginHorizontal="16dp" + android:layout_marginBottom="16dp"> + android:padding="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#6366F1" + android:textSize="12sp" + android:layout_marginTop="4dp"/> + android:layout_marginHorizontal="12dp" + android:clickable="true" + android:focusable="true"/> + android:padding="8dp" + android:clickable="true" + android:focusable="true"> + android:textColor="#6B7280" + android:textSize="12sp" + android:layout_marginTop="4dp"/> \ No newline at end of file