Show removed provider in FilterScreen so user can remove it.

Author: Rawa

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

@@ -31,6 +31,7 @@ internal fun CheckboxCell(
     modifier: Modifier = Modifier,
     title: String,
     checked: Boolean,
+    enabled: Boolean = true,
     onCheckedChange: (Boolean) -> Unit,
     background: Color = MaterialTheme.colorScheme.surfaceContainerLow,
     startPadding: Dp = Dimens.mediumPadding,
@@ -41,7 +42,7 @@ internal fun CheckboxCell(
         verticalAlignment = Alignment.CenterVertically,
         modifier =
             modifier
-                .clickable { onCheckedChange(!checked) }
+                .clickable(enabled) { onCheckedChange(!checked) }
                 .defaultMinSize(minHeight = minHeight)
                 .fillMaxWidth()
                 .background(background)

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

@@ -138,6 +138,14 @@ fun FilterScreen(
                 itemWithDivider(key = Keys.PROVIDERS_ALL, contentType = ContentType.ITEM) {
                     AllProviders(state, onAllProviderCheckChange)
                 }
+                itemsWithDivider(
+                    key = { it.value },
+                    contentType = { ContentType.ITEM },
+                    items = state.removedProviders,
+                ) { provider ->
+                    RemovedProvider(provider, state, onSelectedProvider)
+                }
+
                 itemsWithDivider(
                     key = { it.value },
                     contentType = { ContentType.ITEM },
@@ -228,6 +236,22 @@ private fun LazyItemScope.Provider(
     )
 }
 
+@Composable
+private fun LazyItemScope.RemovedProvider(
+    providerId: ProviderId,
+    state: RelayFilterUiState,
+    onSelectedProvider: (checked: Boolean, providerId: ProviderId) -> Unit,
+) {
+    val checked = providerId in state.selectedProviders
+    CheckboxCell(
+        title = stringResource(R.string.removed_provider, providerId.value),
+        checked = checked,
+        enabled = checked,
+        onCheckedChange = { checked -> onSelectedProvider(checked, providerId) },
+        modifier = Modifier.animateItem(),
+    )
+}
+
 @Composable
 private fun TopBar(onBackClick: () -> Unit) {
     Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/RelayFilterUiState.kt

@@ -29,6 +29,8 @@ data class RelayFilterUiState(
             allProviders
         }
 
+    val removedProviders: List<ProviderId> = selectedProviders - allProviders
+
     val isApplyButtonEnabled = selectedProviders.isNotEmpty()
 
     val isAllProvidersChecked = allProviders.size == selectedProviders.size

android/lib/resource/src/main/res/values/strings.xml

@@ -402,6 +402,7 @@
     <string name="x_entry">%s (Entry)</string>
     <string name="x_exit">%s (Exit)</string>
     <string name="filters">Filters:</string>
+    <string name="removed_provider">%s (removed)</string>
     <string name="search_query_empty">Type at least 2 characters to start searching.</string>
     <string name="daita_description_slide_1_first_paragraph">%1$s (%2$s) hides patterns in your encrypted VPN traffic.</string>
     <string name="daita_description_slide_1_second_paragraph">By using sophisticated AI it’s possible to analyze the traffic of data packets going in and out of your device (even if the traffic is encrypted).</string>

desktop/packages/mullvad-vpn/locales/messages.pot

@@ -2266,6 +2266,9 @@ msgstr ""
 msgid "%s (added)"
 msgstr ""
 
+msgid "%s (removed)"
+msgstr ""
+
 msgid "%s custom port"
 msgstr ""