Merge branch 'first_run_improvements' into 'master'

update design and UX for provider setup

See merge request leap/bitmask_android!252

8 files changed, 4 insertions, 12 deletions

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