diff options
| author | saber safavi <saber.safavi@codic.se> | 2023-05-17 10:05:06 +0200 |
|---|---|---|
| committer | saber safavi <saber.safavi@codic.se> | 2023-05-17 11:29:37 +0200 |
| commit | 00dbe8d0ef4e1b4c19ddf10770e0adb1fe008aad (patch) | |
| tree | 95725e2174ff61c839cb603d3ee629aabe8ce3b5 /android/app | |
| parent | 705dcd35c61297dfcca20a7dc9e71708c6bc82b7 (diff) | |
| download | mullvadvpn-00dbe8d0ef4e1b4c19ddf10770e0adb1fe008aad.tar.xz mullvadvpn-00dbe8d0ef4e1b4c19ddf10770e0adb1fe008aad.zip | |
Add split tunneling menu to the setting fragment
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt | 7 | ||||
| -rw-r--r-- | android/app/src/main/res/layout/settings.xml | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt index db1f41e5ad..8db85de50d 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt @@ -48,6 +48,7 @@ class SettingsFragment : BaseFragment(), StatusBarPainter, NavigationBarPainter private lateinit var accountMenu: AccountCell private lateinit var appVersionMenu: AppVersionCell private lateinit var vpnSettingsMenu: View + private lateinit var splitTunnelingMenu: View private lateinit var titleController: CollapsibleTitleController @Deprecated("Refactor code to instead rely on Lifecycle.") private val jobTracker = JobTracker() @@ -76,6 +77,11 @@ class SettingsFragment : BaseFragment(), StatusBarPainter, NavigationBarPainter targetFragment = VpnSettingsFragment::class } + splitTunnelingMenu = + view.findViewById<NavigateCell>(R.id.split_tunneling).apply { + targetFragment = SplitTunnelingFragment::class + } + view.findViewById<NavigateCell>(R.id.report_a_problem).apply { targetFragment = ProblemReportFragment::class } @@ -180,6 +186,7 @@ class SettingsFragment : BaseFragment(), StatusBarPainter, NavigationBarPainter accountMenu.visibility = visibility vpnSettingsMenu.visibility = visibility + splitTunnelingMenu.visibility = visibility } private fun updateVersionInfo(versionInfo: VersionInfo) { diff --git a/android/app/src/main/res/layout/settings.xml b/android/app/src/main/res/layout/settings.xml index c37c44e8af..0bd735a887 100644 --- a/android/app/src/main/res/layout/settings.xml +++ b/android/app/src/main/res/layout/settings.xml @@ -53,6 +53,11 @@ android:layout_height="wrap_content" android:layout_marginTop="1dp" mullvad:text="@string/settings_vpn" /> + <net.mullvad.mullvadvpn.ui.widget.NavigateCell android:id="@+id/split_tunneling" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/vertical_space" + mullvad:text="@string/split_tunneling" /> <net.mullvad.mullvadvpn.ui.widget.AppVersionCell android:id="@+id/app_version" android:layout_width="match_parent" android:layout_height="wrap_content" |