From 000b6bfa75eb1667edc7a699d8aff6bb19f8ae78 Mon Sep 17 00:00:00 2001
From: Stefano Sansone <stefanosansone.dev@gmail.com>
Date: Sun, 25 Feb 2024 01:18:07 +0000
Subject: [PATCH] add custom splashscreen

---
 android/Omnivore/app/build.gradle.kts         |  2 ++
 .../Omnivore/app/src/main/AndroidManifest.xml |  8 ++---
 .../app/omnivore/omnivore/MainActivity.kt     |  5 +++-
 .../main/res/drawable/ic_launcher_dark.xml    |  9 ++++++
 .../main/res/drawable/ic_launcher_light.xml   |  9 ++++++
 .../app/src/main/res/values-night/colors.xml  |  4 +++
 .../app/src/main/res/values-night/themes.xml  | 17 +++++++++++
 .../app/src/main/res/values/colors.xml        |  3 +-
 .../app/src/main/res/values/themes.xml        | 29 +++++++++----------
 9 files changed, 62 insertions(+), 24 deletions(-)
 create mode 100644 android/Omnivore/app/src/main/res/drawable/ic_launcher_dark.xml
 create mode 100644 android/Omnivore/app/src/main/res/drawable/ic_launcher_light.xml
 create mode 100644 android/Omnivore/app/src/main/res/values-night/colors.xml
 create mode 100644 android/Omnivore/app/src/main/res/values-night/themes.xml

diff --git a/android/Omnivore/app/build.gradle.kts b/android/Omnivore/app/build.gradle.kts
index c37b13c12..06dd9ee08 100644
--- a/android/Omnivore/app/build.gradle.kts
+++ b/android/Omnivore/app/build.gradle.kts
@@ -168,6 +168,8 @@ dependencies {
 
     implementation(libs.androidx.lifecycle.runtimeCompose)
 
+    implementation("androidx.core:core-splashscreen:1.0.1")
+
 }
 
 apollo {
diff --git a/android/Omnivore/app/src/main/AndroidManifest.xml b/android/Omnivore/app/src/main/AndroidManifest.xml
index dce141df0..cd041b041 100644
--- a/android/Omnivore/app/src/main/AndroidManifest.xml
+++ b/android/Omnivore/app/src/main/AndroidManifest.xml
@@ -15,15 +15,14 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Omnivore"
         android:largeHeap="true"
         tools:targetApi="31">
 
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.Omnivore">
+            android:theme="@style/Theme.Omnivore.Splash"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -32,8 +31,7 @@
 
         <activity
             android:name=".feature.save.SaveSheetActivity"
-            android:exported="true"
-            android:theme="@style/Theme.AppCompat.Translucent">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt
index 688db9601..94512447e 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt
@@ -9,13 +9,13 @@ import androidx.activity.viewModels
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import app.omnivore.omnivore.feature.auth.LoginViewModel
 import app.omnivore.omnivore.feature.components.LabelsViewModel
 import app.omnivore.omnivore.feature.editinfo.EditInfoViewModel
-import app.omnivore.omnivore.feature.library.LibraryViewModel
 import app.omnivore.omnivore.feature.library.SearchViewModel
 import app.omnivore.omnivore.feature.root.RootView
 import app.omnivore.omnivore.feature.save.SaveViewModel
@@ -32,6 +32,9 @@ import kotlinx.coroutines.launch
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+
+        installSplashScreen()
+
         super.onCreate(savedInstanceState)
 
         val loginViewModel: LoginViewModel by viewModels()
diff --git a/android/Omnivore/app/src/main/res/drawable/ic_launcher_dark.xml b/android/Omnivore/app/src/main/res/drawable/ic_launcher_dark.xml
new file mode 100644
index 000000000..14e4bcec9
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable/ic_launcher_dark.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M84.86,53.22C84.86,55.2 84.38,57.6 83.89,59.69V59.71L83.89,59.72C83.29,62.16 81.89,64.33 79.91,65.88C77.93,67.42 75.49,68.26 72.98,68.26H72.84C66.49,68.26 62.49,63.05 62.49,57.21V48.85L57.76,55.86L57.5,56.07C56.52,56.89 55.28,57.34 54,57.34C52.72,57.34 51.48,56.89 50.5,56.07L50.24,55.87L45.37,48.76V66H40.72V47.23C40.72,43.68 44.93,41.61 47.73,44.1L47.94,44.29L53.64,52.61C53.75,52.66 53.87,52.69 53.99,52.69C54.12,52.69 54.23,52.66 54.34,52.61L59.93,44.33L60.18,44.12C62.84,41.91 67.14,43.58 67.14,47.3V57.21C67.14,61 69.55,63.61 72.84,63.61H72.98C76.02,63.61 78.64,61.55 79.37,58.62C79.86,56.54 80.21,54.61 80.21,53.24C80.14,38.26 67.47,26.82 52.13,27.86C39.2,28.75 28.75,39.2 27.85,52.14C27.6,55.72 28.09,59.32 29.3,62.71C30.5,66.1 32.38,69.2 34.84,71.83C37.29,74.45 40.26,76.55 43.55,77.98C46.85,79.41 50.41,80.15 54,80.14V84.79C49.77,84.8 45.58,83.93 41.7,82.24C37.82,80.56 34.33,78.09 31.44,75C28.55,71.91 26.33,68.26 24.91,64.27C23.5,60.28 22.92,56.05 23.21,51.82C24.27,36.56 36.56,24.27 51.81,23.21C69.69,22.01 84.78,35.42 84.86,53.22Z"
+      android:fillColor="#1F1B16"/>
+</vector>
diff --git a/android/Omnivore/app/src/main/res/drawable/ic_launcher_light.xml b/android/Omnivore/app/src/main/res/drawable/ic_launcher_light.xml
new file mode 100644
index 000000000..768ceabd6
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/drawable/ic_launcher_light.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M84.86,53.22C84.86,55.2 84.38,57.6 83.89,59.69V59.71L83.89,59.72C83.29,62.16 81.89,64.33 79.91,65.88C77.93,67.42 75.49,68.26 72.98,68.26H72.84C66.49,68.26 62.49,63.05 62.49,57.21V48.85L57.76,55.86L57.5,56.07C56.52,56.89 55.28,57.34 54,57.34C52.72,57.34 51.48,56.89 50.5,56.07L50.24,55.87L45.37,48.76V66H40.72V47.23C40.72,43.68 44.93,41.61 47.73,44.1L47.94,44.29L53.64,52.61C53.75,52.66 53.87,52.69 53.99,52.69C54.12,52.69 54.23,52.66 54.34,52.61L59.93,44.33L60.18,44.12C62.84,41.91 67.14,43.58 67.14,47.3V57.21C67.14,61 69.55,63.61 72.84,63.61H72.98C76.02,63.61 78.64,61.55 79.37,58.62C79.86,56.54 80.21,54.61 80.21,53.24C80.14,38.26 67.47,26.82 52.13,27.86C39.2,28.75 28.75,39.2 27.85,52.14C27.6,55.72 28.09,59.32 29.3,62.71C30.5,66.1 32.38,69.2 34.84,71.83C37.29,74.45 40.26,76.55 43.55,77.98C46.85,79.41 50.41,80.15 54,80.14V84.79C49.77,84.8 45.58,83.93 41.7,82.24C37.82,80.56 34.33,78.09 31.44,75C28.55,71.91 26.33,68.26 24.91,64.27C23.5,60.28 22.92,56.05 23.21,51.82C24.27,36.56 36.56,24.27 51.81,23.21C69.69,22.01 84.78,35.42 84.86,53.22Z"
+      android:fillColor="#EAE1D9"/>
+</vector>
diff --git a/android/Omnivore/app/src/main/res/values-night/colors.xml b/android/Omnivore/app/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..43b1e6380
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background">#262626</color>
+</resources>
diff --git a/android/Omnivore/app/src/main/res/values-night/themes.xml b/android/Omnivore/app/src/main/res/values-night/themes.xml
new file mode 100644
index 000000000..1a9b6693f
--- /dev/null
+++ b/android/Omnivore/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="NightAdjusted.Theme.Omnivore" parent="android:Theme.Material.NoActionBar" />
+
+    <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
+    </style>
+
+    <style name="Theme.Omnivore.Splash" parent="NightAdjusted.Theme.Splash">
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_light</item>
+        <item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/background</item>
+        <item name="postSplashScreenTheme">@style/Theme.Omnivore</item>
+    </style>
+
+</resources>
diff --git a/android/Omnivore/app/src/main/res/values/colors.xml b/android/Omnivore/app/src/main/res/values/colors.xml
index fdb6f43db..39c31200a 100644
--- a/android/Omnivore/app/src/main/res/values/colors.xml
+++ b/android/Omnivore/app/src/main/res/values/colors.xml
@@ -12,6 +12,5 @@
     <color name="yellow_E6E4BF">#E6E4BF</color>
     <color name="cta_yellow">#F8D457</color>
 
-<!--    <color name="F8F8F8">#F8F8F8</color>-->
-<!--    <color name="2E2E2B">#2E2E2B</color>-->
+    <color name="background">#FCFCFC</color>
 </resources>
diff --git a/android/Omnivore/app/src/main/res/values/themes.xml b/android/Omnivore/app/src/main/res/values/themes.xml
index f08194bdc..d63370f10 100644
--- a/android/Omnivore/app/src/main/res/values/themes.xml
+++ b/android/Omnivore/app/src/main/res/values/themes.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.Omnivore" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="NightAdjusted.Theme.Omnivore" parent="android:Theme.Material.Light.NoActionBar" />
+
+    <style name="Theme.Omnivore" parent="NightAdjusted.Theme.Omnivore" />
+
+    <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
     </style>
 
-    <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="windowActionBar">true</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowTranslucentStatus">true</item>
-
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:backgroundDimEnabled">true</item>
+    <style name="Theme.Omnivore.Splash" parent="NightAdjusted.Theme.Splash">
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@drawable/ic_launcher_dark</item>
+        <item name="android:windowSplashScreenBackground" tools:targetApi="s">@color/background</item>
+        <item name="postSplashScreenTheme">@style/Theme.Omnivore</item>
     </style>
+
 </resources>