letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Rename color alias

Browse Source
This commit is contained in:
Benoit Marty
2023-06-29 11:20:11 +02:00
committed by Benoit Marty
parent 9345cbb724
commit b75100b2ab
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/components/InviteSummaryRow.kt
View File

@@ -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)
}
}

6
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
View File

@@ -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,

4
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/UnreadIndicatorAtom.kt
View File

@@ -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

4
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
View File

@@ -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,
)
)