Add settings button to launch screen

2 files changed, 20 insertions, 2 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt
index 7b2ebc4453..67043b6162 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt
@@ -17,9 +17,11 @@ import android.view.ViewGroup
 class LaunchFragment : Fragment() {
     private lateinit var accountTokenCheckJob: Deferred<Boolean>
     private lateinit var advanceToNextScreenJob: Job
+    private lateinit var parentActivity: MainActivity
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
+        parentActivity = context as MainActivity
         accountTokenCheckJob = checkForAccountToken()
         advanceToNextScreenJob = advanceToNextScreen()
     }
@@ -28,7 +30,15 @@ class LaunchFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ) = inflater.inflate(R.layout.launch, container, false)
+    ): View {
+        val view = inflater.inflate(R.layout.launch, container, false)
+
+        view.findViewById<View>(R.id.settings).setOnClickListener {
+            parentActivity.openSettings()
+        }
+
+        return view
+    }
 
     override fun onDestroy() {
         accountTokenCheckJob.cancel()
@@ -37,7 +47,6 @@ class LaunchFragment : Fragment() {
     }
 
     private fun checkForAccountToken() = GlobalScope.async(Dispatchers.Default) {
-        val parentActivity = activity as MainActivity
         val daemon = parentActivity.daemon.await()
         val settings = daemon.getSettings()
 
diff --git a/android/src/main/res/layout/launch.xml b/android/src/main/res/layout/launch.xml
index d8cf918727..195147161f 100644
--- a/android/src/main/res/layout/launch.xml
+++ b/android/src/main/res/layout/launch.xml
@@ -3,6 +3,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         >
+    <ImageButton android:id="@+id/settings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top | right"
+            android:paddingHorizontal="12dp"
+            android:paddingVertical="25dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:src="@drawable/icon_settings"
+            />
     <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"