updated splash screen for Bitmask

21 files changed, 8 insertions, 55 deletions

diff --git a/app/src/main/res/drawable-hdpi/bitmask_text.png b/app/src/main/res/drawable-hdpi/bitmask_text.png
deleted file mode 100644
index 71c0d171..00000000
--- a/app/src/main/res/drawable-hdpi/bitmask_text.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xhdpi/bitmask_text.png b/app/src/main/res/drawable-xhdpi/bitmask_text.png
deleted file mode 100644
index f0f8f238..00000000
--- a/app/src/main/res/drawable-xhdpi/bitmask_text.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xxhdpi/bitmask_text.png b/app/src/main/res/drawable-xxhdpi/bitmask_text.png
deleted file mode 100644
index 411c2946..00000000
--- a/app/src/main/res/drawable-xxhdpi/bitmask_text.png
+++ /dev/null
diff --git a/app/src/main/res/drawable-xxxhdpi/bitmask_text.png b/app/src/main/res/drawable-xxxhdpi/bitmask_text.png
deleted file mode 100644
index a73f4526..00000000
--- a/app/src/main/res/drawable-xxxhdpi/bitmask_text.png
+++ /dev/null
diff --git a/app/src/main/res/drawable/bitmask_text.png b/app/src/main/res/drawable/bitmask_text.png
deleted file mode 100644
index 9a13b150..00000000
--- a/app/src/main/res/drawable/bitmask_text.png
+++ /dev/null
diff --git a/app/src/main/res/drawable/footer_text_drawable.xml b/app/src/main/res/drawable/footer_text_drawable.xml
deleted file mode 100644
index e3ec5005..00000000
--- a/app/src/main/res/drawable/footer_text_drawable.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:gravity="fill_horizontal">
-
-        <shape android:shape="rectangle"
-            xmlns:android="http://schemas.android.com/apk/res/android">
-            <solid android:color="@android:color/white"/>
-        </shape>
-    </item>
-    <item
-        android:gravity="center"
-        android:top="@dimen/footer_text_padding"
-        android:bottom="@dimen/footer_text_padding"
-        android:left="20dp"
-        android:right="20dp"
-        >
-        <bitmap android:src="@drawable/leap_footer_en"/>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/leap_footer_en.png b/app/src/main/res/drawable/leap_footer_en.png
deleted file mode 100644
index 4881eb29..00000000
--- a/app/src/main/res/drawable/leap_footer_en.png
+++ /dev/null
diff --git a/app/src/main/res/drawable/splash_page.xml b/app/src/main/res/drawable/splash_page.xml
index 92ae59ef..aafac0db 100644
--- a/app/src/main/res/drawable/splash_page.xml
+++ b/app/src/main/res/drawable/splash_page.xml
@@ -4,15 +4,9 @@
  <item android:drawable="@drawable/ic_splash_background"
      android:gravity="fill_horizontal|fill_vertical"/>
 
+
  <item
-     android:top="@dimen/splash_text_top_padding"
-     >
-  <bitmap
-      android:src="@drawable/bitmask_text"
-      android:gravity="center_horizontal|top" />
- </item>
- <item
-     android:drawable="@drawable/footer_text_drawable"
-     android:gravity="bottom|fill_horizontal" />
+     android:drawable="@drawable/splash_icon"
+     android:gravity="center" />
 
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values-port/dimens.xml b/app/src/main/res/values-port/dimens.xml
index 90b6b82b..55344e51 100644
--- a/app/src/main/res/values-port/dimens.xml
+++ b/app/src/main/res/values-port/dimens.xml
@@ -1,5 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="footer_text_padding">20dp</dimen>
-    <dimen name="splash_text_top_padding">120dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index b6315052..55344e51 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -1,7 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <dimen name="footer_text_padding">20dp</dimen>
-    <dimen name="splash_text_top_padding">240dp</dimen>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 4c726da5..db6e94ea 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -12,8 +12,6 @@
     <dimen name="compact_padding">6dp</dimen>
     <dimen name="button_radius">20dp</dimen>
     <!-- landscape dimens -->
-    <dimen name="footer_text_padding">20dp</dimen>
-    <dimen name="splash_text_top_padding">140dp</dimen>
     <dimen name="mainbutton_padding">32dp</dimen>
     <dimen name="donation_reminder_padding">24dp</dimen>
 
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index 822259ca..cfbfc6a6 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -9,8 +9,6 @@
     <dimen name="stdpadding">16dp</dimen>
     <dimen name="button_radius">20dp</dimen>
     <!-- landscape dimens -->
-    <dimen name="footer_text_padding">12dp</dimen>
-    <dimen name="splash_text_top_padding">90dp</dimen>
     <dimen name="mainbutton_padding">32dp</dimen>
     <dimen name="donation_reminder_padding">24dp</dimen>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f15fbcf9..991cd625 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,9 +9,7 @@
     <dimen name="compact_padding">3dp</dimen>
     <dimen name="standard_margin">8dp</dimen>
     <bool name="logSildersAlwaysVisible">false</bool>
-    <!-- landscape layout dimens -->
-    <dimen name="footer_text_padding">12dp</dimen>
-    <dimen name="splash_text_top_padding">80dp</dimen>
+
 
     <dimen name="diameter">48dp</dimen>
     <dimen name="elevation_low">1dp</dimen>
diff --git a/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml b/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml
index f882d322..79fe33ce 100644
--- a/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml
+++ b/app/src/normal/res/drawable-anydpi-v24/splash_icon.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/rotate_progress_image"
-        android:height="198dp"
-        android:width="198dp"
-        android:gravity="fill"/>
-    <item
-        android:gravity="center"
-        android:height="52.75dp"
-        android:width="80dp"
-        >
-        <bitmap android:src="@drawable/logo"/>
+    <item>
+        <bitmap android:src="@drawable/splash_logo"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable-hdpi/splash_logo.png b/app/src/normal/res/drawable-hdpi/splash_logo.png
new file mode 100644
index 00000000..2623103e
--- /dev/null
+++ b/app/src/normal/res/drawable-hdpi/splash_logo.png
diff --git a/app/src/normal/res/drawable-xhdpi/splash_logo.png b/app/src/normal/res/drawable-xhdpi/splash_logo.png
new file mode 100644
index 00000000..da8420b2
--- /dev/null
+++ b/app/src/normal/res/drawable-xhdpi/splash_logo.png
diff --git a/app/src/normal/res/drawable-xxhdpi/splash_logo.png b/app/src/normal/res/drawable-xxhdpi/splash_logo.png
new file mode 100644
index 00000000..d4a0d80f
--- /dev/null
+++ b/app/src/normal/res/drawable-xxhdpi/splash_logo.png
diff --git a/app/src/normal/res/drawable-xxxhdpi/splash_logo.png b/app/src/normal/res/drawable-xxxhdpi/splash_logo.png
new file mode 100644
index 00000000..c9d29394
--- /dev/null
+++ b/app/src/normal/res/drawable-xxxhdpi/splash_logo.png
diff --git a/app/src/normal/res/drawable/ic_splash_background.xml b/app/src/normal/res/drawable/ic_splash_background.xml
index aa2618c1..231d9333 100644
--- a/app/src/normal/res/drawable/ic_splash_background.xml
+++ b/app/src/normal/res/drawable/ic_splash_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/background_main"/>
+    <item><color android:color="@color/white"/></item>
 </selector>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/splash_branding.xml b/app/src/normal/res/drawable/splash_branding.xml
index 8c4ee21c..8f8e3e22 100644
--- a/app/src/normal/res/drawable/splash_branding.xml
+++ b/app/src/normal/res/drawable/splash_branding.xml
@@ -1,3 +1,3 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/footer_text_drawable" />
+    <!-- no splash screen branding image for bitmask -->
 </layer-list>
\ No newline at end of file
diff --git a/app/src/normal/res/drawable/splash_logo.png b/app/src/normal/res/drawable/splash_logo.png
new file mode 100644
index 00000000..2623103e
--- /dev/null
+++ b/app/src/normal/res/drawable/splash_logo.png