Add Preferences menu entry to Settings screen

3 files changed, 35 insertions, 0 deletions

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 df68241819..448f0fcf8f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -24,6 +24,7 @@ class SettingsFragment : ServiceAwareFragment() {
     private lateinit var appVersionWarning: View
     private lateinit var appVersionLabel: TextView
     private lateinit var appVersionFooter: View
+    private lateinit var preferencesMenu: View
     private lateinit var remainingTimeLabel: RemainingTimeLabel
     private lateinit var wireguardKeysMenu: View
 
@@ -68,6 +69,9 @@ class SettingsFragment : ServiceAwareFragment() {
                 openSubFragment(AccountFragment())
             }
         }
+
+        preferencesMenu = view.findViewById<View>(R.id.preferences)
+
         wireguardKeysMenu = view.findViewById<View>(R.id.wireguard_keys).apply {
             setOnClickListener {
                 openSubFragment(WireguardKeyFragment())
@@ -164,6 +168,7 @@ class SettingsFragment : ServiceAwareFragment() {
         }
 
         accountMenu.visibility = visibility
+        preferencesMenu.visibility = visibility
         wireguardKeysMenu.visibility = visibility
     }
 
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml
index 75592d48cb..c36c9bb3e8 100644
--- a/android/src/main/res/layout/settings.xml
+++ b/android/src/main/res/layout/settings.xml
@@ -65,6 +65,35 @@
                 android:src="@drawable/icon_chevron"
                 />
     </LinearLayout>
+    <LinearLayout android:id="@+id/preferences"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="1dp"
+            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/settings_preferences"
+                />
+        <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/wireguard_keys"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index d019f68b17..f0d5ae8161 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -29,6 +29,7 @@
     <string name="settings_account">Account</string>
     <string name="less_than_a_day_left">less than a day left</string>
     <string name="out_of_time">Out of time</string>
+    <string name="settings_preferences">Preferences</string>
     <string name="app_version">App version</string>
     <string name="update_available_footer">Update available, download to remain safe.</string>
     <string name="report_a_problem">Report a problem</string>