Skip to content

Commit 91cf716

Browse files
authored
Merge pull request #4319 from element-hq/feature/bma/updateCompound
Update compound
2 parents fe99ec0 + c872fde commit 91cf716

File tree

860 files changed

+1645
-1645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

860 files changed

+1645
-1645
lines changed

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ internal fun IncomingCallScreen(
100100
ActionButton(
101101
size = 64.dp,
102102
onClick = { onAnswer(notificationData) },
103-
icon = CompoundIcons.VoiceCall(),
103+
icon = CompoundIcons.VoiceCallSolid(),
104104
title = stringResource(CommonStrings.action_accept),
105105
backgroundColor = ElementTheme.colors.iconSuccessPrimary,
106106
borderColor = ElementTheme.colors.borderSuccessSubtle

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private fun ColumnScope.Buttons(
136136
verticalAlignment = Alignment.CenterVertically,
137137
) {
138138
Icon(
139-
imageVector = CompoundIcons.Error(),
139+
imageVector = CompoundIcons.ErrorSolid(),
140140
tint = ElementTheme.colors.iconCriticalPrimary,
141141
contentDescription = null,
142142
modifier = Modifier.size(24.dp)

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ private fun VerifiedUserSendFailureView(
391391
modifier = modifier
392392
.clickable(onClick = onClick)
393393
.padding(horizontal = 16.dp, vertical = 8.dp),
394-
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Error())),
394+
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ErrorSolid())),
395395
trailingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ChevronRight())),
396396
headlineContent = {
397397
Text(

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineEventTimestampView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fun TimelineEventTimestampView(
6868
val isVerifiedUserSendFailure = event.localSendState is LocalEventSendState.Failed.VerifiedUser
6969
Spacer(modifier = Modifier.width(2.dp))
7070
Icon(
71-
imageVector = CompoundIcons.Error(),
71+
imageVector = CompoundIcons.ErrorSolid(),
7272
contentDescription = stringResource(id = CommonStrings.common_sending_failed),
7373
tint = tint,
7474
modifier = Modifier

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLegacyCallInviteView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fun TimelineItemLegacyCallInviteView(
3131
modifier = modifier,
3232
) {
3333
Icon(
34-
imageVector = CompoundIcons.VoiceCall(),
34+
imageVector = CompoundIcons.VoiceCallSolid(),
3535
contentDescription = null,
3636
tint = ElementTheme.colors.iconSecondary,
3737
)

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private fun NotificationSettingsContentView(
132132
if (!state.fullScreenIntentPermissionsState.permissionGranted) {
133133
PreferenceCategory {
134134
PreferenceText(
135-
icon = CompoundIcons.VoiceCall(),
135+
icon = CompoundIcons.VoiceCallSolid(),
136136
title = stringResource(id = R.string.full_screen_intent_banner_title),
137137
subtitle = stringResource(R.string.full_screen_intent_banner_message),
138138
onClick = {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ coil = { module = "io.coil-kt:coil", version.ref = "coil" }
163163
coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
164164
coil_gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }
165165
coil_test = { module = "io.coil-kt:coil-test", version.ref = "coil" }
166-
compound = { module = "io.element.android:compound-android", version = "0.2.0" }
166+
compound = { module = "io.element.android:compound-android", version = "25.2.26" }
167167
datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
168168
serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" }
169169
kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/MatrixBadgeAtom.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ internal fun MatrixBadgeAtomNegativePreview() = ElementPreview {
9393
MatrixBadgeAtom.View(
9494
MatrixBadgeAtom.MatrixBadgeData(
9595
text = "Not trusted",
96-
icon = CompoundIcons.Error(),
96+
icon = CompoundIcons.ErrorSolid(),
9797
type = MatrixBadgeAtom.Type.Negative,
9898
)
9999
)

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/Announcement.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private fun InformativeAnnouncement(
118118
AnnouncementSurface(modifier = modifier) {
119119
Row {
120120
Icon(
121-
imageVector = if (isError) CompoundIcons.Error() else CompoundIcons.Info(),
121+
imageVector = if (isError) CompoundIcons.ErrorSolid() else CompoundIcons.Info(),
122122
tint = if (isError) ElementTheme.colors.iconCriticalPrimary else ElementTheme.colors.iconPrimary,
123123
contentDescription = null,
124124
)

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/BigIcon.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ object BigIcon {
105105
val icon = when (style) {
106106
is Style.Default -> style.vectorIcon
107107
Style.Alert,
108-
Style.AlertSolid -> CompoundIcons.Error()
108+
Style.AlertSolid -> CompoundIcons.ErrorSolid()
109109
Style.Success,
110110
Style.SuccessSolid -> CompoundIcons.CheckCircleSolid()
111111
}

0 commit comments

Comments
 (0)