Move `WireGuard key` option into `Advanced` screen

5 files changed, 47 insertions, 33 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
index ec39ee2100..1921546951 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -1,6 +1,7 @@
 package net.mullvad.mullvadvpn.ui
 
 import android.os.Bundle
+import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +18,7 @@ private const val MAX_MTU_VALUE = 1420
 
 class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
     private lateinit var wireguardMtuInput: CellInput
+    private lateinit var wireguardKeysMenu: View
 
     private var subscriptionId: Int? = null
     private var updateUiJob: Job? = null
@@ -45,6 +47,12 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
             text = context.getString(R.string.wireguard_mtu_footer, MIN_MTU_VALUE, MAX_MTU_VALUE)
         }
 
+        wireguardKeysMenu = view.findViewById<View>(R.id.wireguard_keys).apply {
+            setOnClickListener {
+                openSubFragment(WireguardKeyFragment())
+            }
+        }
+
         settingsListener.subscribe({ settings -> updateUi(settings) })
 
         return view
@@ -63,4 +71,18 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) {
         subscriptionId?.let { id -> settingsListener.unsubscribe(id) }
         updateUiJob?.cancel()
     }
+
+    private fun openSubFragment(fragment: Fragment) {
+        fragmentManager?.beginTransaction()?.apply {
+            setCustomAnimations(
+                R.anim.fragment_enter_from_right,
+                R.anim.fragment_half_exit_to_left,
+                R.anim.fragment_half_enter_from_left,
+                R.anim.fragment_exit_to_right
+            )
+            replace(R.id.main_fragment, fragment)
+            addToBackStack(null)
+            commit()
+        }
+    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index 8b9a30bd32..55f8b24c89 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -27,7 +27,6 @@ class SettingsFragment : ServiceAwareFragment() {
     private lateinit var preferencesMenu: View
     private lateinit var advancedMenu: View
     private lateinit var remainingTimeLabel: RemainingTimeLabel
-    private lateinit var wireguardKeysMenu: View
 
     private var active = false
 
@@ -83,15 +82,10 @@ class SettingsFragment : ServiceAwareFragment() {
             }
         }
 
-        wireguardKeysMenu = view.findViewById<View>(R.id.wireguard_keys).apply {
-            setOnClickListener {
-                openSubFragment(WireguardKeyFragment())
-            }
-        }
-
         view.findViewById<View>(R.id.app_version).setOnClickListener {
             openLink(R.string.download_url)
         }
+
         view.findViewById<View>(R.id.report_a_problem).setOnClickListener {
             openSubFragment(ProblemReportFragment())
         }
@@ -181,7 +175,6 @@ class SettingsFragment : ServiceAwareFragment() {
         accountMenu.visibility = visibility
         preferencesMenu.visibility = visibility
         advancedMenu.visibility = visibility
-        wireguardKeysMenu.visibility = visibility
     }
 
     private fun updateVersionInfo() = GlobalScope.launch(Dispatchers.Main) {
diff --git a/android/src/main/res/layout/advanced.xml b/android/src/main/res/layout/advanced.xml
index 966200fee1..e6a029ae74 100644
--- a/android/src/main/res/layout/advanced.xml
+++ b/android/src/main/res/layout/advanced.xml
@@ -73,4 +73,27 @@
               android:paddingHorizontal="24dp"
               android:textColor="@color/white60"
               android:textSize="13sp" />
+    <LinearLayout android:id="@+id/wireguard_keys"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_marginTop="24dp"
+                  android:paddingHorizontal="16dp"
+                  android:background="@drawable/cell_button_background"
+                  android:clickable="true"
+                  android:gravity="center">
+        <TextView android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"
+                  android:paddingHorizontal="8dp"
+                  android:paddingVertical="17dp"
+                  android:textColor="@color/white"
+                  android:textSize="20sp"
+                  android:textStyle="bold"
+                  android:text="@string/wireguard_key" />
+        <ImageView android:layout_width="14dp"
+                   android:layout_height="24dp"
+                   android:layout_weight="0"
+                   android:alpha="0.6"
+                   android:src="@drawable/icon_chevron" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 5909f54faa..a516111dc5 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -108,30 +108,6 @@
                            android:alpha="0.6"
                            android:src="@drawable/icon_chevron" />
             </LinearLayout>
-            <LinearLayout android:id="@+id/wireguard_keys"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:layout_marginTop="24dp"
-                          android:paddingHorizontal="16dp"
-                          android:background="@drawable/cell_button_background"
-                          android:clickable="true"
-                          android:gravity="center"
-                          android:visibility="gone">
-                <TextView android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:layout_weight="1"
-                          android:paddingHorizontal="8dp"
-                          android:paddingVertical="17dp"
-                          android:textColor="@color/white"
-                          android:textSize="20sp"
-                          android:textStyle="bold"
-                          android:text="@string/wireguard_key" />
-                <ImageView android:layout_width="14dp"
-                           android:layout_height="24dp"
-                           android:layout_weight="0"
-                           android:alpha="0.6"
-                           android:src="@drawable/icon_chevron" />
-            </LinearLayout>
             <LinearLayout android:id="@+id/app_version"
                           android:layout_width="match_parent"
                           android:layout_height="wrap_content"
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml
index a16cee6231..297e9f9f36 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/src/main/res/layout/wireguard_key.xml
@@ -23,7 +23,7 @@
                   android:textColor="@color/white60"
                   android:textSize="13sp"
                   android:textStyle="bold"
-                  android:text="@string/settings" />
+                  android:text="@string/settings_advanced" />
     </LinearLayout>
     <TextView android:layout_width="wrap_content"
               android:layout_height="wrap_content"