Merge remote-tracking branch 'origin/revert-1050-feature/implement_sp…

…lash_screen_animation' into 1.4.0
DroidKaigi · Sep 12, 2023 · cd04b90 · cd04b90
2 parents 438296c + fa6131e
commit cd04b90
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 383 deletions.
diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -113,7 +113,6 @@ dependencies {
     implementation(libs.androidxBrowser)
     implementation(libs.androidxWindow)
     implementation(libs.kermit)
-    implementation(libs.androidxSplashScreen)
     implementation(libs.firebaseDynamicLinks)
     testImplementation(projects.core.testing)
 }
diff --git a/app-android/src/main/AndroidManifest.xml b/app-android/src/main/AndroidManifest.xml
@@ -23,8 +23,7 @@
 
         <activity
             android:name=".MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.DroidKaigi.SplashTheme">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt b/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt
@@ -15,7 +15,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
@@ -27,7 +26,6 @@ import kotlinx.collections.immutable.toPersistentList
 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