Merge branch 'splash_sceen' into 'master'

implement splash screen - for now without progress bar animation

See merge request leap/bitmask_android!217

4 files changed, 28 insertions, 4 deletions

diff --git a/app/src/main/res/drawable/bitmask_text.png b/app/src/main/res/drawable/bitmask_text.png
new file mode 100644
index 00000000..9a13b150
--- /dev/null
+++ b/app/src/main/res/drawable/bitmask_text.png
diff --git a/app/src/main/res/drawable/footer_text_drawable.xml b/app/src/main/res/drawable/footer_text_drawable.xml
new file mode 100644
index 00000000..801746df
--- /dev/null
+++ b/app/src/main/res/drawable/footer_text_drawable.xml
@@ -0,0 +1,19 @@
+<?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"
+        >
+        <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
new file mode 100644
index 00000000..4881eb29
--- /dev/null
+++ b/app/src/main/res/drawable/leap_footer_en.png
diff --git a/app/src/main/res/drawable/splash_page.xml b/app/src/main/res/drawable/splash_page.xml
index 1740da58..92ae59ef 100644
--- a/app/src/main/res/drawable/splash_page.xml
+++ b/app/src/main/res/drawable/splash_page.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
- <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
  <item android:drawable="@drawable/ic_splash_background"
      android:gravity="fill_horizontal|fill_vertical"/>
 
- <item>
+ <item
+     android:top="@dimen/splash_text_top_padding"
+     >
   <bitmap
-      android:src="@drawable/logo"
-      android:gravity="center" />
+      android:src="@drawable/bitmask_text"
+      android:gravity="center_horizontal|top" />
  </item>
+ <item
+     android:drawable="@drawable/footer_text_drawable"
+     android:gravity="bottom|fill_horizontal" />
 
 </layer-list>
\ No newline at end of file