diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-03 17:01:43 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-15 12:52:17 +0000 |
| commit | 984b5c3b790e514e64eace25ec2f929c568645e5 (patch) | |
| tree | 43253dae8035e336a3f4f1815b3c8f01505b45f5 /android/src | |
| parent | 6b0639640a083c5cb40edc6a7aee3b3da36108cb (diff) | |
| download | mullvadvpn-984b5c3b790e514e64eace25ec2f929c568645e5.tar.xz mullvadvpn-984b5c3b790e514e64eace25ec2f929c568645e5.zip | |
Toggle enabled switch when the cell is clicked
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt | 15 | ||||
| -rw-r--r-- | android/src/main/res/layout/split_tunnelling_header.xml | 3 |
2 files changed, 13 insertions, 5 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt index 4c5e1ef98f..e00bda1d5e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt @@ -41,6 +41,7 @@ class SplitTunnellingFragment : ServiceDependentFragment(OnNoService.GoToLaunchS } private lateinit var appListAdapter: AppListAdapter + private lateinit var enabledToggle: CellSwitch private lateinit var excludeApplicationsFadeOut: ObjectAnimator private lateinit var loadingSpinnerFadeIn: ObjectAnimator private lateinit var titleController: CollapsibleTitleController @@ -103,12 +104,18 @@ class SplitTunnellingFragment : ServiceDependentFragment(OnNoService.GoToLaunchS setDuration(200) } - header.findViewById<CellSwitch>(R.id.enabled_toggle).listener = { toggleState -> - when (toggleState) { - CellSwitch.State.ON -> enable() - CellSwitch.State.OFF -> disable() + enabledToggle = header.findViewById<CellSwitch>(R.id.enabled_toggle).apply { + listener = { toggleState -> + when (toggleState) { + CellSwitch.State.ON -> enable() + CellSwitch.State.OFF -> disable() + } } } + + header.findViewById<View>(R.id.enabled).setOnClickListener { + enabledToggle.toggle() + } } private fun enable() { diff --git a/android/src/main/res/layout/split_tunnelling_header.xml b/android/src/main/res/layout/split_tunnelling_header.xml index e6805329e3..4db5c6fc80 100644 --- a/android/src/main/res/layout/split_tunnelling_header.xml +++ b/android/src/main/res/layout/split_tunnelling_header.xml @@ -27,7 +27,8 @@ android:layout_marginTop="24dp" android:paddingHorizontal="16dp" android:background="@drawable/cell_button_background" - android:gravity="center"> + android:gravity="center" + android:clickable="true"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" |