Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Unread indicator color changed to iconAccentTertiary

Browse source
This commit is contained in:
Benoit Marty 2023-06-29 11:19:13 +02:00 • committed by Benoit Marty
parent 139d041640
commit 9345cbb724
4 changed files with 13 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

@ -50,7 +50,6 @@ import io.element.android.features.invitelist.impl.model.InviteSender
import io.element.android.libraries.designsystem.ElementTextStyles import io.element.android.libraries.designsystem.ElementTextStyles
import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom
import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.components.avatar.Avatar
import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.theme.components.Button import io.element.android.libraries.designsystem.theme.components.Button
@ -58,6 +57,7 @@ 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.components.Text
import io.element.android.libraries.designsystem.theme.noFontPadding import io.element.android.libraries.designsystem.theme.noFontPadding
import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator
import io.element.android.libraries.theme.ElementTheme
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
private val minHeight = 72.dp private val minHeight = 72.dp
@ -161,7 +161,7 @@ internal fun DefaultInviteSummaryRow(
} }
} }
val unreadIndicatorColor = if (invite.isNew) MaterialTheme.roomListUnreadIndicator() else Color.Transparent val unreadIndicatorColor = if (invite.isNew) ElementTheme.colors.roomListUnreadIndicator else Color.Transparent
UnreadIndicatorAtom(color = unreadIndicatorColor) UnreadIndicatorAtom(color = unreadIndicatorColor)
} }
} }

8
features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
View file

@ -145,7 +145,11 @@ private fun RowScope.NameAndTimestampRow(room: RoomListRoomSummary) {
Text( Text(
text = room.timestamp ?: "", text = room.timestamp ?: "",
style = ElementTheme.typography.fontBodySmRegular, style = ElementTheme.typography.fontBodySmRegular,
color = MaterialTheme.roomListRoomMessageDate(), color = if (room.hasUnread) {
ElementTheme.colors.roomListUnreadIndicator
} else {
MaterialTheme.roomListRoomMessageDate()
},
) )
} }
@ -167,7 +171,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
) )
// Unread // Unread
val unreadIndicatorColor = val unreadIndicatorColor =
if (room.hasUnread) MaterialTheme.roomListUnreadIndicator() else Color.Transparent if (room.hasUnread) ElementTheme.colors.roomListUnreadIndicator else Color.Transparent
UnreadIndicatorAtom( UnreadIndicatorAtom(
modifier = Modifier.padding(top = 3.dp), modifier = Modifier.padding(top = 3.dp),
color = unreadIndicatorColor, color = unreadIndicatorColor,

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

@ -20,7 +20,6 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
@ -31,12 +30,13 @@ import androidx.compose.ui.unit.dp
import io.element.android.libraries.designsystem.preview.ElementPreviewDark import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator import io.element.android.libraries.designsystem.theme.roomListUnreadIndicator
import io.element.android.libraries.theme.ElementTheme
@Composable @Composable
fun UnreadIndicatorAtom( fun UnreadIndicatorAtom(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
size: Dp = 12.dp, size: Dp = 12.dp,
color: Color = MaterialTheme.roomListUnreadIndicator(), color: Color = ElementTheme.colors.roomListUnreadIndicator,
) { ) {
Box( Box(
modifier = modifier modifier = modifier

6
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
View file

@ -39,8 +39,8 @@ fun MaterialTheme.roomListRoomMessage() = colorScheme.secondary
@Composable @Composable
fun MaterialTheme.roomListRoomMessageDate() = colorScheme.secondary fun MaterialTheme.roomListRoomMessageDate() = colorScheme.secondary
@Composable val SemanticColors.roomListUnreadIndicator
fun MaterialTheme.roomListUnreadIndicator() = colorScheme.primary get() = iconAccentTertiary
val SemanticColors.roomListPlaceholder val SemanticColors.roomListPlaceholder
get() = bgSubtleSecondary get() = bgSubtleSecondary
@ -62,7 +62,7 @@ private fun ContentToPreview() {
"roomListRoomName" to MaterialTheme.roomListRoomName(), "roomListRoomName" to MaterialTheme.roomListRoomName(),
"roomListRoomMessage" to MaterialTheme.roomListRoomMessage(), "roomListRoomMessage" to MaterialTheme.roomListRoomMessage(),
"roomListRoomMessageDate" to MaterialTheme.roomListRoomMessageDate(), "roomListRoomMessageDate" to MaterialTheme.roomListRoomMessageDate(),
"roomListUnreadIndicator" to MaterialTheme.roomListUnreadIndicator(), "roomListUnreadIndicator" to ElementTheme.colors.roomListUnreadIndicator,
"roomListPlaceholder" to ElementTheme.colors.roomListPlaceholder, "roomListPlaceholder" to ElementTheme.colors.roomListPlaceholder,
) )
) )