Merge branch 'splash_sceen' into 'master'

implement splash screen - for now without progress bar animation

See merge request leap/bitmask_android!217

18 files changed, 50 insertions, 4 deletions

diff --git a/app/src/main/res/drawable-hdpi/bitmask_text.png b/app/src/main/res/drawable-hdpi/bitmask_text.png
new file mode 100644
index 00000000..71c0d171
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/bitmask_text.png
diff --git a/app/src/main/res/drawable-hdpi/leap_footer_en.png b/app/src/main/res/drawable-hdpi/leap_footer_en.png
new file mode 100644
index 00000000..bce90e6a
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/leap_footer_en.png
diff --git a/app/src/main/res/drawable-xhdpi/bitmask_text.png b/app/src/main/res/drawable-xhdpi/bitmask_text.png
new file mode 100644
index 00000000..f0f8f238
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/bitmask_text.png
diff --git a/app/src/main/res/drawable-xhdpi/leap_footer_en.png b/app/src/main/res/drawable-xhdpi/leap_footer_en.png
new file mode 100644
index 00000000..80191c93
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/leap_footer_en.png
diff --git a/app/src/main/res/drawable-xxhdpi/bitmask_text.png b/app/src/main/res/drawable-xxhdpi/bitmask_text.png
new file mode 100644
index 00000000..411c2946
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/bitmask_text.png
diff --git a/app/src/main/res/drawable-xxhdpi/leap_footer_en.png b/app/src/main/res/drawable-xxhdpi/leap_footer_en.png
new file mode 100644
index 00000000..f7c573ca
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/leap_footer_en.png
diff --git a/app/src/main/res/drawable-xxxhdpi/bitmask_text.png b/app/src/main/res/drawable-xxxhdpi/bitmask_text.png
new file mode 100644
index 00000000..a73f4526
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/bitmask_text.png
diff --git a/app/src/main/res/drawable-xxxhdpi/leap_footer_en.png b/app/src/main/res/drawable-xxxhdpi/leap_footer_en.png
new file mode 100644
index 00000000..f4c20d56
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/leap_footer_en.png
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
diff --git a/app/src/main/res/values-port/dimens.xml b/app/src/main/res/values-port/dimens.xml
new file mode 100644
index 00000000..90b6b82b
--- /dev/null
+++ b/app/src/main/res/values-port/dimens.xml
@@ -0,0 +1,5 @@
+<?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
new file mode 100644
index 00000000..b6315052
--- /dev/null
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -0,0 +1,7 @@
+<?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 6dd93e3a..a046dac6 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -11,5 +11,8 @@
     <dimen name="stdpadding">16dp</dimen>
     <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>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index 94bd0ff2..b38b10a6 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -8,5 +8,8 @@
     <dimen name="compact_padding">6dp</dimen>
     <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>
 
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3adf6cf6..9ef6c3e0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,6 +10,9 @@
     <dimen name="standard_margin">8dp</dimen>
     <dimen name="mainbutton_padding">20dp</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/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab0744c4..92229e44 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -202,5 +202,6 @@
   <string name="advanced_settings">Advanced settings</string>
   <string name="cancel_connection">Disconnect</string>
   <string name="unknown_location">Unknown location</string>
+  <string name="splash_footer">Developed by LEAP</string>
 
 </resources>