From 4a985aac98ecb39150de346f5ee0976f72af85bf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 28 Jun 2023 15:07:25 +0200
Subject: [PATCH] Splash theme: remove icon

---
 app/src/main/res/drawable/splash_icon.xml |  8 --------
 app/src/main/res/drawable/transparent.xml | 20 ++++++++++++++++++++
 app/src/main/res/values-night/themes.xml  |  4 ++--
 app/src/main/res/values/colors.xml        | 14 +++++---------
 app/src/main/res/values/themes.xml        |  6 +++---
 5 files changed, 30 insertions(+), 22 deletions(-)
 delete mode 100644 app/src/main/res/drawable/splash_icon.xml
 create mode 100644 app/src/main/res/drawable/transparent.xml

diff --git a/app/src/main/res/drawable/splash_icon.xml b/app/src/main/res/drawable/splash_icon.xml
deleted file mode 100644
index 9b852a657f..0000000000
--- a/app/src/main/res/drawable/splash_icon.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@mipmap/ic_launcher_round"
-    android:insetTop="80dp"
-    android:insetRight="80dp"
-    android:insetBottom="80dp"
-    android:insetLeft="80dp" />
diff --git a/app/src/main/res/drawable/transparent.xml b/app/src/main/res/drawable/transparent.xml
new file mode 100644
index 0000000000..b7e6de414f
--- /dev/null
+++ b/app/src/main/res/drawable/transparent.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2023 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#00000000" />
+
+</shape>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e2b4f6f471..a6572451d7 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -17,8 +17,8 @@
 <resources>
 
     <style name="Theme.ElementX.Splash" parent="Theme.SplashScreen">
-        <item name="windowSplashScreenBackground">@color/black</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
+        <item name="windowSplashScreenBackground">@color/splashscreen_bg_dark</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/transparent</item>
         <item name="postSplashScreenTheme">@style/Theme.ElementX</item>
     </style>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bd16b87387..1716e39012 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2022 New Vector Ltd
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,11 +15,8 @@
   -->
 
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
+    <!-- Must be equal to DarkDesignTokens.colorThemeBg -->
+    <color name="splashscreen_bg_dark">#FF101317</color>
+    <!-- Must be equal to LightDesignTokens.colorThemeBg -->
+    <color name="splashscreen_bg_light">#FFFFFFFF</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bee89fe01d..530821a92b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -16,9 +16,9 @@
   -->
 
 <resources>
-    <style name="Theme.ElementX.Splash" parent="Theme.SplashScreen.IconBackground">
-        <item name="windowSplashScreenBackground">@color/white</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
+    <style name="Theme.ElementX.Splash" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/splashscreen_bg_light</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/transparent</item>
         <item name="postSplashScreenTheme">@style/Theme.ElementX</item>
     </style>
     <style name="Theme.ElementX" parent="Theme.Material3.Light" />