Merge branch 'implement-split-tunneling-toggle-button-droid-458'

Author: Pururun

CHANGELOG.md

@@ -36,6 +36,7 @@ Line wrap the file at 100 chars.                                              Th
 
 #### Android
 - Add support for all screen orientations.
+- Add toggle for enabling or disabling split tunneling.
 
 ### Fixed
 - Fix connectivity issues that would occur when using quantum-resistant tunnels with an incorrectly

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt

@@ -34,7 +34,9 @@ class SplitTunnelingScreenTest {
     fun testLoadingState() =
         composeExtension.use {
             // Arrange
-            setContentWithTheme { SplitTunnelingScreen(uiState = SplitTunnelingUiState.Loading) }
+            setContentWithTheme {
+                SplitTunnelingScreen(uiState = SplitTunnelingUiState.Loading(enabled = true))
+            }
 
             // Assert
             onNodeWithText(TITLE).assertExists()
@@ -64,6 +66,7 @@ class SplitTunnelingScreenTest {
                 SplitTunnelingScreen(
                     uiState =
                         SplitTunnelingUiState.ShowAppList(
+                            enabled = true,
                             excludedApps = listOf(excludedApp),
                             includedApps = listOf(includedApp),
                             showSystemApps = false
@@ -95,6 +98,7 @@ class SplitTunnelingScreenTest {
                 SplitTunnelingScreen(
                     uiState =
                         SplitTunnelingUiState.ShowAppList(
+                            enabled = true,
                             excludedApps = emptyList(),
                             includedApps = listOf(includedApp),
                             showSystemApps = false
@@ -133,6 +137,7 @@ class SplitTunnelingScreenTest {
                 SplitTunnelingScreen(
                     uiState =
                         SplitTunnelingUiState.ShowAppList(
+                            enabled = true,
                             excludedApps = listOf(excludedApp),
                             includedApps = listOf(includedApp),
                             showSystemApps = false
@@ -169,6 +174,7 @@ class SplitTunnelingScreenTest {
                 SplitTunnelingScreen(
                     uiState =
                         SplitTunnelingUiState.ShowAppList(
+                            enabled = true,
                             excludedApps = listOf(excludedApp),
                             includedApps = listOf(includedApp),
                             showSystemApps = false
@@ -205,6 +211,7 @@ class SplitTunnelingScreenTest {
                 SplitTunnelingScreen(
                     uiState =
                         SplitTunnelingUiState.ShowAppList(
+                            enabled = true,
                             excludedApps = listOf(excludedApp),
                             includedApps = listOf(includedApp),
                             showSystemApps = false

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt

@@ -41,8 +41,18 @@ private fun PreviewTunnelingCell() {
             modifier =
                 Modifier.background(color = MaterialTheme.colorScheme.background).padding(20.dp)
         ) {
-            SplitTunnelingCell(title = "Mullvad VPN", packageName = "", isSelected = false)
-            SplitTunnelingCell(title = "Mullvad VPN", packageName = "", isSelected = true)
+            SplitTunnelingCell(
+                title = "Mullvad VPN",
+                packageName = "",
+                isSelected = false,
+                enabled = true
+            )
+            SplitTunnelingCell(
+                title = "Mullvad VPN",
+                packageName = "",
+                isSelected = true,
+                enabled = true
+            )
         }
     }
 }
@@ -52,6 +62,7 @@ fun SplitTunnelingCell(
     title: String,
     packageName: String?,
     isSelected: Boolean,
+    enabled: Boolean,
     modifier: Modifier = Modifier,
     backgroundColor: Color =
         MaterialTheme.colorScheme.primary
@@ -110,6 +121,7 @@ fun SplitTunnelingCell(
         },
         onCellClicked = onCellClicked,
         background = backgroundColor,
-        modifier = modifier
+        modifier = modifier,
+        isRowEnabled = enabled
     )
 }