From 307f3c454ad289c9f68a89a491d952b5c48a3b82 Mon Sep 17 00:00:00 2001
From: admin <admin@viaeon.com>
Date: Tue, 7 Jul 2026 13:22:15 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=8C=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E9=A1=B5=E9=97=AE=E9=A2=98=20-=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=AA=97=E5=8F=A3=E6=98=BE=E7=A4=BA=20appsto?=
 =?UTF-8?q?re.png?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 创建 SplashTheme，windowBackground 设为 appstore.png 居中白底

- 创建 values-v31/themes.xml 适配 Android 12+ Splash Screen API

- MainActivity 应用 SplashTheme，BaseActivity.onCreate 切换回 BootstrapTheme

- 移除 MainActivity 中 ActivitySplashBinding 第二启动页
---
 .../app/src/main/AndroidManifest.xml               |  3 ++-
 .../java/com/github/kr328/clash/BaseActivity.kt    |  1 +
 .../java/com/github/kr328/clash/MainActivity.kt    | 14 ++------------
 .../src/main/res/drawable/splash_background.xml    |  9 +++++++++
 .../app/src/main/res/values-night/themes.xml       |  6 +++++-
 .../app/src/main/res/values-v31/themes.xml         |  9 +++++++++
 .../app/src/main/res/values/themes.xml             |  4 ++++
 7 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 Android-kotlin-Code/app/src/main/res/drawable/splash_background.xml
 create mode 100644 Android-kotlin-Code/app/src/main/res/values-v31/themes.xml

diff --git a/Android-kotlin-Code/app/src/main/AndroidManifest.xml b/Android-kotlin-Code/app/src/main/AndroidManifest.xml
index 0799b9b..61c51c7 100644
--- a/Android-kotlin-Code/app/src/main/AndroidManifest.xml
+++ b/Android-kotlin-Code/app/src/main/AndroidManifest.xml
@@ -49,7 +49,8 @@
             android:configChanges="uiMode"
             android:exported="true"
             android:label="@string/launch_name"
-            android:launchMode="singleTop" >
+            android:launchMode="singleTop"
+            android:theme="@style/SplashTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/Android-kotlin-Code/app/src/main/java/com/github/kr328/clash/BaseActivity.kt b/Android-kotlin-Code/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
index 819262a..0456f5b 100644
--- a/Android-kotlin-Code/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
+++ b/Android-kotlin-Code/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
@@ -84,6 +84,7 @@ abstract class BaseActivity<D : Design<*>> : AppCompatActivity(),
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(R.style.BootstrapTheme)
         super.onCreate(savedInstanceState)
         applyDayNight()
 
diff --git a/Android-kotlin-Code/app/src/main/java/com/github/kr328/clash/MainActivity.kt b/Android-kotlin-Code/app/src/main/java/com/github/kr328/clash/MainActivity.kt
index 8f19a61..b818c74 100644
--- a/Android-kotlin-Code/app/src/main/java/com/github/kr328/clash/MainActivity.kt
+++ b/Android-kotlin-Code/app/src/main/java/com/github/kr328/clash/MainActivity.kt
@@ -1,7 +1,5 @@
 package com.github.kr328.clash
 
-import android.os.Handler
-import android.os.Looper
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.PopupMenu
 import androidx.lifecycle.LiveData
@@ -26,7 +24,6 @@ import com.github.kr328.clash.design.PreferenceLiveData
 import com.github.kr328.clash.design.PreferenceManager
 import com.github.kr328.clash.design.R
 import com.github.kr328.clash.design.component.ProxyMenu
-import com.github.kr328.clash.design.databinding.ActivitySplashBinding
 import com.github.kr328.clash.design.dialog.requestModelTextInput
 import com.github.kr328.clash.design.dialog.withModelProgressBar
 import com.github.kr328.clash.design.network.APIGlobalObject
@@ -280,15 +277,8 @@ class MainActivity : BaseActivity<MainDesign>() {
 
 
         }else{
-            val binding = ActivitySplashBinding
-                .inflate(this.layoutInflater, this.root, false)
-
-            setContentView(binding.root)
-
-            Handler(Looper.getMainLooper()).postDelayed({
-                startActivity(LoginActivity::class.intent)
-
-            }, 1000) // Simulating a network delay
+            startActivity(LoginActivity::class.intent)
+            finish()
         }
 
     }
diff --git a/Android-kotlin-Code/app/src/main/res/drawable/splash_background.xml b/Android-kotlin-Code/app/src/main/res/drawable/splash_background.xml
new file mode 100644
index 0000000..08b91b2
--- /dev/null
+++ b/Android-kotlin-Code/app/src/main/res/drawable/splash_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/white" />
+    <item>
+        <bitmap
+            android:src="@drawable/appstore"
+            android:gravity="center" />
+    </item>
+</layer-list>
diff --git a/Android-kotlin-Code/app/src/main/res/values-night/themes.xml b/Android-kotlin-Code/app/src/main/res/values-night/themes.xml
index a2f025b..b1069ad 100644
--- a/Android-kotlin-Code/app/src/main/res/values-night/themes.xml
+++ b/Android-kotlin-Code/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="BootstrapTheme" parent="AppThemeDark" />
-</resources>
\ No newline at end of file
+
+    <style name="SplashTheme" parent="BootstrapTheme">
+        <item name="android:windowBackground">@drawable/splash_background</item>
+    </style>
+</resources>
diff --git a/Android-kotlin-Code/app/src/main/res/values-v31/themes.xml b/Android-kotlin-Code/app/src/main/res/values-v31/themes.xml
new file mode 100644
index 0000000..4f41d0a
--- /dev/null
+++ b/Android-kotlin-Code/app/src/main/res/values-v31/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="SplashTheme" parent="BootstrapTheme">
+        <item name="android:windowBackground">@drawable/splash_background</item>
+        <item name="android:windowSplashScreenBackground">@color/white</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/appstore</item>
+        <item name="android:windowSplashScreenIconBackgroundColor">@color/white</item>
+    </style>
+</resources>
diff --git a/Android-kotlin-Code/app/src/main/res/values/themes.xml b/Android-kotlin-Code/app/src/main/res/values/themes.xml
index 9fb80f6..ebff646 100644
--- a/Android-kotlin-Code/app/src/main/res/values/themes.xml
+++ b/Android-kotlin-Code/app/src/main/res/values/themes.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="BootstrapTheme" parent="AppThemeLight" />
+
+    <style name="SplashTheme" parent="BootstrapTheme">
+        <item name="android:windowBackground">@drawable/splash_background</item>
+    </style>
 </resources>