More fixes

Pururun · Pururun · commit d68f342c44db · 2024-02-23T09:39:11.000+01:00
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt
@@ -34,15 +34,15 @@ private fun PreviewBaseCell() {
     AppTheme {
         SpacedColumn {
             BaseCell(
-                title = {
+                headlineContent = {
                     BaseCellTitle(
                         title = "Header title",
                         style = MaterialTheme.typography.titleMedium
                     )
                 }
             )
             BaseCell(
-                title = {
+                headlineContent = {
                     BaseCellTitle(
                         title = "Normal title",
                         style = MaterialTheme.typography.labelLarge
@@ -57,7 +57,7 @@ private fun PreviewBaseCell() {
 internal fun BaseCell(
     modifier: Modifier = Modifier,
     iconView: @Composable RowScope.() -> Unit = {},
-    title: @Composable RowScope.() -> Unit,
+    headlineContent: @Composable RowScope.() -> Unit,
     bodyView: @Composable ColumnScope.() -> Unit = {},
     isRowEnabled: Boolean = true,
     onCellClicked: () -> Unit = {},
@@ -82,7 +82,7 @@ internal fun BaseCell(
     ) {
         iconView()
 
-        title()
+        headlineContent()
 
         Column(modifier = Modifier.wrapContentWidth().wrapContentHeight()) { bodyView() }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomListCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomListCell.kt
@@ -17,7 +17,7 @@ fun CustomListCell(
     background: Color = MaterialTheme.colorScheme.primary,
 ) {
     BaseCell(
-        title = {
+        headlineContent = {
             BaseCellTitle(
                 title = customList.name,
                 style = textStyle,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt
@@ -34,7 +34,7 @@ fun DnsCell(
     val startPadding = 54.dp
 
     BaseCell(
-        title = { DnsTitle(address = address, modifier = titleModifier) },
+        headlineContent = { DnsTitle(address = address, modifier = titleModifier) },
         bodyView = {
             if (isUnreachableLocalDnsWarningVisible) {
                 Icon(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DropdownMenuCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DropdownMenuCell.kt
@@ -48,7 +48,7 @@ fun DropdownMenuCell(
 ) {
     var showMenu by remember { mutableStateOf(false) }
     BaseCell(
-        title = {
+        headlineContent = {
             BaseCellTitle(
                 title = text,
                 style = textStyle,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt
@@ -53,7 +53,7 @@ fun ExpandableComposeCell(
     val bodyViewModifier = Modifier
 
     BaseCell(
-        title = {
+        headlineContent = {
             BaseCellTitle(
                 title = title,
                 style = MaterialTheme.typography.titleMedium,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/HeaderCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/HeaderCell.kt
@@ -15,7 +15,7 @@ fun HeaderCell(
     background: Color = MaterialTheme.colorScheme.primary,
 ) {
     BaseCell(
-        title = {
+        headlineContent = {
             BaseCellTitle(
                 title = text,
                 style = textStyle,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt
@@ -45,7 +45,7 @@ fun InformationComposeCell(
     val bodyViewModifier = Modifier
 
     BaseCell(
-        title = {
+        headlineContent = {
             BaseCellTitle(
                 title = title,
                 style = MaterialTheme.typography.titleMedium,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/MtuComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/MtuComposeCell.kt
@@ -28,7 +28,7 @@ fun MtuComposeCell(
     val titleModifier = Modifier
 
     BaseCell(
-        title = { MtuTitle(modifier = titleModifier.weight(1f, true)) },
+        headlineContent = { MtuTitle(modifier = titleModifier.weight(1f, true)) },
         bodyView = { MtuBodyView(mtuValue = mtuValue, modifier = titleModifier) },
         onCellClicked = { onEditMtu.invoke() }
     )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt
@@ -70,7 +70,7 @@ fun NavigationComposeCell(
 ) {
     BaseCell(
         onCellClicked = onClick,
-        title = {
+        headlineContent = {
             NavigationTitleView(
                 title = title,
                 modifier = modifier.weight(1f, true),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt
@@ -347,12 +347,11 @@ private fun RelayLocationCell(
         rememberSaveable(key = relay.expanded.toString()) { mutableStateOf(relay.expanded) }
     Column(
         modifier =
-            modifier.then(
-                Modifier.fillMaxWidth()
-                    .padding(top = Dimens.listItemDivider)
-                    .wrapContentHeight()
-                    .fillMaxWidth()
-            )
+            modifier
+                .fillMaxWidth()
+                .padding(top = Dimens.listItemDivider)
+                .wrapContentHeight()
+                .fillMaxWidth()
     ) {
         Row(
             modifier =
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt
@@ -56,7 +56,7 @@ fun SelectableCell(
 ) {
     BaseCell(
         onCellClicked = onCellClicked,
-        title = { BaseCellTitle(title = title, style = titleStyle) },
+        headlineContent = { BaseCellTitle(title = title, style = titleStyle) },
         background =
             if (isSelected) {
                 selectedColor
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt
@@ -89,7 +89,7 @@ fun SplitTunnelingCell(
                     Modifier.align(Alignment.CenterVertically).size(size = Dimens.listIconSize)
             )
         },
-        title = {
+        headlineContent = {
             Text(
                 text = title,
                 style = MaterialTheme.typography.listItemText,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
@@ -119,7 +119,7 @@ private fun SwitchComposeCell(
 ) {
     BaseCell(
         modifier = modifier,
-        title = titleView,
+        headlineContent = titleView,
         isRowEnabled = isEnabled,
         bodyView = {
             SwitchCellView(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/TwoRowCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/TwoRowCell.kt
@@ -27,7 +27,7 @@ fun TwoRowCell(
     background: Color = MaterialTheme.colorScheme.primary
 ) {
     BaseCell(
-        title = {
+        headlineContent = {
             Column(modifier = Modifier.weight(1f)) {
                 Text(
                     modifier = Modifier.fillMaxWidth(),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
@@ -349,7 +349,7 @@ private fun DeviceListItem(
 ) {
     BaseCell(
         isRowEnabled = false,
-        title = {
+        headlineContent = {
             Column(modifier = Modifier.weight(1f)) {
                 Text(
                     modifier = Modifier.fillMaxWidth(),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
@@ -450,7 +450,7 @@ fun VpnSettingsScreen(
                 itemWithDivider {
                     BaseCell(
                         onCellClicked = { navigateToDns(null, null) },
-                        title = {
+                        headlineContent = {
                             Text(
                                 text = stringResource(id = R.string.add_a_server),
                                 color = Color.White,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
@@ -26,7 +26,6 @@ import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
 import net.mullvad.mullvadvpn.ui.serviceconnection.SplitTunneling
 import net.mullvad.mullvadvpn.usecase.AccountExpiryNotificationUseCase
 import net.mullvad.mullvadvpn.usecase.ConnectivityUseCase
-import net.mullvad.mullvadvpn.usecase.CustomListUseCase
 import net.mullvad.mullvadvpn.usecase.EmptyPaymentUseCase
 import net.mullvad.mullvadvpn.usecase.NewDeviceNotificationUseCase
 import net.mullvad.mullvadvpn.usecase.OutOfTimeUseCase
@@ -105,7 +104,7 @@ val uiModule = module {
     }
     single { SettingsRepository(get()) }
     single { MullvadProblemReport(get()) }
-    single { CustomListsRepository(get()) }
+    single { CustomListsRepository(get(), get()) }
 
     single { AccountExpiryNotificationUseCase(get()) }
     single { TunnelStateNotificationUseCase(get()) }
@@ -116,7 +115,6 @@ val uiModule = module {
     single { OutOfTimeUseCase(get(), get()) }
     single { ConnectivityUseCase(get()) }
     single { SystemVpnSettingsUseCase(androidContext()) }
-    single { CustomListUseCase(get(), get()) }
 
     single { InAppNotificationController(get(), get(), get(), get(), MainScope()) }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/CustomListsRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/CustomListsRepository.kt
@@ -1,6 +1,7 @@
 package net.mullvad.mullvadvpn.repository
 
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
 import net.mullvad.mullvadvpn.lib.ipc.Event
 import net.mullvad.mullvadvpn.lib.ipc.MessageHandler
 import net.mullvad.mullvadvpn.lib.ipc.Request
@@ -9,8 +10,13 @@ import net.mullvad.mullvadvpn.model.CreateCustomListResult
 import net.mullvad.mullvadvpn.model.CustomList
 import net.mullvad.mullvadvpn.model.CustomListsError
 import net.mullvad.mullvadvpn.model.UpdateCustomListResult
+import net.mullvad.mullvadvpn.relaylist.RelayItem
+import net.mullvad.mullvadvpn.relaylist.toGeographicLocationConstraints
 
-class CustomListsRepository(private val messageHandler: MessageHandler) {
+class CustomListsRepository(
+    private val messageHandler: MessageHandler,
+    private val settingsRepository: SettingsRepository
+) {
     suspend fun createCustomList(name: String): CreateCustomListResult {
         val result = messageHandler.trySendRequest(Request.CreateCustomList(name))
 
@@ -34,4 +40,23 @@ class CustomListsRepository(private val messageHandler: MessageHandler) {
             UpdateCustomListResult.Error(CustomListsError.OtherError)
         }
     }
+
+    suspend fun updateCustomListLocations(
+        id: String,
+        locations: List<RelayItem>
+    ): UpdateCustomListResult {
+        return getCustomListById(id)?.let {
+            updateCustomList(it.copy(locations = locations.toGeographicLocationConstraints()))
+        } ?: UpdateCustomListResult.Error(CustomListsError.OtherError)
+    }
+
+    suspend fun updateCustomListName(id: String, name: String): UpdateCustomListResult {
+        return getCustomListById(id)?.let { updateCustomList(it.copy(name = name)) }
+            ?: UpdateCustomListResult.Error(CustomListsError.OtherError)
+    }
+
+    private suspend fun getCustomListById(id: String): CustomList? =
+        settingsRepository.settingsUpdates.firstOrNull()?.customLists?.customLists?.find {
+            it.id == id
+        }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/CustomListUseCase.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/CustomListUseCase.kt
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModel.kt
@@ -14,14 +14,14 @@ import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.compose.state.CustomListLocationsUiState
 import net.mullvad.mullvadvpn.relaylist.RelayItem
 import net.mullvad.mullvadvpn.relaylist.filterOnSearchTerm
-import net.mullvad.mullvadvpn.usecase.CustomListUseCase
+import net.mullvad.mullvadvpn.repository.CustomListsRepository
 import net.mullvad.mullvadvpn.usecase.RelayListUseCase
 
 class CustomListLocationsViewModel(
     private val customListId: String,
     private val newList: Boolean,
     relayListUseCase: RelayListUseCase,
-    private val customListUseCase: CustomListUseCase
+    private val customListsRepository: CustomListsRepository
 ) : ViewModel() {
     private var customListName: String = ""
 
@@ -78,7 +78,7 @@ class CustomListLocationsViewModel(
     fun save() {
         viewModelScope.launch {
             _selectedLocations.value?.let { selectedLocations ->
-                customListUseCase.updateCustomListLocations(
+                customListsRepository.updateCustomListLocations(
                     id = customListId,
                     locations = selectedLocations.calculateLocationsToSave()
                 )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/EditCustomListNameDialogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/EditCustomListNameDialogViewModel.kt
@@ -13,11 +13,11 @@ import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.compose.state.UpdateCustomListUiState
 import net.mullvad.mullvadvpn.model.CustomListsError
 import net.mullvad.mullvadvpn.model.UpdateCustomListResult
-import net.mullvad.mullvadvpn.usecase.CustomListUseCase
+import net.mullvad.mullvadvpn.repository.CustomListsRepository
 
 class EditCustomListNameDialogViewModel(
     private val id: String,
-    private val customListUseCase: CustomListUseCase
+    private val customListsRepository: CustomListsRepository
 ) : ViewModel() {
 
     private val _uiSideEffect =
@@ -33,7 +33,7 @@ class EditCustomListNameDialogViewModel(
 
     fun updateCustomListName(name: String) {
         viewModelScope.launch {
-            when (val result = customListUseCase.updateCustomListName(id, name)) {
+            when (val result = customListsRepository.updateCustomListName(id, name)) {
                 UpdateCustomListResult.Ok -> {
                     _uiSideEffect.send(EditCustomListNameDialogSideEffect.CloseScreen)
                 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/EditCustomListViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/EditCustomListViewModel.kt
@@ -10,13 +10,13 @@ import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.compose.state.EditCustomListState
-import net.mullvad.mullvadvpn.usecase.CustomListUseCase
+import net.mullvad.mullvadvpn.repository.CustomListsRepository
 import net.mullvad.mullvadvpn.usecase.RelayListUseCase
 
 class EditCustomListViewModel(
     private val customListId: String,
     relayListUseCase: RelayListUseCase,
-    private val customListUseCase: CustomListUseCase
+    private val customListsRepository: CustomListsRepository
 ) : ViewModel() {
 
     private val _uiSideEffect = Channel<EditCustomListSideEffect>(1, BufferOverflow.DROP_OLDEST)
@@ -40,7 +40,7 @@ class EditCustomListViewModel(
 
     fun deleteList() {
         viewModelScope.launch {
-            customListUseCase.deleteCustomList(customListId)
+            customListsRepository.deleteCustomList(customListId)
             _uiSideEffect.send(EditCustomListSideEffect.CloseScreen)
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ fun MtuComposeCell(`
`28`	`28`	`val titleModifier = Modifier`
`29`	`29`
`30`	`30`	`BaseCell(`
`31`		`- title = { MtuTitle(modifier = titleModifier.weight(1f, true)) },`
	`31`	`+ headlineContent = { MtuTitle(modifier = titleModifier.weight(1f, true)) },`
`32`	`32`	`bodyView = { MtuBodyView(mtuValue = mtuValue, modifier = titleModifier) },`
`33`	`33`	`onCellClicked = { onEditMtu.invoke() }`
`34`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ fun SplitTunnelingCell(`
`89`	`89`	`Modifier.align(Alignment.CenterVertically).size(size = Dimens.listIconSize)`
`90`	`90`	`)`
`91`	`91`	`},`
`92`		`- title = {`
	`92`	`+ headlineContent = {`
`93`	`93`	`Text(`
`94`	`94`	`text = title,`
`95`	`95`	`style = MaterialTheme.typography.listItemText,`