From 211dd77ad1c478e8b809d51236ed9d73fbcc56b1 Mon Sep 17 00:00:00 2001
From: Sean Mac Gillicuddy <seantheappdev@gmail.com>
Date: Thu, 5 Nov 2020 11:35:43 +0000
Subject: [PATCH] #2471 Custom app splash screen should not display Kiwix logo
 - show app icon as logo

---
 .../drawable-night/kiwix_icon_with_title.png  | Bin
 .../main/res/drawable-night/launch_screen.xml |   0
 .../res/drawable/kiwix_icon_with_title.png    | Bin
 .../src/main/res/drawable/launch_screen.xml   |   0
 app/src/main/res/values/themes.xml            |  24 ++++++++++++++
 core/src/main/res/values/styles.xml           |   5 ---
 .../main/res/drawable-night/launch_screen.xml |  31 ++++++++++++++++++
 .../src/main/res/drawable/launch_screen.xml   |  31 ++++++++++++++++++
 custom/src/main/res/values/themes.xml         |  24 ++++++++++++++
 9 files changed, 110 insertions(+), 5 deletions(-)
 rename {core => app}/src/main/res/drawable-night/kiwix_icon_with_title.png (100%)
 rename {core => app}/src/main/res/drawable-night/launch_screen.xml (100%)
 rename {core => app}/src/main/res/drawable/kiwix_icon_with_title.png (100%)
 rename {core => app}/src/main/res/drawable/launch_screen.xml (100%)
 create mode 100644 app/src/main/res/values/themes.xml
 create mode 100644 custom/src/main/res/drawable-night/launch_screen.xml
 create mode 100644 custom/src/main/res/drawable/launch_screen.xml
 create mode 100644 custom/src/main/res/values/themes.xml

diff --git a/core/src/main/res/drawable-night/kiwix_icon_with_title.png b/app/src/main/res/drawable-night/kiwix_icon_with_title.png
similarity index 100%
rename from core/src/main/res/drawable-night/kiwix_icon_with_title.png
rename to app/src/main/res/drawable-night/kiwix_icon_with_title.png
diff --git a/core/src/main/res/drawable-night/launch_screen.xml b/app/src/main/res/drawable-night/launch_screen.xml
similarity index 100%
rename from core/src/main/res/drawable-night/launch_screen.xml
rename to app/src/main/res/drawable-night/launch_screen.xml
diff --git a/core/src/main/res/drawable/kiwix_icon_with_title.png b/app/src/main/res/drawable/kiwix_icon_with_title.png
similarity index 100%
rename from core/src/main/res/drawable/kiwix_icon_with_title.png
rename to app/src/main/res/drawable/kiwix_icon_with_title.png
diff --git a/core/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml
similarity index 100%
rename from core/src/main/res/drawable/launch_screen.xml
rename to app/src/main/res/drawable/launch_screen.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 000000000..3773f808c
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Kiwix Android
+  ~ Copyright (c) 2020 Kiwix <android.kiwix.org>
+  ~ This program 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.
+  ~
+  ~ This program 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="KiwixTheme.Launcher">
+    <item name="android:windowBackground">@drawable/launch_screen</item>
+  </style>
+</resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 9f14bb1e7..60df19b1f 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -32,11 +32,6 @@
     <item name="android:background">@color/black</item>
   </style>
 
-  <style name="KiwixTheme.Launcher">
-    <item name="android:windowBackground">@drawable/launch_screen</item>
-  </style>
-
-
   <style name="Widget.KiwixTheme.TabLayout" parent="Widget.MaterialComponents.TabLayout">
     <item name="android:background">@color/black</item>
     <item name="tabTextColor">@color/alabaster_white</item>
diff --git a/custom/src/main/res/drawable-night/launch_screen.xml b/custom/src/main/res/drawable-night/launch_screen.xml
new file mode 100644
index 000000000..b11ad6354
--- /dev/null
+++ b/custom/src/main/res/drawable-night/launch_screen.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Kiwix Android
+  ~ Copyright (c) 2020 Kiwix <android.kiwix.org>
+  ~ This program 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.
+  ~
+  ~ This program 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/>.
+  ~
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+  android:opacity="opaque">
+  <!-- The background color, preferably the same as your normal theme -->
+  <item android:drawable="@color/mine_shaft_gray900" />
+  <item
+    android:bottom="24dp"
+    android:drawable="@mipmap/ic_launcher"
+    android:gravity="center"
+    android:left="24dp"
+    android:right="24dp"
+    android:top="24dp" />
+</layer-list>
diff --git a/custom/src/main/res/drawable/launch_screen.xml b/custom/src/main/res/drawable/launch_screen.xml
new file mode 100644
index 000000000..e4495189c
--- /dev/null
+++ b/custom/src/main/res/drawable/launch_screen.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Kiwix Android
+  ~ Copyright (c) 2020 Kiwix <android.kiwix.org>
+  ~ This program 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.
+  ~
+  ~ This program 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/>.
+  ~
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+  android:opacity="opaque">
+  <!-- The background color, preferably the same as your normal theme -->
+  <item android:drawable="@color/alabaster_white" />
+  <item
+    android:bottom="24dp"
+    android:drawable="@mipmap/ic_launcher"
+    android:gravity="center"
+    android:left="24dp"
+    android:right="24dp"
+    android:top="24dp" />
+</layer-list>
diff --git a/custom/src/main/res/values/themes.xml b/custom/src/main/res/values/themes.xml
new file mode 100644
index 000000000..3773f808c
--- /dev/null
+++ b/custom/src/main/res/values/themes.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Kiwix Android
+  ~ Copyright (c) 2020 Kiwix <android.kiwix.org>
+  ~ This program 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.
+  ~
+  ~ This program 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="KiwixTheme.Launcher">
+    <item name="android:windowBackground">@drawable/launch_screen</item>
+  </style>
+</resources>