From 67c58c10b2496b19b8d795326e2a8382e2ad909b Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Thu, 12 Aug 2021 23:36:55 +0200
Subject: [PATCH] Create splash screen

---
 CHANGELOG.md                                            | 1 +
 app/src/main/AndroidManifest.xml                        | 2 +-
 app/src/main/java/protect/card_locker/MainActivity.java | 1 +
 app/src/main/res/drawable/background_splash.xml         | 7 +++++++
 app/src/main/res/values/styles.xml                      | 5 ++++-
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/background_splash.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37ed341f5..4eef4e8a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 Changes:
 
 - Fix widget creating different-looking shortcut than app shortcuts
+- Replace default Android black screen with splash screen
 
 ## v2.2.2 (2021-08-08)
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9d7b68535..f7d30dba9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
         <activity
             android:name="protect.card_locker.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index d5d69cd2e..3a3cab1f2 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -177,6 +177,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
     @Override
     protected void onCreate(Bundle inputSavedInstanceState)
     {
+        setTheme(R.style.AppTheme_NoActionBar);
         super.onCreate(inputSavedInstanceState);
         setContentView(R.layout.main_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml
new file mode 100644
index 000000000..ddc4ded7e
--- /dev/null
+++ b/app/src/main/res/drawable/background_splash.xml
@@ -0,0 +1,7 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/ic_launcher_background"/>
+    <item android:gravity="center"
+        android:width="256dp"
+        android:height="256dp"
+        android:drawable="@drawable/ic_launcher_foreground" />
+</layer-list>
\ 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 5ad402cd7..88a54ea39 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,4 @@
 <resources>
-
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Customize your theme here. -->
@@ -17,6 +16,10 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="SplashTheme" parent="@style/AppTheme">
+        <item name="android:windowBackground">@drawable/background_splash</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar"/>
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light"/>