From 923eaff13ed8f4b0a7d77c7c3c3388f7b414b334 Mon Sep 17 00:00:00 2001 From: takahirom Date: Sat, 27 Jul 2024 13:52:52 +0900 Subject: [PATCH] Get rid of splash for now --- app-android/build.gradle.kts | 1 - app-android/src/main/AndroidManifest.xml | 2 +- .../droidkaigi/confsched/MainActivity.kt | 2 - .../splash_branding_image.xml | 48 -------- .../res/drawable-night-v31/splash_icon.xml | 114 ------------------ .../main/res/drawable-night/splash_icon.xml | 14 --- .../drawable-v31/splash_branding_image.xml | 48 -------- .../src/main/res/drawable-v31/splash_icon.xml | 114 ------------------ .../src/main/res/drawable/splash_icon.xml | 14 --- .../src/main/res/values/splash_theme.xml | 11 -- 10 files changed, 1 insertion(+), 367 deletions(-) delete mode 100644 app-android/src/main/res/drawable-night-v31/splash_branding_image.xml delete mode 100644 app-android/src/main/res/drawable-night-v31/splash_icon.xml delete mode 100644 app-android/src/main/res/drawable-night/splash_icon.xml delete mode 100644 app-android/src/main/res/drawable-v31/splash_branding_image.xml delete mode 100644 app-android/src/main/res/drawable-v31/splash_icon.xml delete mode 100644 app-android/src/main/res/drawable/splash_icon.xml delete mode 100644 app-android/src/main/res/values/splash_theme.xml diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts index 9690c4344..5a1414a78 100644 --- a/app-android/build.gradle.kts +++ b/app-android/build.gradle.kts @@ -112,7 +112,6 @@ dependencies { implementation(libs.androidxBrowser) implementation(libs.androidxWindow) implementation(libs.kermit) - implementation(libs.androidxSplashScreen) implementation(libs.firebaseDynamicLinks) debugImplementation(projects.core.testingManifest) testImplementation(projects.core.testing) diff --git a/app-android/src/main/AndroidManifest.xml b/app-android/src/main/AndroidManifest.xml index 7a6678051..a3e472e3e 100644 --- a/app-android/src/main/AndroidManifest.xml +++ b/app-android/src/main/AndroidManifest.xml @@ -24,7 +24,7 @@ + android:theme="@style/Theme.KaigiApp"> diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched/MainActivity.kt b/app-android/src/main/java/io/github/droidkaigi/confsched/MainActivity.kt index fd9e157ea..7f945b4d5 100644 --- a/app-android/src/main/java/io/github/droidkaigi/confsched/MainActivity.kt +++ b/app-android/src/main/java/io/github/droidkaigi/confsched/MainActivity.kt @@ -16,7 +16,6 @@ import androidx.compose.runtime.produceState import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb -import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.window.layout.DisplayFeature import androidx.window.layout.WindowInfoTracker import dagger.hilt.android.AndroidEntryPoint @@ -38,7 +37,6 @@ class MainActivity : ComponentActivity() { @OptIn(ExperimentalMaterial3WindowSizeClassApi::class) override fun onCreate(savedInstanceState: Bundle?) { - installSplashScreen() super.onCreate(savedInstanceState) // Navigation icon color can be changed since API 26(O) diff --git a/app-android/src/main/res/drawable-night-v31/splash_branding_image.xml b/app-android/src/main/res/drawable-night-v31/splash_branding_image.xml deleted file mode 100644 index 73e6cffb9..000000000 --- a/app-android/src/main/res/drawable-night-v31/splash_branding_image.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app-android/src/main/res/drawable-night-v31/splash_icon.xml b/app-android/src/main/res/drawable-night-v31/splash_icon.xml deleted file mode 100644 index f6f5ea673..000000000 --- a/app-android/src/main/res/drawable-night-v31/splash_icon.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app-android/src/main/res/drawable-night/splash_icon.xml b/app-android/src/main/res/drawable-night/splash_icon.xml deleted file mode 100644 index 4802d4a36..000000000 --- a/app-android/src/main/res/drawable-night/splash_icon.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app-android/src/main/res/drawable-v31/splash_branding_image.xml b/app-android/src/main/res/drawable-v31/splash_branding_image.xml deleted file mode 100644 index 331bdf90a..000000000 --- a/app-android/src/main/res/drawable-v31/splash_branding_image.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app-android/src/main/res/drawable-v31/splash_icon.xml b/app-android/src/main/res/drawable-v31/splash_icon.xml deleted file mode 100644 index f6f5ea673..000000000 --- a/app-android/src/main/res/drawable-v31/splash_icon.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app-android/src/main/res/drawable/splash_icon.xml b/app-android/src/main/res/drawable/splash_icon.xml deleted file mode 100644 index 4802d4a36..000000000 --- a/app-android/src/main/res/drawable/splash_icon.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app-android/src/main/res/values/splash_theme.xml b/app-android/src/main/res/values/splash_theme.xml deleted file mode 100644 index 677c84f09..000000000 --- a/app-android/src/main/res/values/splash_theme.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - -