Refactor: replace material icons with local drawables and bump libs
This commit is contained in:
+1
-3
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.rounded.Create
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.LocalContentColor
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
@@ -66,7 +64,7 @@ fun BoxScope.DateStatus(
|
||||
if (isEdited) {
|
||||
Spacer(modifier = Modifier.width(4.dp))
|
||||
Icon(
|
||||
imageVector = Icons.Rounded.Create,
|
||||
painter = painterResource(R.drawable.round_edit_24px),
|
||||
contentDescription = null,
|
||||
modifier = Modifier.size(14.dp)
|
||||
)
|
||||
|
||||
+9
-12
@@ -13,11 +13,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
|
||||
import androidx.compose.material.icons.outlined.MoreVert
|
||||
import androidx.compose.material.icons.rounded.Close
|
||||
import androidx.compose.material.icons.rounded.Refresh
|
||||
import androidx.compose.material3.DropdownMenu
|
||||
import androidx.compose.material3.DropdownMenuItem
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
@@ -161,11 +156,13 @@ fun MessagesHistoryTopBar(
|
||||
) {
|
||||
Crossfade(targetState = !isMessagesSelecting) { state ->
|
||||
Icon(
|
||||
imageVector = if (state) {
|
||||
Icons.AutoMirrored.Rounded.ArrowBack
|
||||
} else {
|
||||
Icons.Rounded.Close
|
||||
},
|
||||
painter = painterResource(
|
||||
if (state) {
|
||||
R.drawable.round_arrow_back_24px
|
||||
} else {
|
||||
R.drawable.round_close_24px
|
||||
}
|
||||
),
|
||||
contentDescription = if (state) "Close button"
|
||||
else "Back button"
|
||||
)
|
||||
@@ -234,7 +231,7 @@ fun MessagesHistoryTopBar(
|
||||
},
|
||||
leadingIcon = {
|
||||
Icon(
|
||||
imageVector = Icons.Rounded.Refresh,
|
||||
painter = painterResource(R.drawable.round_refresh_24px),
|
||||
contentDescription = null
|
||||
)
|
||||
}
|
||||
@@ -247,7 +244,7 @@ fun MessagesHistoryTopBar(
|
||||
onClick = { dropDownMenuExpanded = true }
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.MoreVert,
|
||||
painter = painterResource(R.drawable.round_more_vert_24px),
|
||||
contentDescription = "Options"
|
||||
)
|
||||
}
|
||||
|
||||
+1
-3
@@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.rounded.Close
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
@@ -84,7 +82,7 @@ fun PinnedMessageContainer(
|
||||
IconButton(onClick = onUnpinMessageButtonClicked) {
|
||||
Icon(
|
||||
modifier = Modifier.alpha(0.5f),
|
||||
imageVector = Icons.Rounded.Close,
|
||||
painter = painterResource(R.drawable.round_close_24px),
|
||||
contentDescription = null
|
||||
)
|
||||
}
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ fun Audio(
|
||||
.background(MaterialTheme.colorScheme.primary)
|
||||
.size(36.dp)
|
||||
.padding(4.dp),
|
||||
painter = painterResource(R.drawable.round_play_arrow_24),
|
||||
painter = painterResource(R.drawable.round_fill_play_arrow_24px),
|
||||
contentDescription = null,
|
||||
tint = contentColorFor(MaterialTheme.colorScheme.primary)
|
||||
)
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ fun AudioMessage(
|
||||
Icon(
|
||||
painter = painterResource(
|
||||
if (isPlaying) R.drawable.round_pause_24
|
||||
else R.drawable.round_play_arrow_24,
|
||||
else R.drawable.round_fill_play_arrow_24px,
|
||||
),
|
||||
contentDescription = null
|
||||
)
|
||||
|
||||
+3
-3
@@ -14,8 +14,6 @@ import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.rounded.PlayArrow
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
@@ -26,9 +24,11 @@ import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalDensity
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import coil.compose.AsyncImage
|
||||
import dev.meloda.fast.ui.R
|
||||
import dev.meloda.fast.ui.components.IconButton
|
||||
import dev.meloda.fast.ui.util.ImmutableList
|
||||
import dev.meloda.fast.ui.util.ImmutableList.Companion.toImmutableList
|
||||
@@ -110,7 +110,7 @@ fun DynamicPreviewGrid(
|
||||
) {
|
||||
Icon(
|
||||
modifier = Modifier,
|
||||
imageVector = Icons.Rounded.PlayArrow,
|
||||
painter = painterResource(R.drawable.round_fill_play_arrow_24px),
|
||||
contentDescription = null,
|
||||
tint = Color.White
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user