Replaced info drawable with Material Design icon

This commit is contained in:
Juha Heinanen
2025-11-20 06:14:07 +02:00
parent b467dfc305
commit 0524759392
3 changed files with 2 additions and 25 deletions
@@ -63,14 +63,12 @@ import androidx.compose.ui.geometry.CornerRadius
import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.Size import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.asImageBitmap
import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.SoftwareKeyboardController import androidx.compose.ui.platform.SoftwareKeyboardController
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.input.KeyboardType 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 @Composable
fun Modifier.verticalScrollbar( fun Modifier.verticalScrollbar(
state: ScrollState, state: ScrollState,
@@ -56,7 +56,6 @@ import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.Chat 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.Dialpad
import androidx.compose.material.icons.filled.History import androidx.compose.material.icons.filled.History
import androidx.compose.material.icons.filled.KeyboardArrowDown 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.filled.Voicemail
import androidx.compose.material.icons.outlined.ArrowCircleRight import androidx.compose.material.icons.outlined.ArrowCircleRight
import androidx.compose.material.icons.outlined.Clear import androidx.compose.material.icons.outlined.Clear
import androidx.compose.material.icons.outlined.Info
import androidx.compose.material.icons.outlined.PauseCircle import androidx.compose.material.icons.outlined.PauseCircle
import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.BasicAlertDialog
import androidx.compose.material3.ButtonColors import androidx.compose.material3.ButtonColors
@@ -1773,7 +1773,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
}, },
) { ) {
Icon( Icon(
imageVector = ImageVector.vectorResource(id = R.drawable.info), imageVector = Icons.Outlined.Info,
modifier = Modifier.size(36.dp), modifier = Modifier.size(36.dp),
tint = MaterialTheme.colorScheme.secondary, tint = MaterialTheme.colorScheme.secondary,
contentDescription = null, contentDescription = null,
-5
View File
@@ -1,5 +0,0 @@
<vector android:height="36dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
</vector>