Merge pull request #4319 from element-hq/feature/bma/updateCompound

Update compound
This commit is contained in:
Benoit Marty
2025-02-26 22:15:22 +01:00
committed by GitHub
860 changed files with 1645 additions and 1645 deletions

View File

@@ -100,7 +100,7 @@ internal fun IncomingCallScreen(
ActionButton(
size = 64.dp,
onClick = { onAnswer(notificationData) },
icon = CompoundIcons.VoiceCall(),
icon = CompoundIcons.VoiceCallSolid(),
title = stringResource(CommonStrings.action_accept),
backgroundColor = ElementTheme.colors.iconSuccessPrimary,
borderColor = ElementTheme.colors.borderSuccessSubtle

View File

@@ -136,7 +136,7 @@ private fun ColumnScope.Buttons(
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
imageVector = CompoundIcons.Error(),
imageVector = CompoundIcons.ErrorSolid(),
tint = ElementTheme.colors.iconCriticalPrimary,
contentDescription = null,
modifier = Modifier.size(24.dp)

View File

@@ -391,7 +391,7 @@ private fun VerifiedUserSendFailureView(
modifier = modifier
.clickable(onClick = onClick)
.padding(horizontal = 16.dp, vertical = 8.dp),
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Error())),
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ErrorSolid())),
trailingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ChevronRight())),
headlineContent = {
Text(

View File

@@ -68,7 +68,7 @@ fun TimelineEventTimestampView(
val isVerifiedUserSendFailure = event.localSendState is LocalEventSendState.Failed.VerifiedUser
Spacer(modifier = Modifier.width(2.dp))
Icon(
imageVector = CompoundIcons.Error(),
imageVector = CompoundIcons.ErrorSolid(),
contentDescription = stringResource(id = CommonStrings.common_sending_failed),
tint = tint,
modifier = Modifier

View File

@@ -31,7 +31,7 @@ fun TimelineItemLegacyCallInviteView(
modifier = modifier,
) {
Icon(
imageVector = CompoundIcons.VoiceCall(),
imageVector = CompoundIcons.VoiceCallSolid(),
contentDescription = null,
tint = ElementTheme.colors.iconSecondary,
)

View File

@@ -132,7 +132,7 @@ private fun NotificationSettingsContentView(
if (!state.fullScreenIntentPermissionsState.permissionGranted) {
PreferenceCategory {
PreferenceText(
icon = CompoundIcons.VoiceCall(),
icon = CompoundIcons.VoiceCallSolid(),
title = stringResource(id = R.string.full_screen_intent_banner_title),
subtitle = stringResource(R.string.full_screen_intent_banner_message),
onClick = {

View File

@@ -163,7 +163,7 @@ coil = { module = "io.coil-kt:coil", version.ref = "coil" }
coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
coil_gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }
coil_test = { module = "io.coil-kt:coil-test", version.ref = "coil" }
compound = { module = "io.element.android:compound-android", version = "0.2.0" }
compound = { module = "io.element.android:compound-android", version = "25.2.26" }
datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" }
kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"

View File

@@ -93,7 +93,7 @@ internal fun MatrixBadgeAtomNegativePreview() = ElementPreview {
MatrixBadgeAtom.View(
MatrixBadgeAtom.MatrixBadgeData(
text = "Not trusted",
icon = CompoundIcons.Error(),
icon = CompoundIcons.ErrorSolid(),
type = MatrixBadgeAtom.Type.Negative,
)
)

View File

@@ -118,7 +118,7 @@ private fun InformativeAnnouncement(
AnnouncementSurface(modifier = modifier) {
Row {
Icon(
imageVector = if (isError) CompoundIcons.Error() else CompoundIcons.Info(),
imageVector = if (isError) CompoundIcons.ErrorSolid() else CompoundIcons.Info(),
tint = if (isError) ElementTheme.colors.iconCriticalPrimary else ElementTheme.colors.iconPrimary,
contentDescription = null,
)

View File

@@ -105,7 +105,7 @@ object BigIcon {
val icon = when (style) {
is Style.Default -> style.vectorIcon
Style.Alert,
Style.AlertSolid -> CompoundIcons.Error()
Style.AlertSolid -> CompoundIcons.ErrorSolid()
Style.Success,
Style.SuccessSolid -> CompoundIcons.CheckCircleSolid()
}

View File

@@ -259,7 +259,7 @@ private fun SupportingTextLayout(validity: TextFieldValidity?, supportingText: S
when (validity) {
TextFieldValidity.Invalid -> {
Icon(
imageVector = CompoundIcons.Error(),
imageVector = CompoundIcons.ErrorSolid(),
contentDescription = null,
modifier = Modifier.size(16.dp),
tint = ElementTheme.colors.iconCriticalPrimary

View File

@@ -68,7 +68,7 @@ fun UnresolvedUserRow(
.padding(top = 3.dp)
) {
Icon(
imageVector = CompoundIcons.Error(),
imageVector = CompoundIcons.ErrorSolid(),
contentDescription = null,
modifier = Modifier
.size(18.dp)

View File

@@ -98,7 +98,7 @@ private fun ColumnScope.TroubleshootTestView(
Icon(
contentDescription = null,
modifier = Modifier.size(24.dp),
imageVector = CompoundIcons.Error(),
imageVector = CompoundIcons.ErrorSolid(),
tint = ElementTheme.colors.textCriticalPrimary
)
}

Some files were not shown because too many files have changed in this diff Show More