From c7c6e97fa3f1ce0fe2b01abed98daf3e8fcb37b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Mon, 18 Mar 2024 14:09:59 +0100 Subject: [PATCH] Use info iconbutton --- .../mullvadvpn/compose/screen/ServerIpOverridesScreen.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt index 35b119e9227d..34e4d18fe6a1 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt @@ -13,8 +13,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Delete -import androidx.compose.material.icons.filled.Info -import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api @@ -48,6 +46,7 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator import com.ramcosta.composedestinations.result.ResultRecipient import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.R +import net.mullvad.mullvadvpn.compose.button.InfoIconButton import net.mullvad.mullvadvpn.compose.button.PrimaryButton import net.mullvad.mullvadvpn.compose.cell.HeaderCell import net.mullvad.mullvadvpn.compose.cell.IconCell @@ -291,9 +290,9 @@ private fun TopBarActions( onResetOverridesClick: () -> Unit ) { var showMenu by remember { mutableStateOf(false) } - IconButton(onClick = onInfoClick) { Icon(Icons.Filled.Info, contentDescription = null) } + InfoIconButton(onClick = onInfoClick) IconButton(onClick = { showMenu = !showMenu }) { - Icon(Icons.Default.MoreVert, contentDescription = null) + Icon(painterResource(id = R.drawable.icon_more_vert), contentDescription = null) } DropdownMenu( modifier = Modifier.background(MaterialTheme.colorScheme.surfaceContainer),