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" > 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> : 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() { }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 @@ + + + + + + + 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 @@ + 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 @@ + + + + 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 @@