Refactor into new viewmodel

Author: Rawa

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

@@ -34,6 +34,7 @@ fun ServerIpOverridesCell(
     inactiveColor: Color = MaterialTheme.colorScheme.error,
 ) {
     BaseCell(
+        modifier = modifier,
         iconView = {
             Box(
                 modifier =
@@ -65,6 +66,7 @@ fun ServerIpOverridesCell(
                         )
                         .padding(horizontal = Dimens.smallPadding, vertical = Dimens.mediumPadding)
             )
-        }
+        },
+        isRowEnabled = false
     )
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ResetServerIpOverridesConfirmationDialog.kt

@@ -9,39 +9,49 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.ramcosta.composedestinations.annotation.Destination
-import com.ramcosta.composedestinations.result.EmptyResultBackNavigator
-import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
 import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.NegativeButton
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
+import net.mullvad.mullvadvpn.compose.util.CollectSideEffectWithLifecycle
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
+import net.mullvad.mullvadvpn.viewmodel.ResetServerIpOverridesConfirmationUiSideEffect
+import net.mullvad.mullvadvpn.viewmodel.ResetServerIpOverridesConfirmationViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
 private fun PreviewResetServerIpOverridesConfirmationDialog() {
-    AppTheme { ResetServerIpOverridesConfirmationDialog(EmptyResultBackNavigator()) }
+    AppTheme { ResetServerIpOverridesConfirmationDialog(EmptyDestinationsNavigator) }
 }
 
 @Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun ResetServerIpOverridesConfirmationDialog(
-    resultNavigator: ResultBackNavigator<Boolean>,
-) {
+fun ResetServerIpOverridesConfirmationDialog(navigator: DestinationsNavigator) {
+    val viewModel: ResetServerIpOverridesConfirmationViewModel = koinViewModel()
+    CollectSideEffectWithLifecycle(viewModel.uiSideEffect) {
+        when (it) {
+            ResetServerIpOverridesConfirmationUiSideEffect.OverridesCleared ->
+                navigator.navigateUp()
+        }
+    }
+
     AlertDialog(
         containerColor = MaterialTheme.colorScheme.background,
         confirmButton = {
             NegativeButton(
                 modifier = Modifier.fillMaxWidth(),
                 text = stringResource(id = R.string.server_ip_overrides_reset_reset_button),
-                onClick = { resultNavigator.navigateBack(result = true) }
+                onClick = viewModel::clearAllOverrides
             )
         },
         dismissButton = {
             PrimaryButton(
                 modifier = Modifier.fillMaxWidth(),
                 text = stringResource(R.string.cancel),
-                onClick = resultNavigator::navigateBack
+                onClick = navigator::navigateUp
             )
         },
         title = {
@@ -57,6 +67,6 @@ fun ResetServerIpOverridesConfirmationDialog(
                 style = MaterialTheme.typography.bodySmall,
             )
         },
-        onDismissRequest = resultNavigator::navigateBack
+        onDismissRequest = navigator::navigateUp
     )
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt

@@ -96,8 +96,6 @@ private fun PreviewServerIpOverridesScreen() {
 fun ServerIpOverrides(
     navigator: DestinationsNavigator,
     importByTextResult: ResultRecipient<ImportOverridesByTextDestination, String>,
-    clearAllOverrides:
-        ResultRecipient<ResetServerIpOverridesConfirmationDialogDestination, Boolean>,
 ) {
     val vm = koinViewModel<ServerIpOverridesViewModel>()
     val state by vm.uiState.collectAsStateWithLifecycle()
@@ -122,7 +120,6 @@ fun ServerIpOverrides(
     }
 
     importByTextResult.OnNavResultValue(vm::importText)
-    clearAllOverrides.OnNavResultValue { vm.clearAllOverrides() }
 
     val openFileLauncher =
         rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) {

android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt

@@ -61,6 +61,7 @@ import net.mullvad.mullvadvpn.viewmodel.OutOfTimeViewModel
 import net.mullvad.mullvadvpn.viewmodel.PaymentViewModel
 import net.mullvad.mullvadvpn.viewmodel.PrivacyDisclaimerViewModel
 import net.mullvad.mullvadvpn.viewmodel.ReportProblemViewModel
+import net.mullvad.mullvadvpn.viewmodel.ResetServerIpOverridesConfirmationViewModel
 import net.mullvad.mullvadvpn.viewmodel.SelectLocationViewModel
 import net.mullvad.mullvadvpn.viewmodel.ServerIpOverridesViewModel
 import net.mullvad.mullvadvpn.viewmodel.SettingsViewModel
@@ -183,6 +184,7 @@ val uiModule = module {
     viewModel { CustomListsViewModel(get(), get()) }
     viewModel { parameters -> DeleteCustomListConfirmationViewModel(parameters.get(), get()) }
     viewModel { ServerIpOverridesViewModel(get(), get(), get(), get()) }
+    viewModel { ResetServerIpOverridesConfirmationViewModel(get()) }
 
     // This view model must be single so we correctly attach lifecycle and share it with activity
     single { NoDaemonViewModel(get()) }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ResetServerIpOverridesConfirmationViewModel.kt

@@ -0,0 +1,25 @@
+package net.mullvad.mullvadvpn.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.launch
+import net.mullvad.mullvadvpn.repository.RelayOverridesRepository
+
+class ResetServerIpOverridesConfirmationViewModel(
+    private val relayOverridesRepository: RelayOverridesRepository,
+) : ViewModel() {
+    private val _uiSideEffect = Channel<ResetServerIpOverridesConfirmationUiSideEffect>()
+    val uiSideEffect = _uiSideEffect.receiveAsFlow()
+
+    fun clearAllOverrides() =
+        viewModelScope.launch {
+            relayOverridesRepository.clearAllOverrides()
+            _uiSideEffect.send(ResetServerIpOverridesConfirmationUiSideEffect.OverridesCleared)
+        }
+}
+
+sealed class ResetServerIpOverridesConfirmationUiSideEffect {
+    data object OverridesCleared : ResetServerIpOverridesConfirmationUiSideEffect()
+}

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ServerIpOverridesViewModel.kt

@@ -26,7 +26,7 @@ import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState
 class ServerIpOverridesViewModel(
     private val contentResolver: ContentResolver,
     private val serviceConnectionManager: ServiceConnectionManager,
-    private val relayOverridesRepository: RelayOverridesRepository,
+    relayOverridesRepository: RelayOverridesRepository,
     private val settingsRepository: SettingsRepository
 ) : ViewModel() {
 
@@ -71,12 +71,6 @@ class ServerIpOverridesViewModel(
         }
     }
 
-    fun clearAllOverrides() =
-        viewModelScope.launch {
-            relayOverridesRepository.clearAllOverrides()
-            _uiSideEffect.send(UiSideEffect.OverridesCleared)
-        }
-
     sealed interface UiSideEffect {
         data class ImportResult(val error: SettingsPatchError?) : UiSideEffect