diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-23 16:50:31 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-28 13:52:59 +0000 |
| commit | aa9ef3810a37439a01e2d3ee2b024c70022fd221 (patch) | |
| tree | 644be2ca0069e60e188d11ce093cf323d4644ff4 /android/src/main/kotlin | |
| parent | ab771bdfb4752d2140e94071f381cdffb2160fe8 (diff) | |
| download | mullvadvpn-aa9ef3810a37439a01e2d3ee2b024c70022fd221.tar.xz mullvadvpn-aa9ef3810a37439a01e2d3ee2b024c70022fd221.zip | |
Use new `ToggleCell` widget
Diffstat (limited to 'android/src/main/kotlin')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt | 9 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt index ae9d0f9fb5..d090017501 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt @@ -7,10 +7,11 @@ import android.view.ViewGroup import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.model.Settings import net.mullvad.mullvadvpn.ui.widget.CellSwitch +import net.mullvad.mullvadvpn.ui.widget.ToggleCell class PreferencesFragment : ServiceDependentFragment(OnNoService.GoBack) { - private lateinit var allowLanToggle: CellSwitch - private lateinit var autoConnectToggle: CellSwitch + private lateinit var allowLanToggle: ToggleCell + private lateinit var autoConnectToggle: ToggleCell private lateinit var titleController: CollapsibleTitleController override fun onSafelyCreateView( @@ -24,7 +25,7 @@ class PreferencesFragment : ServiceDependentFragment(OnNoService.GoBack) { parentActivity.onBackPressed() } - allowLanToggle = view.findViewById<CellSwitch>(R.id.allow_lan_toggle).apply { + allowLanToggle = view.findViewById<ToggleCell>(R.id.allow_lan).apply { forcefullySetState(boolToSwitchState(settingsListener.settings.allowLan)) listener = { state -> @@ -35,7 +36,7 @@ class PreferencesFragment : ServiceDependentFragment(OnNoService.GoBack) { } } - autoConnectToggle = view.findViewById<CellSwitch>(R.id.auto_connect_toggle).apply { + autoConnectToggle = view.findViewById<ToggleCell>(R.id.auto_connect).apply { forcefullySetState(boolToSwitchState(settingsListener.settings.autoConnect)) listener = { state -> 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 0e7172779f..9bce3cb620 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt @@ -13,6 +13,7 @@ import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.applist.AppListAdapter import net.mullvad.mullvadvpn.ui.widget.CellSwitch import net.mullvad.mullvadvpn.ui.widget.CustomRecyclerView +import net.mullvad.mullvadvpn.ui.widget.ToggleCell import net.mullvad.mullvadvpn.util.AdapterWithHeader class SplitTunnellingFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { @@ -42,7 +43,7 @@ class SplitTunnellingFragment : ServiceDependentFragment(OnNoService.GoToLaunchS } private lateinit var appListAdapter: AppListAdapter - private lateinit var enabledToggle: CellSwitch + private lateinit var enabledToggle: ToggleCell private lateinit var excludeApplicationsFadeOut: ObjectAnimator private lateinit var loadingSpinnerFadeIn: ObjectAnimator private lateinit var titleController: CollapsibleTitleController @@ -118,7 +119,7 @@ class SplitTunnellingFragment : ServiceDependentFragment(OnNoService.GoToLaunchS } } - enabledToggle = header.findViewById<CellSwitch>(R.id.enabled_toggle).apply { + enabledToggle = header.findViewById<ToggleCell>(R.id.enabled).apply { if (splitTunnelling.enabled) { forcefullySetState(CellSwitch.State.ON) } else { |