Merge pull request #165 from DroidKaigi/takahirom/remove-splash-scree…

…n-for-now/2024-07-27 Get rid of splash for now
DroidKaigi · Jul 27, 2024 · f065648 · f065648
2 parents 2014154 + 923eaff
commit f065648
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 367 deletions.
diff --git 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
@@ -24,7 +24,7 @@
         <activity
             android:name="io.github.droidkaigi.confsched.MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.DroidKaigi.SplashTheme">
+            android:theme="@style/Theme.KaigiApp">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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
@@ -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
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