Use the new Android 12 SplashScreen API

Migration reference : https://developer.android.com/guide/topics/ui/splash-screen/migrate

13 files changed, 10 insertions, 72 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 479d2136..1151c88f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,6 +99,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.work:work-runtime:2.7.1'
+    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
     implementation 'com.google.android.material:material:1.6.1'
 
     // Database
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e8fc5660..5b23bd71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,25 +22,13 @@
         tools:targetApi="n">
 
         <activity
-            android:name=".SplashscreenActivity"
+            android:name=".main.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/SplashTheme"
+            android:theme="@style/Theme.App.Starting"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
-        </activity>
-
-        <activity
-            android:name=".main.MainActivity"
-            android:label="@string/app_name"
-            android:exported="false">
-
-            <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
 
@@ -60,7 +48,6 @@
             android:name=".AppendToNoteActivity"
             android:label="@string/append_to_note"
             android:exported="true">
-
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/SplashscreenActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/SplashscreenActivity.java
deleted file mode 100644
index 8b72b226..00000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/SplashscreenActivity.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package it.niedermann.owncloud.notes;
-
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import it.niedermann.owncloud.notes.exception.ExceptionHandler;
-import it.niedermann.owncloud.notes.main.MainActivity;
-
-
-/**
- * Created by stefan on 18.04.17.
- */
-public class SplashscreenActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));
-
-        final var intent = new Intent(this, MainActivity.class);
-        startActivity(intent);
-        finish();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index 3eb32044..1c901c21 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -36,6 +36,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.splashscreen.SplashScreen;
 import androidx.core.view.GravityCompat;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
@@ -137,6 +138,8 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        SplashScreen.installSplashScreen(this);
+
         super.onCreate(savedInstanceState);
 
         mainViewModel = new ViewModelProvider(this).get(MainViewModel.class);
diff --git a/app/src/main/res/drawable-hdpi/ic_splashscreen.png b/app/src/main/res/drawable-hdpi/ic_splashscreen.png
deleted file mode 100644
index e0679173..00000000
--- a/app/src/main/res/drawable-hdpi/ic_splashscreen.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-mdpi/ic_splashscreen.png b/app/src/main/res/drawable-mdpi/ic_splashscreen.png
deleted file mode 100644
index 73ab8acf..00000000
--- a/app/src/main/res/drawable-mdpi/ic_splashscreen.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xhdpi/ic_splashscreen.png b/app/src/main/res/drawable-xhdpi/ic_splashscreen.png
deleted file mode 100644
index 884e63e5..00000000
--- a/app/src/main/res/drawable-xhdpi/ic_splashscreen.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xxhdpi/ic_splashscreen.png b/app/src/main/res/drawable-xxhdpi/ic_splashscreen.png
deleted file mode 100644
index 83e9238c..00000000
--- a/app/src/main/res/drawable-xxhdpi/ic_splashscreen.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_splashscreen.png b/app/src/main/res/drawable-xxxhdpi/ic_splashscreen.png
deleted file mode 100644
index 1fe0f645..00000000
--- a/app/src/main/res/drawable-xxxhdpi/ic_splashscreen.png
+++ /dev/null
diff --git a/app/src/main/res/drawable/splashscreen.xml b/app/src/main/res/drawable/splashscreen.xml
deleted file mode 100644
index e6856ad7..00000000
--- a/app/src/main/res/drawable/splashscreen.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/defaultBrand" />
-
-    <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@drawable/ic_splashscreen" />
-    </item>
-
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index 812e48ee..dd7fad3a 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <style name="AppTheme" parent="BaseTheme">
         <item name="android:statusBarColor">?attr/colorPrimary</item>
         <item name="android:windowLightStatusBar">@bool/isDayMode</item>
     </style>
-
-    <style name="SplashTheme" parent="AppTheme">
-        <item name="android:windowBackground">@drawable/splashscreen</item>
-        <item name="android:statusBarColor">@color/defaultBrand</item>
-        <item name="android:windowLightStatusBar">false</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 477789c3..ec7496f2 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <style name="AppTheme" parent="BaseTheme">
         <item name="android:statusBarColor">?attr/colorPrimary</item>
         <item name="android:windowLightStatusBar">@bool/isDayMode</item>
         <item name="android:navigationBarColor">?attr/colorPrimary</item>
         <item name="android:windowLightNavigationBar">@bool/isDayMode</item>
     </style>
-
-    <style name="SplashTheme" parent="AppTheme">
-        <item name="android:windowBackground">@drawable/splashscreen</item>
-        <item name="android:statusBarColor">@color/defaultBrand</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:navigationBarColor">@color/defaultBrand</item>
-        <item name="android:windowLightNavigationBar">false</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f85b3b33..20006bd5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-
     <style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorAccent">@color/accent</item>
@@ -34,7 +33,9 @@
         <item name="android:layout_gravity">end|bottom</item>
     </style>
 
-    <style name="SplashTheme" parent="AppTheme">
-        <item name="android:windowBackground">@drawable/splashscreen</item>
+    <style name="Theme.App.Starting" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/defaultBrand</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
 </resources>
\ No newline at end of file