From b627ff44136826812a50711f6687426830a1b27a Mon Sep 17 00:00:00 2001
From: Serhii K <skv.sbkr@gmail.com>
Date: Wed, 24 Jan 2024 00:40:30 +0200
Subject: [PATCH] Use colorBackground property instead of splash screen lib

---
 uhabits-android/build.gradle.kts              |  1 -
 .../src/main/res/values-night/colors.xml      |  2 +-
 .../src/main/res/values-v31/styles.xml        | 24 -------------------
 .../src/main/res/values/colors.xml            |  2 +-
 .../src/main/res/values/styles.xml            |  7 ++----
 5 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 uhabits-android/src/main/res/values-v31/styles.xml

diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index ba1508691..252357d0f 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -128,7 +128,6 @@ dependencies {
     implementation("androidx.legacy:legacy-preference-v14:1.0.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
     implementation("com.google.android.material:material:1.10.0")
-    implementation("androidx.core:core-splashscreen:1.0.1")
     implementation("com.opencsv:opencsv:5.9")
     implementation(project(":uhabits-core"))
     kapt("com.google.dagger:dagger-compiler:$daggerVersion")
diff --git a/uhabits-android/src/main/res/values-night/colors.xml b/uhabits-android/src/main/res/values-night/colors.xml
index 331a09b51..e98c74022 100644
--- a/uhabits-android/src/main/res/values-night/colors.xml
+++ b/uhabits-android/src/main/res/values-night/colors.xml
@@ -19,5 +19,5 @@
   -->
 
 <resources>
-    <color name="splash_screen_background">@color/grey_900</color>
+    <color name="color_background">@color/grey_900</color>
 </resources>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/values-v31/styles.xml b/uhabits-android/src/main/res/values-v31/styles.xml
deleted file mode 100644
index 0e9ba29e7..000000000
--- a/uhabits-android/src/main/res/values-v31/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker 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/>.
-  -->
-
-<resources>
-    <style name="AppBaseTheme" parent="@style/AppTheme">
-        <item name="android:windowSplashScreenBackground">@color/splash_screen_background</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/values/colors.xml b/uhabits-android/src/main/res/values/colors.xml
index c943ffcad..5a59d6681 100644
--- a/uhabits-android/src/main/res/values/colors.xml
+++ b/uhabits-android/src/main/res/values/colors.xml
@@ -89,5 +89,5 @@
     </array>
 
     <color name="ic_launcher_background">#1976D2</color>
-    <color name="splash_screen_background">@color/grey_200</color>
+    <color name="color_background">@color/grey_200</color>
 </resources>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml
index 8b83702e7..87d053fe9 100644
--- a/uhabits-android/src/main/res/values/styles.xml
+++ b/uhabits-android/src/main/res/values/styles.xml
@@ -18,7 +18,7 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="AppTheme" parent="@style/Theme.MaterialComponents.Light.NoActionBar">
+    <style name="AppBaseTheme" parent="@style/Theme.MaterialComponents.Light.NoActionBar">
         <item name="aboutScreenColor">@color/blue_800</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="actionModeBackground">@color/grey_700</item>
@@ -61,15 +61,12 @@
         <item name="widgetShadowAlpha">0.25</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="windowBackgroundColor">@color/grey_200</item>
+        <item name="android:colorBackground">@color/color_background</item>
         <item name="android:textColorAlertDialogListItem">@color/grey_800</item>
         <item name="singleLineTitle">false</item>
         <item name="dialogFormLabelColor">@color/white</item>
     </style>
 
-    <style name="AppBaseTheme" parent="@style/AppTheme">
-        <item name="windowSplashScreenBackground">@color/splash_screen_background</item>
-    </style>
-
     <style name="AppBaseThemeDark" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
         <item name="aboutScreenColor">@color/blue_300</item>
         <item name="actionModeBackground">@color/grey_800</item>