Add close button to Settings fragment

2 files changed, 21 insertions, 2 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
index e9ee40ee36..daaf0ad32e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
@@ -4,12 +4,22 @@ import android.content.Context
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageButton
 
 class SettingsFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ) = inflater.inflate(R.layout.settings, container, false)
+    ): View {
+        val view = inflater.inflate(R.layout.settings, container, false)
+
+        view.findViewById<ImageButton>(R.id.close).setOnClickListener {
+            activity?.onBackPressed()
+        }
+
+        return view
+    }
 }
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 5285c9b893..da8782caab 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -7,10 +7,19 @@
         android:gravity="left"
         android:elevation="1dp"
         >
+    <ImageButton android:id="@+id/close"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginBottom="12dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:src="@drawable/icon_close"
+            />
     <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="52dp"
+            android:layout_marginTop="4dp"
             android:layout_marginLeft="24dp"
             android:layout_marginBottom="24dp"
             android:textColor="@color/white"