Move `CellSwitch` to the `widget` package

7 files changed, 20 insertions, 18 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
index b2d726f25e..b623721000 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
@@ -9,7 +9,7 @@ import android.widget.TextView
 import kotlin.properties.Delegates.observable
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.service.SplitTunnelling
-import net.mullvad.mullvadvpn.ui.CellSwitch
+import net.mullvad.mullvadvpn.ui.widget.CellSwitch
 import net.mullvad.mullvadvpn.util.JobTracker
 
 class AppListItemHolder(
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 f996994e03..ae9d0f9fb5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.Settings
+import net.mullvad.mullvadvpn.ui.widget.CellSwitch
 
 class PreferencesFragment : ServiceDependentFragment(OnNoService.GoBack) {
     private lateinit var allowLanToggle: CellSwitch
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 dc905abdbf..0e7172779f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt
@@ -11,6 +11,7 @@ import android.view.View
 import android.view.ViewGroup
 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.util.AdapterWithHeader
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellSwitch.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CellSwitch.kt
index b01a73b3e3..dee5c59e49 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellSwitch.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/CellSwitch.kt
@@ -1,4 +1,4 @@
-package net.mullvad.mullvadvpn.ui
+package net.mullvad.mullvadvpn.ui.widget
 
 import android.animation.ValueAnimator
 import android.content.Context
diff --git a/android/src/main/res/layout/app_list_item.xml b/android/src/main/res/layout/app_list_item.xml
index 741f3220de..2b32a160ae 100644
--- a/android/src/main/res/layout/app_list_item.xml
+++ b/android/src/main/res/layout/app_list_item.xml
@@ -30,8 +30,8 @@
               android:textColor="@color/white"
               android:textSize="16sp"
               android:text="" />
-    <net.mullvad.mullvadvpn.ui.CellSwitch android:id="@+id/excluded"
-                                          android:layout_width="52dp"
-                                          android:layout_height="32dp"
-                                          android:layout_weight="0" />
+    <net.mullvad.mullvadvpn.ui.widget.CellSwitch android:id="@+id/excluded"
+                                                 android:layout_width="52dp"
+                                                 android:layout_height="32dp"
+                                                 android:layout_weight="0" />
 </LinearLayout>
diff --git a/android/src/main/res/layout/preferences.xml b/android/src/main/res/layout/preferences.xml
index 0f513be296..658d91572c 100644
--- a/android/src/main/res/layout/preferences.xml
+++ b/android/src/main/res/layout/preferences.xml
@@ -58,10 +58,10 @@
                               android:textSize="20sp"
                               android:textStyle="bold"
                               android:text="@string/auto_connect" />
-                    <net.mullvad.mullvadvpn.ui.CellSwitch android:id="@+id/auto_connect_toggle"
-                                                          android:layout_width="52dp"
-                                                          android:layout_height="32dp"
-                                                          android:layout_weight="0" />
+                    <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"
@@ -87,10 +87,10 @@
                               android:textSize="20sp"
                               android:textStyle="bold"
                               android:text="@string/local_network_sharing" />
-                    <net.mullvad.mullvadvpn.ui.CellSwitch android:id="@+id/allow_lan_toggle"
-                                                          android:layout_width="52dp"
-                                                          android:layout_height="32dp"
-                                                          android:layout_weight="0" />
+                    <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"
diff --git a/android/src/main/res/layout/split_tunnelling_header.xml b/android/src/main/res/layout/split_tunnelling_header.xml
index 3fa595f55f..8374bdb12b 100644
--- a/android/src/main/res/layout/split_tunnelling_header.xml
+++ b/android/src/main/res/layout/split_tunnelling_header.xml
@@ -36,10 +36,10 @@
                   android:textSize="20sp"
                   android:textStyle="bold"
                   android:text="@string/enabled" />
-        <net.mullvad.mullvadvpn.ui.CellSwitch android:id="@+id/enabled_toggle"
-                                              android:layout_width="52dp"
-                                              android:layout_height="32dp"
-                                              android:layout_weight="0" />
+        <net.mullvad.mullvadvpn.ui.widget.CellSwitch android:id="@+id/enabled_toggle"
+                                                     android:layout_width="52dp"
+                                                     android:layout_height="32dp"
+                                                     android:layout_weight="0" />
     </LinearLayout>
     <LinearLayout android:id="@+id/exclude_applications"
                   android:layout_width="match_parent"