Add splashscreen to Android (#1499)

chrisbanes · Sep 1, 2023 · 86f9f7d · 86f9f7d
1 parent ca127f8
commit 86f9f7d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts
@@ -152,6 +152,7 @@ dependencies {
     implementation(libs.androidx.browser)
     implementation(libs.androidx.emoji)
     implementation(libs.androidx.profileinstaller)
+    implementation(libs.androidx.splashscreen)
 
     implementation(libs.kotlin.coroutines.android)
 

diff --git a/android-app/app/src/main/AndroidManifest.xml b/android-app/app/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:exported="true"
-            android:theme="@style/Theme.Tivi.Home"
+            android:theme="@style/Theme.Tivi.Starting"
             tools:targetApi="n">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/android-app/app/src/main/kotlin/app/tivi/home/MainActivity.kt b/android-app/app/src/main/kotlin/app/tivi/home/MainActivity.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import app.tivi.BuildConfig
 import app.tivi.TiviActivity
@@ -27,6 +28,8 @@ import me.tatarka.inject.annotations.Provides
 
 class MainActivity : TiviActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
+
         super.onCreate(savedInstanceState)
         val component = MainActivityComponent::class.create(this)
 

diff --git a/android-app/app/src/main/res/values-v29/themes.xml b/android-app/app/src/main/res/values-v29/themes.xml
@@ -16,7 +16,7 @@
   -->
 
 <resources>
-    <style name="Theme.Tivi.Immerse" parent="Theme.Tivi.NoActionBar">
+    <style name="Theme.Tivi.Immerse" parent="Theme.Tivi">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>

diff --git a/android-app/app/src/main/res/values/themes.xml b/android-app/app/src/main/res/values/themes.xml
@@ -20,25 +20,29 @@
 
     <style name="Platform.Theme.Tivi" parent="android:Theme.Material.Light" />
 
-    <style name="Base.Theme.Tivi" parent="Platform.Theme.Tivi">
-        <item name="android:windowActionModeOverlay">true</item>
-    </style>
-
-    <style name="Theme.Tivi" parent="Base.Theme.Tivi">
-    </style>
-
-    <style name="Theme.Tivi.NoActionBar">
+    <style name="Theme.Tivi" parent="Platform.Theme.Tivi">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
+
+        <item name="android:statusBarColor">@android:color/transparent</item>
+
+        <item name="android:navigationBarColor">@color/nav_bar_scrim</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/use_light_nav_bar</item>
     </style>
 
-    <style name="Theme.Tivi.Immerse" parent="Theme.Tivi.NoActionBar">
+    <style name="Theme.Tivi.Immerse" parent="Theme.Tivi">
         <item name="android:statusBarColor">@android:color/transparent</item>
 
         <item name="android:navigationBarColor">@color/nav_bar_scrim</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/use_light_nav_bar</item>
     </style>
 
+    <style name="Theme.Tivi.Starting" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/launcher_icon_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>
+        <item name="postSplashScreenTheme">@style/Theme.Tivi.Home</item>
+    </style>
+
     <style name="Theme.Tivi.Home" parent="Theme.Tivi.Immerse">
         <item name="android:windowLightStatusBar">@bool/use_light_status_bar</item>
     </style>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -43,6 +43,7 @@ androidx-archCoreTesting = "androidx.arch.core:core-testing:2.2.0"
 androidx-browser = "androidx.browser:browser:1.6.0"
 androidx-collection = "androidx.collection:collection:1.3.0-beta01"
 androidx-core = "androidx.core:core-ktx:1.10.1"
+androidx-splashscreen = "androidx.core:core-splashscreen:1.0.1"
 androidx-emoji = "androidx.emoji:emoji:1.1.0"
 
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidxlifecycle" }