diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-19 01:58:02 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-30 16:46:26 +0000 |
| commit | 8ca152164e19cfd4d8389d9a69a17b9fe5d5e30c (patch) | |
| tree | 6c33de2506a2530513a5aa6d196947b5dbefa0b3 /android/src/main | |
| parent | 0f09b3ea7e56382772508a717c1bca3422a9fd52 (diff) | |
| download | mullvadvpn-8ca152164e19cfd4d8389d9a69a17b9fe5d5e30c.tar.xz mullvadvpn-8ca152164e19cfd4d8389d9a69a17b9fe5d5e30c.zip | |
Create menu entry for the Advanced settings screen
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/settings.xml | 24 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 1 |
3 files changed, 29 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 154339b10a..8e1183389f 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt @@ -25,6 +25,7 @@ class SettingsFragment : ServiceAwareFragment() { private lateinit var appVersionLabel: TextView private lateinit var appVersionFooter: View private lateinit var preferencesMenu: View + private lateinit var advancedMenu: View private lateinit var remainingTimeLabel: RemainingTimeLabel private lateinit var wireguardKeysMenu: View @@ -76,6 +77,8 @@ class SettingsFragment : ServiceAwareFragment() { } } + advancedMenu = view.findViewById<View>(R.id.advanced) + wireguardKeysMenu = view.findViewById<View>(R.id.wireguard_keys).apply { setOnClickListener { openSubFragment(WireguardKeyFragment()) @@ -173,6 +176,7 @@ class SettingsFragment : ServiceAwareFragment() { accountMenu.visibility = visibility preferencesMenu.visibility = visibility + advancedMenu.visibility = visibility wireguardKeysMenu.visibility = visibility } diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml index 52fbc1e27b..5909f54faa 100644 --- a/android/src/main/res/layout/settings.xml +++ b/android/src/main/res/layout/settings.xml @@ -84,6 +84,30 @@ android:alpha="0.6" android:src="@drawable/icon_chevron" /> </LinearLayout> + <LinearLayout android:id="@+id/advanced" + 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_advanced" /> + <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 93fc45ad30..c1320d0e9d 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -35,6 +35,7 @@ left</string> <string name="out_of_time">Out of time</string> <string name="settings_preferences">Preferences</string> + <string name="settings_advanced">Advanced</string> <string name="app_version">App version</string> <string name="update_available_footer">Update available, download to remain safe.</string> |