diff --git a/android-app/app/build.gradle.kts b/android-app/app/build.gradle.kts index e9c24a341a..02f5cb3f4b 100644 --- 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 index a7e5502f64..8cfaeffed5 100644 --- 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"> 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 index bd5a4086ab..667b6c2ff3 100644 --- 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 index 02765b6a18..ebaccee49c 100644 --- 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 @@ --> - diff --git a/android-app/app/src/main/res/values/themes.xml b/android-app/app/src/main/res/values/themes.xml index 2f8a0814a6..fdc4afd7f0 100644 --- a/android-app/app/src/main/res/values/themes.xml +++ b/android-app/app/src/main/res/values/themes.xml @@ -20,25 +20,29 @@ - - - - - + + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d3a6db2fb2..1679ebef1c 100644 --- 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" }