From fbb1df93d4c81b83af0b70374abd0806d86bfa66 Mon Sep 17 00:00:00 2001
From: Janak Amarasena <janakamarasena@gmail.com>
Date: Sun, 1 Jul 2018 20:17:05 +0530
Subject: Renamed background images

---
 app/src/main/res/layout/f_drawer_main.xml | 2 +-
 app/src/main/res/layout/f_eip.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 54614f3f..7e89a769 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -20,7 +20,7 @@
             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"
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
-- 
cgit v1.2.3


From 95261cf5c78a6bd79284e1c81aea5a4883398017 Mon Sep 17 00:00:00 2001
From: Janak Amarasena <janakamarasena@gmail.com>
Date: Sun, 1 Jul 2018 20:26:00 +0530
Subject: Renamed mask to logo

---
 app/src/main/res/layout/f_drawer_main.xml     | 2 +-
 app/src/main/res/layout/v_provider_header.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 7e89a769..549b4b6a 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -26,7 +26,7 @@
             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/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml
index 6b08976c..d13f0186 100644
--- a/app/src/main/res/layout/v_provider_header.xml
+++ b/app/src/main/res/layout/v_provider_header.xml
@@ -7,7 +7,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"
-- 
cgit v1.2.3


From e4eceb400d73dd9060868e055a72ed25b290e9ec Mon Sep 17 00:00:00 2001
From: Janak Amarasena <janakamarasena@gmail.com>
Date: Sun, 8 Jul 2018 16:33:46 +0530
Subject: Added custom layout for donation popup

---
 .../main/res/layout/donation_reminder_dialog.xml   | 62 ++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 app/src/main/res/layout/donation_reminder_dialog.xml

(limited to 'app/src/main/res/layout')

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..6b523053
--- /dev/null
+++ b/app/src/main/res/layout/donation_reminder_dialog.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    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>
\ No newline at end of file
-- 
cgit v1.2.3


From 49a2d6f3c7d4afbd645f524c3be60f0f0ac13311 Mon Sep 17 00:00:00 2001
From: Janak Amarasena <janakamarasena@gmail.com>
Date: Mon, 16 Jul 2018 20:16:47 +0530
Subject: Minor update according to received feedback

---
 .../main/res/layout/donation_reminder_dialog.xml   | 110 +++++++++++----------
 1 file changed, 58 insertions(+), 52 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml
index 6b523053..ce29eeb8 100644
--- a/app/src/main/res/layout/donation_reminder_dialog.xml
+++ b/app/src/main/res/layout/donation_reminder_dialog.xml
@@ -1,62 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbars="none">
 
-    <TextView
-        android:id="@+id/tvTitle"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         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" />
+        android:orientation="vertical">
 
-    <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" />
+        <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" />
+        <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/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" />
+        <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>
\ No newline at end of file
+    </LinearLayout>
+</ScrollView>
-- 
cgit v1.2.3