Merge branch 'clean-up-uses-of-image-droid-1174'

6 files changed, 29 insertions, 22 deletions

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
index a0dfe44f09..67890a1d58 100644
--- 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
@@ -1,12 +1,12 @@
 package net.mullvad.mullvadvpn.compose.cell
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -91,10 +91,11 @@ internal fun NavigationTitleView(
     showWarning: Boolean = false
 ) {
     if (showWarning) {
-        Image(
+        Icon(
             painter = painterResource(id = R.drawable.icon_alert),
             modifier = Modifier.padding(end = Dimens.smallPadding),
-            contentDescription = null
+            contentDescription = null,
+            tint = MaterialTheme.colorScheme.error
         )
     }
     Text(
@@ -109,17 +110,19 @@ internal fun NavigationTitleView(
 
 @Composable
 internal fun DefaultNavigationView(chevronContentDescription: String) {
-    Image(
+    Icon(
         painter = painterResource(id = R.drawable.icon_chevron),
-        contentDescription = chevronContentDescription
+        contentDescription = chevronContentDescription,
+        tint = Color.Unspecified
     )
 }
 
 @Composable
 internal fun DefaultExternalLinkView(chevronContentDescription: String) {
-    Image(
+    Icon(
         painter = painterResource(id = R.drawable.icon_extlink),
-        contentDescription = chevronContentDescription
+        contentDescription = chevronContentDescription,
+        tint = Color.Unspecified
     )
 }
 
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
index d1903b75d5..9f1fef4e08 100644
--- 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
@@ -2,7 +2,6 @@ package net.mullvad.mullvadvpn.compose.cell
 
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
@@ -19,6 +18,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.VerticalDivider
@@ -106,7 +106,7 @@ fun StatusRelayLocationCell(
                             shape = CircleShape
                         )
             )
-            Image(
+            Icon(
                 painter = painterResource(id = R.drawable.icon_tick),
                 modifier =
                     Modifier.align(Alignment.CenterStart)
@@ -117,6 +117,7 @@ fun StatusRelayLocationCell(
                                 AlphaInvisible
                             }
                         ),
+                tint = Color.Unspecified,
                 contentDescription = null
             )
         },
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt
index 3bb092b0de..d317c667e2 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/FilterChip.kt
@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.compose.component
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
@@ -8,6 +7,7 @@ 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.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -55,9 +55,10 @@ fun MullvadFilterChip(text: String, onRemoveClick: () -> Unit) {
                 style = MaterialTheme.typography.labelMedium
             )
             Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
-            Image(
+            Icon(
                 painter = painterResource(id = R.drawable.icon_close),
                 contentDescription = null,
+                tint = Color.Unspecified,
                 modifier = Modifier.size(Dimens.smallIconSize).clickable { onRemoveClick() }
             )
         }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt
index b6ea4b1525..cfd75de79e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt
@@ -2,7 +2,6 @@ package net.mullvad.mullvadvpn.compose.screen
 
 import android.content.Context
 import android.net.Uri
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -16,6 +15,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -182,14 +182,15 @@ private fun Content(onPrivacyPolicyLinkClicked: () -> Unit) {
                     )
             )
 
-            Image(
+            Icon(
                 painter = painterResource(id = R.drawable.icon_extlink),
                 contentDescription = null,
                 modifier =
                     Modifier.align(Alignment.CenterVertically)
                         .padding(start = 2.dp, top = 2.dp)
                         .width(10.dp)
-                        .height(10.dp)
+                        .height(10.dp),
+                tint = Color.Unspecified
             )
         }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/ApiAccessMethodTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/ApiAccessMethodTextField.kt
index 614470da48..99a91bbfd7 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/ApiAccessMethodTextField.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/ApiAccessMethodTextField.kt
@@ -1,11 +1,11 @@
 package net.mullvad.mullvadvpn.compose.textfield
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -70,10 +70,11 @@ private fun ErrorSupportingText(text: String) {
         verticalAlignment = Alignment.CenterVertically,
         modifier = Modifier.padding(top = Dimens.miniPadding)
     ) {
-        Image(
+        Icon(
             painter = painterResource(id = R.drawable.icon_alert),
             contentDescription = null,
-            modifier = Modifier.size(Dimens.smallIconSize)
+            modifier = Modifier.size(Dimens.smallIconSize),
+            tint = MaterialTheme.colorScheme.error
         )
         Text(
             text = text,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt
index 8abeda981a..72ba0ad3ba 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/SearchTextField.kt
@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.compose.textfield
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -9,6 +8,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextFieldDefaults
@@ -20,7 +20,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -78,7 +77,7 @@ fun SearchTextField(
                     interactionSource = interactionSource,
                     visualTransformation = visualTransformation,
                     leadingIcon = {
-                        Image(
+                        Icon(
                             painter = painterResource(id = R.drawable.icons_search),
                             contentDescription = null,
                             modifier =
@@ -86,7 +85,7 @@ fun SearchTextField(
                                     width = Dimens.searchIconSize,
                                     height = Dimens.searchIconSize,
                                 ),
-                            colorFilter = ColorFilter.tint(color = textColor),
+                            tint = textColor,
                         )
                     },
                     placeholder = {
@@ -94,13 +93,14 @@ fun SearchTextField(
                     },
                     trailingIcon = {
                         if (searchTerm.isNotEmpty()) {
-                            Image(
+                            Icon(
                                 modifier =
                                     Modifier.size(Dimens.smallIconSize).clickable {
                                         searchTerm = ""
                                         onValueChange.invoke(searchTerm)
                                     },
                                 painter = painterResource(id = R.drawable.icon_close),
+                                tint = Color.Unspecified,
                                 contentDescription = null,
                             )
                         }