diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bca3b520110537e1ecde479813513161b27b72fc..e612b75c86e16de231449806369075aab477a144 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -70,6 +70,7 @@ dependencies {
// Only needed for ringtone preference
implementation(libs.androidx.legacy)
implementation(libs.androidx.constraintlayout)
+ implementation(libs.androidx.splashscreen)
implementation(libs.androidx.room.runtime)
ksp(libs.androidx.room.compiler)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2938739c1c02d615ae689c619e10ecd4c0a4f411..eb126344e29e4c089ce321fe976ec52d23a0e8b3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,12 +41,11 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
- android:theme="@style/Theme.SplashTheme">
+ android:theme="@style/Theme.AppTheme.Starting">
<activity
android:name="de.kuschku.quasseldroid.ui.chat.ChatActivity"
android:exported="true"
- android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/res/drawable-hdpi/ic_splash.png b/app/src/main/res/drawable-hdpi/ic_splash.png
index 2cd62c04fb0d5e86ef736e6f60e3bcf665d24a9e..eb37b363afba42562a615059350ebcfb7d96a0b7 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_splash.png and b/app/src/main/res/drawable-hdpi/ic_splash.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_splash.png b/app/src/main/res/drawable-mdpi/ic_splash.png
index 51ce6b2e9f7409bd122083fbf01ebd6c010e15bb..825e61ffed197abc91f91080835f5e2a556d5199 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_splash.png and b/app/src/main/res/drawable-mdpi/ic_splash.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_splash.png b/app/src/main/res/drawable-xhdpi/ic_splash.png
index f208b7051960432c4ac5cb26150340d6f3f59912..d80a6dfed7843009aa81c8b305164cce4650546b 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_splash.png and b/app/src/main/res/drawable-xhdpi/ic_splash.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_splash.png b/app/src/main/res/drawable-xxhdpi/ic_splash.png
index c94ce343cb92e07243c60e28b00cc5a32f1e7ed9..f668dbc99b87354d76ee999f24c3611505cd79b4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_splash.png and b/app/src/main/res/drawable-xxhdpi/ic_splash.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_splash.png b/app/src/main/res/drawable-xxxhdpi/ic_splash.png
index 1ddfb16cd7b91b25ef31cf07dc78602f005d586c..41a55793b537e95bdf331479c2838073411f9b42 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_splash.png and b/app/src/main/res/drawable-xxxhdpi/ic_splash.png differ
diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml
deleted file mode 100644
index 7827ef27f53ff662138a9997521d9ae45e4e6724..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/bg_splash.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- Quasseldroid - Quassel client for Android
-
- Copyright (c) 2020 Janne Mareike Koschinski
- Copyright (c) 2020 The Quassel Project
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 3 as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program. If not, see <http://www.gnu.org/licenses/>.
- -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@color/colorPrimary" />
- <item>
- <bitmap
- android:gravity="center"
- android:src="@drawable/ic_splash" />
- </item>
-</layer-list>
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index 6cd4fb69a0f8c9d751816db38d59ca0be22d6b07..a962969ecb426a1a15fa8135cfc08063c5c52234 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -18,6 +18,11 @@
-->
<resources>
+ <style name="Theme.AppTheme.Starting" parent="Theme.SplashScreen">
+ <item name="windowSplashScreenBackground">@color/colorPrimary</item>
+ <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
+ <item name="postSplashScreenTheme">@style/Theme.AppTheme.NoActionBar</item>
+ </style>
<style name="Theme.AppTheme" parent="Theme.MaterialComponents.Bridge">
<item name="colorPrimary">@color/colorPrimary</item>
@@ -81,10 +86,6 @@
<item name="colorBackground">#FAFAFA</item>
</style>
- <style name="Theme.SplashTheme" parent="Theme.AppTheme.Light.NoActionBar">
- <item name="android:windowBackground">@drawable/bg_splash</item>
- </style>
-
<style name="Theme.ChatTheme" parent="Base.ChatTheme">
<item name="actionBarTheme">@style/Widget.AppBarOverlay</item>
<item name="formatBarTheme">@style/Widget.AppBarOverlay</item>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 053780ccbe08ebf0c4a4322dc13e27d2bd31e79d..3d66df8cfc49eb938c41f13789a9e8bddaa50fad 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,6 +36,7 @@ androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "
androidx-room-rxjava = { module = "androidx.room:room-rxjava2", version.ref = "androidx-room" }
androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "androidx-room" }
androidx-room-paging = { module = "androidx.room:room-paging", version = "2.6.1" }
+androidx-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" }
androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.1.0" }
androidx-test-core = { module = "androidx.arch.core:core-testing", version = "2.2.0" }
androidx-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx-espresso" }