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

---
 .../java/se/leap/bitmaskclient/EipFragment.java    |   3 -
 .../leap/bitmaskclient/utils/PreferenceHelper.java |   1 -
 .../main/res/layout/donation_reminder_dialog.xml   | 110 +++++++++++----------
 3 files changed, 58 insertions(+), 56 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index 61abd6ce..a168059f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -104,9 +104,6 @@ public class EipFragment extends Fragment implements Observer {
     private IOpenVPNServiceInternal mService;
     private ServiceConnection openVpnConnection;
 
-    private final String DATE_PATTERN = "dd/MM/yyyy";
-    private final int ONE_DAY = 86400000; //1000*60*60*24
-
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
index 5f739ce1..b1da1284 100644
--- a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
@@ -1,6 +1,5 @@
 package se.leap.bitmaskclient.utils;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Looper;
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