From b75100b2abcf0a356debc6370c3e4dcece5ffb7a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 29 Jun 2023 11:20:11 +0200 Subject: [PATCH] Rename color alias --- .../features/invitelist/impl/components/InviteSummaryRow.kt | 4 ++-- .../features/roomlist/impl/components/RoomSummaryRow.kt | 6 +++--- .../designsystem/atomic/atoms/UnreadIndicatorAtom.kt | 4 ++-- .../android/libraries/designsystem/theme/ColorAliases.kt | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt index 128348a95c..118d4cc220 100644 --- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt +++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt @@ -56,7 +56,7 @@ import io.element.android.libraries.designsystem.theme.components.Button import io.element.android.libraries.designsystem.theme.components.OutlinedButton import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.noFontPadding -import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator +import io.element.android.libraries.designsystem.theme.unreadIndicator import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings @@ -161,7 +161,7 @@ internal fun DefaultInviteSummaryRow( } } - val unreadIndicatorColor = if (invite.isNew) ElementTheme.colors.roomListUnreadIndicator else Color.Transparent + val unreadIndicatorColor = if (invite.isNew) ElementTheme.colors.unreadIndicator else Color.Transparent UnreadIndicatorAtom(color = unreadIndicatorColor) } } diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt index d0ea37c29f..7404f10cfe 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt @@ -57,7 +57,7 @@ import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.roomListRoomMessage import io.element.android.libraries.designsystem.theme.roomListRoomMessageDate import io.element.android.libraries.designsystem.theme.roomListRoomName -import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator +import io.element.android.libraries.designsystem.theme.unreadIndicator import io.element.android.libraries.theme.ElementTheme internal val minHeight = 84.dp @@ -146,7 +146,7 @@ private fun RowScope.NameAndTimestampRow(room: RoomListRoomSummary) { text = room.timestamp ?: "", style = ElementTheme.typography.fontBodySmRegular, color = if (room.hasUnread) { - ElementTheme.colors.roomListUnreadIndicator + ElementTheme.colors.unreadIndicator } else { MaterialTheme.roomListRoomMessageDate() }, @@ -171,7 +171,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) { ) // Unread val unreadIndicatorColor = - if (room.hasUnread) ElementTheme.colors.roomListUnreadIndicator else Color.Transparent + if (room.hasUnread) ElementTheme.colors.unreadIndicator else Color.Transparent UnreadIndicatorAtom( modifier = Modifier.padding(top = 3.dp), color = unreadIndicatorColor, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt index 388dee84ce..3170f886c5 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt @@ -29,14 +29,14 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewLight -import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator +import io.element.android.libraries.designsystem.theme.unreadIndicator import io.element.android.libraries.theme.ElementTheme @Composable fun UnreadIndicatorAtom( modifier: Modifier = Modifier, size: Dp = 12.dp, - color: Color = ElementTheme.colors.roomListUnreadIndicator, + color: Color = ElementTheme.colors.unreadIndicator, ) { Box( modifier = modifier diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt index 5f6bb7f60b..c78f2b9ffd 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt @@ -39,7 +39,7 @@ fun MaterialTheme.roomListRoomMessage() = colorScheme.secondary @Composable fun MaterialTheme.roomListRoomMessageDate() = colorScheme.secondary -val SemanticColors.roomListUnreadIndicator +val SemanticColors.unreadIndicator get() = iconAccentTertiary val SemanticColors.roomListPlaceholder @@ -62,7 +62,7 @@ private fun ContentToPreview() { "roomListRoomName" to MaterialTheme.roomListRoomName(), "roomListRoomMessage" to MaterialTheme.roomListRoomMessage(), "roomListRoomMessageDate" to MaterialTheme.roomListRoomMessageDate(), - "roomListUnreadIndicator" to ElementTheme.colors.roomListUnreadIndicator, + "unreadIndicator" to ElementTheme.colors.unreadIndicator, "roomListPlaceholder" to ElementTheme.colors.roomListPlaceholder, ) )