Migrate info dialogs to destinations

mullvad · Nov 10, 2023 · 9d72e87 · 9d72e87
1 parent 99a3672
commit 9d72e87
Show file tree

Hide file tree

Showing 23 changed files with 243 additions and 212 deletions.
diff --git a/...app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/...app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
@@ -33,6 +33,7 @@ import net.mullvad.mullvadvpn.model.QuantumResistantState
 import net.mullvad.mullvadvpn.onNodeWithTagAndText
 import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
 import net.mullvad.mullvadvpn.viewmodel.StagedDns
+import net.mullvad.mullvadvpn.viewmodel.VpnSettingsSideEffect
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -51,7 +52,7 @@ class VpnSettingsScreenTest {
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -74,7 +75,7 @@ class VpnSettingsScreenTest {
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(mtu = VALID_DUMMY_MTU_VALUE),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -94,7 +95,7 @@ class VpnSettingsScreenTest {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(),
                 onMtuCellClick = mockedClickHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -118,7 +119,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         dialog = VpnSettingsDialog.Mtu(mtuEditValue = EMPTY_STRING),
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -135,7 +136,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         dialog = VpnSettingsDialog.Mtu(mtuEditValue = VALID_DUMMY_MTU_VALUE)
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -152,7 +153,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         dialog = VpnSettingsDialog.Mtu(mtuEditValue = EMPTY_STRING)
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -174,7 +175,7 @@ class VpnSettingsScreenTest {
                         dialog = VpnSettingsDialog.Mtu(mtuEditValue = VALID_DUMMY_MTU_VALUE)
                     ),
                 onSaveMtuClick = mockedSubmitHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -194,7 +195,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         dialog = VpnSettingsDialog.Mtu(mtuEditValue = INVALID_DUMMY_MTU_VALUE)
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -213,7 +214,7 @@ class VpnSettingsScreenTest {
                         dialog = VpnSettingsDialog.Mtu(mtuEditValue = EMPTY_STRING)
                     ),
                 onRestoreMtuClick = mockedClickHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -235,7 +236,7 @@ class VpnSettingsScreenTest {
                         dialog = VpnSettingsDialog.Mtu(mtuEditValue = EMPTY_STRING)
                     ),
                 onCancelMtuDialogClick = mockedClickHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -262,7 +263,7 @@ class VpnSettingsScreenTest {
                                 CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false)
                             )
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -285,7 +286,7 @@ class VpnSettingsScreenTest {
                         isCustomDnsEnabled = false,
                         customDnsItems = listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
         composeTestRule
@@ -308,7 +309,7 @@ class VpnSettingsScreenTest {
                         customDnsItems =
                             listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -328,7 +329,7 @@ class VpnSettingsScreenTest {
                         customDnsItems =
                             listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -348,7 +349,7 @@ class VpnSettingsScreenTest {
                         customDnsItems =
                             listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -368,7 +369,7 @@ class VpnSettingsScreenTest {
                         customDnsItems =
                             listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -386,7 +387,7 @@ class VpnSettingsScreenTest {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(isCustomDnsEnabled = true),
                 onDnsClick = mockedClickHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -412,7 +413,7 @@ class VpnSettingsScreenTest {
                                     ),
                             )
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -436,7 +437,7 @@ class VpnSettingsScreenTest {
                                     )
                             )
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -461,7 +462,7 @@ class VpnSettingsScreenTest {
                             ),
                         isAllowLanEnabled = false
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -486,7 +487,7 @@ class VpnSettingsScreenTest {
                             ),
                         isAllowLanEnabled = true
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -511,7 +512,7 @@ class VpnSettingsScreenTest {
                             ),
                         isAllowLanEnabled = true
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -536,7 +537,7 @@ class VpnSettingsScreenTest {
                             ),
                         isAllowLanEnabled = false
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -560,7 +561,7 @@ class VpnSettingsScreenTest {
                                     )
                             )
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -585,7 +586,7 @@ class VpnSettingsScreenTest {
                                     )
                             ),
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -600,7 +601,7 @@ class VpnSettingsScreenTest {
             VpnSettingsScreen(
                 uiState =
                     VpnSettingsUiState.createDefault(quantumResistant = QuantumResistantState.On),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
         composeTestRule
@@ -625,7 +626,7 @@ class VpnSettingsScreenTest {
                         quantumResistant = QuantumResistantState.Auto,
                     ),
                 onSelectQuantumResistanceSetting = mockSelectQuantumResistantSettingListener,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
         composeTestRule
@@ -650,7 +651,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         dialog = VpnSettingsDialog.QuantumResistanceInfo
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -667,7 +668,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         selectedWireguardPort = Constraint.Only(Port(53))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -699,7 +700,7 @@ class VpnSettingsScreenTest {
                         selectedWireguardPort = Constraint.Only(Port(53))
                     ),
                 onWireguardPortSelected = mockSelectWireguardPortSelectionListener,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -734,7 +735,7 @@ class VpnSettingsScreenTest {
                                 availablePortRanges = listOf(PortRange(53, 53), PortRange(120, 121))
                             )
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -758,7 +759,7 @@ class VpnSettingsScreenTest {
                                 availablePortRanges = listOf(PortRange(53, 53), PortRange(120, 121))
                             )
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -775,7 +776,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         selectedWireguardPort = Constraint.Only(Port(4000))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -796,7 +797,7 @@ class VpnSettingsScreenTest {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(),
                 onShowCustomPortDialog = mockOnShowCustomPortDialog,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -821,7 +822,7 @@ class VpnSettingsScreenTest {
                         selectedWireguardPort = Constraint.Only(Port(4000))
                     ),
                 onShowCustomPortDialog = mockOnShowCustomPortDialog,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -848,7 +849,7 @@ class VpnSettingsScreenTest {
                         selectedWireguardPort = Constraint.Only(Port(4000))
                     ),
                 onWireguardPortSelected = onWireguardPortSelected,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -879,7 +880,7 @@ class VpnSettingsScreenTest {
                                 availablePortRanges = listOf(PortRange(53, 53), PortRange(120, 121))
                             )
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt
@@ -42,9 +42,7 @@ fun Changelog(navController: NavController) {
         return
     }
 
-    if (changeLog != null) {
-        ChangelogDialog(changeLog, onDismiss)
-    }
+    ChangelogDialog(changeLog, onDismiss)
 }
 
 @Composable

diff --git a/...id/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt b/...id/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
@@ -2,11 +2,17 @@ package net.mullvad.mullvadvpn.compose.dialog
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.component.textResource
 
+@Destination(
+    style = DestinationStyle.Dialog::class
+)
 @Composable
-fun ContentBlockersInfoDialog(onDismiss: () -> Unit) {
+fun ContentBlockersInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message =
             buildString {
@@ -20,6 +26,6 @@ fun ContentBlockersInfoDialog(onDismiss: () -> Unit) {
                     stringResource(id = R.string.settings_changes_effect_warning_content_blocker)
                 )
             },
-        onDismiss = onDismiss
+        onDismiss = navigator::navigateUp
     )
 }