diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle.kts | 1 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt | 18 | ||||
| -rw-r--r-- | android/gradle/libs.versions.toml | 3 |
3 files changed, 12 insertions, 10 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index bb290ac89e..97a3965aaf 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -349,6 +349,7 @@ dependencies { implementation(libs.compose.constrainlayout) implementation(libs.compose.foundation) implementation(libs.compose.material3) + implementation(libs.compose.icons.extended) implementation(libs.compose.ui) implementation(libs.compose.ui.util) implementation(libs.compose.destinations) 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 index 6a684edef1..05bbcb1b5a 100644 --- 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 @@ -5,6 +5,9 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Remove import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -106,15 +109,12 @@ fun SplitTunnelingCell( }, bodyView = { Icon( - painter = - painterResource( - id = - if (isSelected) { - R.drawable.ic_icons_remove - } else { - R.drawable.ic_icons_add - } - ), + imageVector = + if (isSelected) { + Icons.Default.Remove + } else { + Icons.Default.Add + }, contentDescription = null, tint = MaterialTheme.colorScheme.onSurface, modifier = Modifier.size(size = Dimens.addIconSize), diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 58de53323e..91797b0185 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -100,6 +100,7 @@ compose-destinations = { module = "io.github.raamcosta.compose-destinations:core compose-destinations-ksp = { module = "io.github.raamcosta.compose-destinations:ksp", version.ref = "compose-destinations" } compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" } compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" } +compose-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" } compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" } compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" } compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } @@ -157,7 +158,7 @@ compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } # Kotlin kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } -kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "kotlin-ksp"} +kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "kotlin-ksp" } # Protobuf protobuf-core = { id = "com.google.protobuf", version.ref = "protobuf" } |