Add Quit button to Settings fragment

6 files changed, 35 insertions, 0 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
index daaf0ad32e..a958978daa 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
@@ -6,6 +6,7 @@ import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.ImageButton
 
 class SettingsFragment : Fragment() {
@@ -20,6 +21,10 @@ class SettingsFragment : Fragment() {
             activity?.onBackPressed()
         }
 
+        view.findViewById<Button>(R.id.quit_button).setOnClickListener {
+            activity?.finishAndRemoveTask()
+        }
+
         return view
     }
 }
diff --git a/android/src/main/res/drawable/red_button_background.xml b/android/src/main/res/drawable/red_button_background.xml
new file mode 100644
index 0000000000..ebfefe776b
--- /dev/null
+++ b/android/src/main/res/drawable/red_button_background.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="4dp"/>
+            <solid android:color="@color/red"/>
+        </shape>
+    </item>
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="4dp"/>
+            <solid android:color="@color/red95"/>
+        </shape>
+    </item>
+</selector>
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index da8782caab..0c98ad539e 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -27,4 +27,12 @@
             android:textStyle="bold"
             android:text="@string/settings"
             />
+    <Button android:id="@+id/quit_button"
+            android:layout_marginTop="24dp"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="24dp"
+            android:layout_marginBottom="24dp"
+            android:text="@string/quit"
+            style="@style/RedButton"
+            />
 </LinearLayout>
diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml
index 905f1e497c..7d2ef85101 100644
--- a/android/src/main/res/values/colors.xml
+++ b/android/src/main/res/values/colors.xml
@@ -11,6 +11,7 @@
     <color name="green">#44AD4D</color>
     <color name="green90">#E644AD4D</color>
     <color name="red">#D0021B</color>
+    <color name="red95">#C6021A</color>
     <color name="red45">#73021B</color>
     <color name="red40">#66021B</color>
 
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index 3e036a9bab..18dea4cd12 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="login_fail_description">Invalid account number, try again</string>
 
     <string name="settings">Settings</string>
+    <string name="quit">Quit</string>
 
     <string name="unsecured_connection">Unsecured connection</string>
     <string name="creating_secure_connection">Creating secure connection</string>
diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
index 86401714f7..43c29dc1bb 100644
--- a/android/src/main/res/values/styles.xml
+++ b/android/src/main/res/values/styles.xml
@@ -17,6 +17,10 @@
         <item name="android:background">@drawable/green_button_background</item>
     </style>
 
+    <style name="RedButton" parent="Button">
+        <item name="android:background">@drawable/red_button_background</item>
+    </style>
+
     <style name="White20Button" parent="Button">
         <item name="android:background">@drawable/white20_button_background</item>
     </style>