From 0524759392a9aea8ad683633b3820e0e1d35e6bc Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Thu, 20 Nov 2025 05:52:01 +0200 Subject: [PATCH] Replaced info drawable with Material Design icon --- .../com/tutpro/baresip/CustomElements.kt | 18 ------------------ .../kotlin/com/tutpro/baresip/MainScreen.kt | 4 ++-- app/src/main/res/drawable/info.xml | 5 ----- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 app/src/main/res/drawable/info.xml diff --git a/app/src/main/kotlin/com/tutpro/baresip/CustomElements.kt b/app/src/main/kotlin/com/tutpro/baresip/CustomElements.kt index 113f6f58..f2f412c4 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CustomElements.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CustomElements.kt @@ -63,14 +63,12 @@ import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Size import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.SoftwareKeyboardController -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.KeyboardType @@ -171,22 +169,6 @@ object CustomElements { ) } - @Composable - fun DrawDrawable( - drawableId: Int, - modifier: Modifier = Modifier, - contentDescription: String? = null, - tint: Color? = null - ) { - val image = painterResource(id = drawableId) - Image( - painter = image, - contentDescription = contentDescription, - modifier = modifier, - colorFilter = if (tint != null) ColorFilter.tint(tint) else null - ) - } - @Composable fun Modifier.verticalScrollbar( state: ScrollState, diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt index bb0b74b6..9a7904a3 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt @@ -56,7 +56,6 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.Chat -import androidx.compose.material.icons.filled.ArrowCircleRight import androidx.compose.material.icons.filled.Dialpad import androidx.compose.material.icons.filled.History import androidx.compose.material.icons.filled.KeyboardArrowDown @@ -71,6 +70,7 @@ import androidx.compose.material.icons.filled.VoiceOverOff import androidx.compose.material.icons.filled.Voicemail import androidx.compose.material.icons.outlined.ArrowCircleRight import androidx.compose.material.icons.outlined.Clear +import androidx.compose.material.icons.outlined.Info import androidx.compose.material.icons.outlined.PauseCircle import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.ButtonColors @@ -1773,7 +1773,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) { }, ) { Icon( - imageVector = ImageVector.vectorResource(id = R.drawable.info), + imageVector = Icons.Outlined.Info, modifier = Modifier.size(36.dp), tint = MaterialTheme.colorScheme.secondary, contentDescription = null, diff --git a/app/src/main/res/drawable/info.xml b/app/src/main/res/drawable/info.xml deleted file mode 100644 index f9a6ef91..00000000 --- a/app/src/main/res/drawable/info.xml +++ /dev/null @@ -1,5 +0,0 @@ - - -