From 20a34b569aad83a5f10847e74178323c64b74dc1 Mon Sep 17 00:00:00 2001
From: Kevinlinpr <kevinlinpr@gmail.com>
Date: Sun, 13 Oct 2024 05:03:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  1 +
 app/src/main/AndroidManifest.xml              |  2 +-
 .../riderpro/ui/composables/DropdownMenu.kt   |  5 +-
 .../main/res/drawable/rider_pro_logo_red.xml  | 64 +++++++++++++++++++
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/themes.xml            | 11 +++-
 6 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/rider_pro_logo_red.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 48e4ae2..22e0f01 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -112,6 +112,7 @@ dependencies {
     implementation ("cn.jiguang.sdk:jpush-google:5.4.0")
     api ("com.tencent.imsdk:imsdk-plus:8.1.6116")
     implementation("io.github.rroohit:ImageCropView:3.0.1")
+    implementation("androidx.core:core-splashscreen:1.0.1") // 添加 SplashScreen 依赖
 
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8dc1d80..0da24eb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.RiderPro"
+            android:theme="@style/Theme.App.Starting"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/composables/DropdownMenu.kt b/app/src/main/java/com/aiosman/riderpro/ui/composables/DropdownMenu.kt
index 948fc82..c7877de 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/composables/DropdownMenu.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/composables/DropdownMenu.kt
@@ -12,6 +12,7 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
@@ -61,7 +62,9 @@ fun DropdownMenu(
                         .noRippleClickable {
                             item.action()
                         }) {
-                    Row {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
                         Text(
                             item.title,
                             fontWeight = FontWeight.W500
diff --git a/app/src/main/res/drawable/rider_pro_logo_red.xml b/app/src/main/res/drawable/rider_pro_logo_red.xml
new file mode 100644
index 0000000..7261a7d
--- /dev/null
+++ b/app/src/main/res/drawable/rider_pro_logo_red.xml
@@ -0,0 +1,64 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M14.156,0L33.844,0A14.156,14.156 0,0 1,48 14.156L48,33.844A14.156,14.156 0,0 1,33.844 48L14.156,48A14.156,14.156 0,0 1,0 33.844L0,14.156A14.156,14.156 0,0 1,14.156 0z"
+      android:strokeWidth="1"
+      android:fillColor="#ED1C24"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <group>
+    <clip-path
+        android:pathData="M14.156,0L33.844,0A14.156,14.156 0,0 1,48 14.156L48,33.844A14.156,14.156 0,0 1,33.844 48L14.156,48A14.156,14.156 0,0 1,0 33.844L0,14.156A14.156,14.156 0,0 1,14.156 0z"/>
+    <path
+        android:pathData="M8.726,10.824l9.223,0l-0.5,2.474l-9.223,0z"
+        android:strokeWidth="1"
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M9.87,15.154l7.507,0l-0.5,2.474l-7.507,0z"
+        android:strokeWidth="1"
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M11.164,19.485l6.785,0l-0.651,2.474l-6.785,0z"
+        android:strokeWidth="1"
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M17.948,9.763l2.821,0.511l-2.926,18.914l-2.821,-0.511z"
+        android:strokeWidth="1"
+        android:fillColor="#ED1C24"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M6.508,9.763l2.821,0.511l-0.755,4.881l-2.821,-0.511z"
+        android:strokeWidth="1"
+        android:fillColor="#ED1C24"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M8.224,13.474l2.821,0.511l-0.755,4.881l-2.821,-0.511z"
+        android:strokeWidth="1"
+        android:fillColor="#ED1C24"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M9.94,18.423l2.821,0.511l-0.755,4.881l-2.821,-0.511z"
+        android:strokeWidth="1"
+        android:fillColor="#ED1C24"
+        android:fillType="evenOdd"
+        android:strokeColor="#00000000"/>
+    <path
+        android:pathData="M27.16,27.499L21.88,27.499L20.018,38.237L15.327,38.237L20.132,10.367L28.851,10.386C31.852,10.386 34.15,11.113 35.745,12.568C37.341,14.023 38.031,16.046 37.816,18.636C37.676,20.435 37.081,21.995 36.03,23.316C34.979,24.637 33.504,25.674 31.605,26.427L35.688,37.95L35.669,38.237L30.693,38.237L27.16,27.499ZM22.836,23.335L27.249,23.373C28.836,23.373 30.163,22.946 31.228,22.093C32.292,21.24 32.917,20.08 33.102,18.614C33.286,17.186 33.04,16.089 32.363,15.325C31.686,14.56 30.658,14.152 29.28,14.102L24.405,14.083L22.836,23.335Z"
+        android:strokeWidth="1"
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..2d67668 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,5 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="splash_background">#ED1C24</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7ddf15c..22dc68a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="Theme.RiderPro" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.RiderPro" parent="android:Theme.Material.Light.NoActionBar" >
+        <item name="android:windowNoTitle">true</item>
+    </style>
+    <style name="Theme.App.Starting" parent="Theme.SplashScreen">
+        <item name="android:windowNoTitle">true</item>
+        <item name="windowSplashScreenBackground">@color/splash_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/rider_pro_logo_red_round</item>
+        <item name="postSplashScreenTheme">@style/Theme.RiderPro</item>
+    </style>
 </resources>
\ No newline at end of file