Merge branch 'customisation_feature' into 'master'

Customisation Feature

See merge request leap/bitmask_android!78

4 files changed, 72 insertions, 4 deletions

diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml
new file mode 100644
index 00000000..ce29eeb8
--- /dev/null
+++ b/app/src/main/res/layout/donation_reminder_dialog.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbars="none">
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/standard_margin"
+            android:layout_marginTop="@dimen/add_button_margin"
+            android:gravity="center"
+            android:text="@string/donate_title"
+            android:textAllCaps="true"
+            android:textColor="@color/colorPrimary"
+            android:textSize="28sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tvMessage"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/standard_margin"
+            android:gravity="center"
+            android:text="@string/donate_message" />
+
+        <ImageView
+            android:id="@+id/ivImg"
+            android:layout_width="120dp"
+            android:layout_height="120dp"
+            android:layout_marginBottom="@dimen/add_button_margin"
+            android:layout_marginTop="@dimen/add_button_margin"
+            android:src="@drawable/donation_img" />
+
+        <Button
+            android:id="@+id/btnDonate"
+            android:layout_width="200dp"
+            android:layout_height="38dp"
+            android:layout_marginLeft="@dimen/add_button_margin"
+            android:layout_marginRight="@dimen/add_button_margin"
+            android:layout_marginTop="@dimen/standard_margin"
+            android:background="@drawable/cust_button_primary"
+            android:text="@string/donate_button_donate"
+            android:textColor="@color/white"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/btnLater"
+            android:layout_width="200dp"
+            android:layout_height="38dp"
+            android:layout_marginBottom="@dimen/mainbutton_padding"
+            android:layout_marginLeft="@dimen/add_button_margin"
+            android:layout_marginRight="@dimen/add_button_margin"
+            android:layout_marginTop="@dimen/standard_margin"
+            android:background="@drawable/cust_button_secondary"
+            android:text="@string/donate_button_remind_later"
+            android:textColor="@android:color/tab_indicator_text"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 54614f3f..549b4b6a 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -20,13 +20,13 @@
             android:adjustViewBounds="false"
             android:cropToPadding="false"
             android:scaleType="fitXY"
-            app:srcCompat="@drawable/ic_colorsquare" />
+            app:srcCompat="@drawable/background_drawer" />
 
         <android.support.v7.widget.AppCompatImageView
             android:id="@+id/mask"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/mask" />
+            app:srcCompat="@drawable/logo" />
     </FrameLayout>
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index e220bf16..ed4ec9c4 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -49,7 +49,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
-        app:srcCompat="@drawable/ic_colorsquare" />
+        app:srcCompat="@drawable/background_eip" />
 
 
     <android.support.v7.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml
index d089b205..823f3163 100644
--- a/app/src/main/res/layout/v_provider_header.xml
+++ b/app/src/main/res/layout/v_provider_header.xml
@@ -9,7 +9,7 @@
         android:layout_width="@dimen/bitmask_logo"
         android:layout_height="@dimen/bitmask_logo"
         android:adjustViewBounds="true"
-        app:srcCompat="@drawable/mask" />
+        app:srcCompat="@drawable/logo" />
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/provider_header_text"