⚙️ Use new Android 12 SplashScreen API

Signed-off-by: Stefan Niedermann <info@niedermann.it>

8 files changed, 17 insertions, 22 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 95afcfcdf..7cac982cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -82,6 +82,7 @@ dependencies {
     def roomVersion = "2.4.3"
     implementation "androidx.room:room-runtime:$roomVersion"
     annotationProcessor "androidx.room:room-compiler:$roomVersion"
+    implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.work:work-runtime:2.7.1'
     implementation "com.google.android.material:material:$rootProject.materialVersion"
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
index 60321ce57..51378f290 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
@@ -59,6 +59,7 @@ import androidx.appcompat.app.AppCompatActivity;
 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.core.view.ViewCompat;
 import androidx.lifecycle.LiveData;
@@ -188,6 +189,8 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        SplashScreen.installSplashScreen(this);
+
         super.onCreate(savedInstanceState);
 
         Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java
index a9e5a4f9a..1fbea2f72 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java
@@ -50,7 +50,7 @@ public class ShareTargetActivity extends MainActivity implements SelectCardListe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         try {
-            final Intent receivedIntent = getIntent();
+            final var receivedIntent = getIntent();
             final String receivedAction = receivedIntent.getAction();
             final String receivedType = receivedIntent.getType();
             DeckLog.info(receivedAction);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SelectCardForWidgetActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SelectCardForWidgetActivity.java
index fe6e969e7..c52772361 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SelectCardForWidgetActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SelectCardForWidgetActivity.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.widget.singlecard;
 
+import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.saveBrandColors;
+
 import android.appwidget.AppWidgetManager;
 import android.content.Intent;
 import android.os.Bundle;
@@ -16,8 +18,6 @@ import it.niedermann.nextcloud.deck.ui.MainActivity;
 import it.niedermann.nextcloud.deck.ui.branding.BrandingUtil;
 import it.niedermann.nextcloud.deck.ui.card.SelectCardListener;
 
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.saveBrandColors;
-
 public class SelectCardForWidgetActivity extends MainActivity implements SelectCardListener {
 
     private int appWidgetId;
@@ -26,12 +26,12 @@ public class SelectCardForWidgetActivity extends MainActivity implements SelectC
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        final Intent intent = getIntent();
+        final var intent = getIntent();
         if (intent == null) {
             finish();
             return;
         }
-        final Bundle args = intent.getExtras();
+        final var args = intent.getExtras();
         if (args == null) {
             finish();
             return;
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
deleted file mode 100644
index 88e43bf09..000000000
--- a/app/src/main/res/values-v23/styles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="BaseTheme">
-        <item name="android:windowLightStatusBar">@bool/isDayMode</item>
-        <item name="android:statusBarColor">?attr/colorPrimary</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 15ac19bf3..fee6d0d20 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -8,10 +8,4 @@
         <item name="android:windowLightNavigationBar">@bool/isDayMode</item>
     </style>
 
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@drawable/splash_screen</item>
-        <item name="colorPrimaryDark">@color/defaultBrand</item>
-        <item name="android:navigationBarColor">@color/defaultBrand</item>
-        <item name="android:windowLightNavigationBar">true</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 1405301e7..b256ed8bd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,6 +10,8 @@
         <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
         <item name="android:colorControlNormal">?attr/colorAccent</item>
         <item name="android:colorControlActivated">?attr/colorAccent</item>
+        <item name="android:windowLightStatusBar">@bool/isDayMode</item>
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
     </style>
 
     <style name="AppBottomSheetDialogTheme" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
@@ -35,9 +37,10 @@
     <!-- Default is a light theme with the dark blue brand -->
     <style name="AppTheme" parent="BaseTheme" />
 
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@drawable/splash_screen</item>
-        <item name="colorPrimaryDark">@color/defaultBrand</item>
+    <style name="SplashTheme" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/defaultBrand</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
 
     <style name="NavigationView">
diff --git a/fastlane/metadata/android/en-US/changelogs/1020002.txt b/fastlane/metadata/android/en-US/changelogs/1020002.txt
index 5b4ff7a61..7e05ffd6d 100644
--- a/fastlane/metadata/android/en-US/changelogs/1020002.txt
+++ b/fastlane/metadata/android/en-US/changelogs/1020002.txt
@@ -1,3 +1,4 @@
 - 💬 Allow multi line comments (#1299)
 - 🐞 Handle offline card creation better (#1295)
-- ⚙️ Add monochrome icon for Android 12+ (#1306)
\ No newline at end of file
+- ⚙️ Add monochrome icon for Android 12+ (#1306)
+- ⚙️ Use new Android 12 SplashScreen API
\ No newline at end of file