Fix filter chips

Author: Pururun

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt

@@ -1,13 +1,12 @@
 package net.mullvad.mullvadvpn.compose.component
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.InputChip
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -33,33 +32,36 @@ private fun PreviewMullvadFilterChip() {
 }
 
 @Composable
-fun MullvadFilterChip(text: String, onRemoveClick: () -> Unit) {
-    FilterChip(
-        modifier = Modifier.padding(vertical = Dimens.chipVerticalPadding),
+fun MullvadFilterChip(
+    containerColor: Color = MaterialTheme.colorScheme.primary,
+    borderColor: Color = Color.Transparent,
+    labelColor: Color = MaterialTheme.colorScheme.onPrimary,
+    iconColor: Color = MaterialTheme.colorScheme.onPrimary,
+    text: String,
+    onRemoveClick: () -> Unit
+) {
+    InputChip(
         shape = MaterialTheme.shapes.chipShape,
         colors =
-            FilterChipDefaults.filterChipColors(containerColor = MaterialTheme.colorScheme.primary),
+            FilterChipDefaults.filterChipColors(
+                containerColor = containerColor,
+                labelColor = labelColor,
+                iconColor = iconColor
+            ),
         border =
             FilterChipDefaults.filterChipBorder(
-                borderColor = Color.Transparent,
-                disabledBorderColor = Color.Transparent,
+                borderColor = borderColor,
                 enabled = true,
                 selected = false
             ),
         selected = false,
-        onClick = {},
-        label = {
-            Text(
-                text = text,
-                color = MaterialTheme.colorScheme.onPrimary,
-                style = MaterialTheme.typography.labelMedium
-            )
-            Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
+        onClick = onRemoveClick,
+        label = { Text(text = text, style = MaterialTheme.typography.labelMedium) },
+        trailingIcon = {
             Icon(
                 painter = painterResource(id = R.drawable.icon_close),
                 contentDescription = null,
-                tint = MaterialTheme.colorScheme.onPrimary,
-                modifier = Modifier.size(Dimens.smallIconSize).clickable { onRemoveClick() }
+                modifier = Modifier.size(Dimens.smallIconSize)
             )
         }
     )

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

@@ -231,6 +231,7 @@ private fun ImportOverridesByBottomSheet(
                 }
             }
     }
+    Color.Red
     val backgroundColor: Color = MaterialTheme.colorScheme.surfaceContainer
     val onBackgroundColor: Color = MaterialTheme.colorScheme.onSurface
 

android/lib/resource/src/main/res/drawable/icon_back.xml

@@ -6,7 +6,6 @@
     <path android:pathData="M12,24C5.3731,24 -0,18.6269 -0,12C-0,5.3731 5.3731,0 12,0C18.6269,0 24,5.3731 24,12C24,18.6269 18.6269,24 12,24ZM7.0055,11.9979C6.9755,12.2732 7.0685,12.5604 7.2852,12.7774L13.2129,18.7118C13.5936,19.0929 14.2231,19.0908 14.6233,18.7027L14.6942,18.634C15.0925,18.2478 15.1055,17.6196 14.7109,17.218L9.5805,11.9979L14.7109,6.7777C15.1055,6.3762 15.0925,5.7479 14.6942,5.3618L14.6233,5.293C14.2231,4.9049 13.5936,4.9028 13.2129,5.2839L7.2852,11.2184C7.0685,11.4353 6.9755,11.7225 7.0055,11.9979L7.0055,11.9979Z"
           android:strokeWidth="1"
           android:fillColor="#FFFFFF"
-          android:fillAlpha="0.6"
           android:fillType="evenOdd"
           android:strokeColor="#00000000" />
 </vector>

android/lib/resource/src/main/res/drawable/icon_close.xml

@@ -4,7 +4,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
-    <path android:fillColor="#99FFFFFF"
+    <path android:fillColor="#FFFFFFFF"
           android:pathData="
                 M 12,24
                 C 5.37312,24 0,18.62688 0,12

android/lib/resource/src/main/res/drawable/icons_more_circle.xml

@@ -3,7 +3,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
-    <path android:fillAlpha="0.6"
+    <path
           android:fillColor="#FFFFFF"
           android:fillType="evenOdd"
           android:pathData="M12,24A12,12 0,0 1,3.515 3.515a12,12 0,1 1,16.97 16.97A11.922,11.922 0,0 1,12 24zM10.445,16.044L10.445,17.6h3.111v-1.556zM7.333,12.155v1.556h9.333v-1.556zM5,8.267v1.556h14L19,8.267z"