Use new `ToggleCell` widget

4 files changed, 26 insertions, 86 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 {
diff --git a/android/src/main/res/layout/preferences.xml b/android/src/main/res/layout/preferences.xml
index 658d91572c..3456c22954 100644
--- a/android/src/main/res/layout/preferences.xml
+++ b/android/src/main/res/layout/preferences.xml
@@ -42,64 +42,18 @@
                           android:layout_marginLeft="24dp"
                           android:text="@string/settings_preferences"
                           style="@style/SettingsExpandedHeader" />
-                <LinearLayout android:id="@+id/auto_connect"
-                              android:layout_width="match_parent"
-                              android:layout_height="wrap_content"
-                              android:layout_marginTop="24dp"
-                              android:paddingHorizontal="16dp"
-                              android:background="@drawable/cell_button_background"
-                              android:gravity="center">
-                    <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/auto_connect" />
-                    <net.mullvad.mullvadvpn.ui.widget.CellSwitch android:id="@+id/auto_connect_toggle"
-                                                                 android:layout_width="52dp"
-                                                                 android:layout_height="32dp"
-                                                                 android:layout_weight="0" />
-                </LinearLayout>
-                <TextView android:id="@+id/auto_connect_footer"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:paddingTop="8dp"
-                          android:paddingHorizontal="24dp"
-                          android:textColor="@color/white60"
-                          android:textSize="13sp"
-                          android:text="@string/auto_connect_footer" />
-                <LinearLayout android:id="@+id/allow_lan"
-                              android:layout_width="match_parent"
-                              android:layout_height="wrap_content"
-                              android:layout_marginTop="24dp"
-                              android:paddingHorizontal="16dp"
-                              android:background="@drawable/cell_button_background"
-                              android:gravity="center">
-                    <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/local_network_sharing" />
-                    <net.mullvad.mullvadvpn.ui.widget.CellSwitch android:id="@+id/allow_lan_toggle"
-                                                                 android:layout_width="52dp"
-                                                                 android:layout_height="32dp"
-                                                                 android:layout_weight="0" />
-                </LinearLayout>
-                <TextView android:id="@+id/allow_lan_footer"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:paddingTop="8dp"
-                          android:paddingHorizontal="24dp"
-                          android:textColor="@color/white60"
-                          android:textSize="13sp"
-                          android:text="@string/allow_lan_footer" />
+                <net.mullvad.mullvadvpn.ui.widget.ToggleCell android:id="@+id/auto_connect"
+                                                             android:layout_width="match_parent"
+                                                             android:layout_height="wrap_content"
+                                                             android:layout_marginTop="24dp"
+                                                             mullvad:text="@string/auto_connect"
+                                                             mullvad:footer="@string/auto_connect_footer" />
+                <net.mullvad.mullvadvpn.ui.widget.ToggleCell android:id="@+id/allow_lan"
+                                                             android:layout_width="match_parent"
+                                                             android:layout_height="wrap_content"
+                                                             android:layout_marginTop="24dp"
+                                                             mullvad:text="@string/local_network_sharing"
+                                                             mullvad:footer="@string/allow_lan_footer" />
             </LinearLayout>
         </net.mullvad.mullvadvpn.ui.widget.ListenableScrollView>
     </LinearLayout>
diff --git a/android/src/main/res/layout/split_tunnelling_header.xml b/android/src/main/res/layout/split_tunnelling_header.xml
index 8374bdb12b..f15f573651 100644
--- a/android/src/main/res/layout/split_tunnelling_header.xml
+++ b/android/src/main/res/layout/split_tunnelling_header.xml
@@ -1,4 +1,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:mullvad="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:orientation="vertical"
@@ -19,28 +20,11 @@
               android:text="@string/split_tunnelling_description"
               android:textColor="@color/white60"
               android:textSize="13sp" />
-    <LinearLayout android:id="@+id/enabled"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_marginTop="24dp"
-                  android:paddingHorizontal="16dp"
-                  android:background="@drawable/cell_button_background"
-                  android:gravity="center"
-                  android:clickable="true">
-        <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/enabled" />
-        <net.mullvad.mullvadvpn.ui.widget.CellSwitch android:id="@+id/enabled_toggle"
-                                                     android:layout_width="52dp"
-                                                     android:layout_height="32dp"
-                                                     android:layout_weight="0" />
-    </LinearLayout>
+    <net.mullvad.mullvadvpn.ui.widget.ToggleCell android:id="@+id/enabled"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="wrap_content"
+                                                 android:layout_marginTop="24dp"
+                                                 mullvad:text="@string/enabled" />
     <LinearLayout android:id="@+id/exclude_applications"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"