Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ private fun LiveLocationSharing(
color = if (isOwnMessage) {
ChatTheme.colors.brand.s100
} else {
ChatTheme.colors.backgroundCoreSurface
ChatTheme.colors.backgroundCoreSurfaceDefault
},
),
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ class CustomLoginActivity : AppCompatActivity() {
colors = TextFieldDefaults.colors(
focusedTextColor = ChatTheme.colors.textPrimary,
unfocusedTextColor = ChatTheme.colors.textPrimary,
focusedContainerColor = ChatTheme.colors.backgroundCoreSurface,
unfocusedContainerColor = ChatTheme.colors.backgroundCoreSurface,
focusedContainerColor = ChatTheme.colors.backgroundCoreSurfaceDefault,
unfocusedContainerColor = ChatTheme.colors.backgroundCoreSurfaceDefault,
cursorColor = ChatTheme.colors.accentPrimary,
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ private fun LinearProgressIndicator(
modifier = Modifier.fillMaxWidth(),
progress = { state.progress },
color = ChatTheme.colors.accentPrimary,
trackColor = ChatTheme.colors.backgroundCoreSurface,
trackColor = ChatTheme.colors.backgroundCoreSurfaceDefault,
drawStopIndicator = { /* Don't draw the stop indicator */ },
)
}
Expand All @@ -289,7 +289,7 @@ private fun LinearProgressIndicator(
LinearProgressIndicator(
modifier = Modifier.fillMaxWidth(),
color = ChatTheme.colors.accentPrimary,
trackColor = ChatTheme.colors.backgroundCoreSurface,
trackColor = ChatTheme.colors.backgroundCoreSurfaceDefault,
)
}
}
Expand Down
18 changes: 11 additions & 7 deletions stream-chat-android-compose/api/stream-chat-android-compose.api
Original file line number Diff line number Diff line change
Expand Up @@ -6253,7 +6253,7 @@ public final class io/getstream/chat/android/compose/ui/theme/StreamDesign$Color
public final class io/getstream/chat/android/compose/ui/theme/StreamDesign$Colors {
public static final field $stable I
public static final field Companion Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Colors$Companion;
public synthetic fun <init> (Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ColorScale;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ChromeScale;JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ColorScale;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ChromeScale;JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJLkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ColorScale;
public final fun component10-0d7_KjU ()J
public final fun component11-0d7_KjU ()J
Expand Down Expand Up @@ -6311,11 +6311,13 @@ public final class io/getstream/chat/android/compose/ui/theme/StreamDesign$Color
public final fun component59-0d7_KjU ()J
public final fun component6-0d7_KjU ()J
public final fun component60-0d7_KjU ()J
public final fun component61-0d7_KjU ()J
public final fun component62-0d7_KjU ()J
public final fun component7-0d7_KjU ()J
public final fun component8-0d7_KjU ()J
public final fun component9-0d7_KjU ()J
public final fun copy-fYouhN8 (Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ColorScale;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ChromeScale;JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ)Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Colors;
public static synthetic fun copy-fYouhN8$default (Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Colors;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ColorScale;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ChromeScale;JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJIILjava/lang/Object;)Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Colors;
public final fun copy-Gzxa-5A (Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ColorScale;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ChromeScale;JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ)Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Colors;
public static synthetic fun copy-Gzxa-5A$default (Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Colors;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ColorScale;Lio/getstream/chat/android/compose/ui/theme/StreamDesign$ChromeScale;JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJIILjava/lang/Object;)Lio/getstream/chat/android/compose/ui/theme/StreamDesign$Colors;
public fun equals (Ljava/lang/Object;)Z
public final fun getAccentError-0d7_KjU ()J
public final fun getAccentNeutral-0d7_KjU ()J
Expand All @@ -6340,29 +6342,31 @@ public final class io/getstream/chat/android/compose/ui/theme/StreamDesign$Color
public final fun getBackgroundCoreElevation1-0d7_KjU ()J
public final fun getBackgroundCoreElevation2-0d7_KjU ()J
public final fun getBackgroundCoreElevation3-0d7_KjU ()J
public final fun getBackgroundCoreElevation4-0d7_KjU ()J
public final fun getBackgroundCoreHighlight-0d7_KjU ()J
public final fun getBackgroundCoreInverse-0d7_KjU ()J
public final fun getBackgroundCoreOnAccent-0d7_KjU ()J
public final fun getBackgroundCoreOverlayDark-0d7_KjU ()J
public final fun getBackgroundCoreOverlayLight-0d7_KjU ()J
public final fun getBackgroundCoreScrim-0d7_KjU ()J
public final fun getBackgroundCoreSurface-0d7_KjU ()J
public final fun getBackgroundCoreSurfaceCard-0d7_KjU ()J
public final fun getBackgroundCoreSurfaceDefault-0d7_KjU ()J
public final fun getBackgroundCoreSurfaceStrong-0d7_KjU ()J
public final fun getBackgroundCoreSurfaceSubtle-0d7_KjU ()J
public final fun getBackgroundUtilityDisabled-0d7_KjU ()J
public final fun getBackgroundUtilitySelected-0d7_KjU ()J
public final fun getBorderCoreDefault-0d7_KjU ()J
public final fun getBorderCoreInverse-0d7_KjU ()J
public final fun getBorderCoreOnAccent-0d7_KjU ()J
public final fun getBorderCoreOnInverse-0d7_KjU ()J
public final fun getBorderCoreOnSurface-0d7_KjU ()J
public final fun getBorderCoreOpacityStrong-0d7_KjU ()J
public final fun getBorderCoreOpacitySubtle-0d7_KjU ()J
public final fun getBorderCoreStrong-0d7_KjU ()J
public final fun getBorderCoreSubtle-0d7_KjU ()J
public final fun getBorderUtilityActive-0d7_KjU ()J
public final fun getBorderUtilityDisabled-0d7_KjU ()J
public final fun getBorderUtilityDisabledOnSurface-0d7_KjU ()J
public final fun getBorderUtilityError-0d7_KjU ()J
public final fun getBorderUtilityFocused-0d7_KjU ()J
public final fun getBorderUtilitySelected-0d7_KjU ()J
public final fun getBorderUtilitySuccess-0d7_KjU ()J
public final fun getBorderUtilityWarning-0d7_KjU ()J
Expand All @@ -6371,9 +6375,9 @@ public final class io/getstream/chat/android/compose/ui/theme/StreamDesign$Color
public final fun getSkeletonLoadingBase-0d7_KjU ()J
public final fun getSkeletonLoadingHighlight-0d7_KjU ()J
public final fun getTextDisabled-0d7_KjU ()J
public final fun getTextInverse-0d7_KjU ()J
public final fun getTextLink-0d7_KjU ()J
public final fun getTextOnAccent-0d7_KjU ()J
public final fun getTextOnInverse-0d7_KjU ()J
public final fun getTextPrimary-0d7_KjU ()J
public final fun getTextSecondary-0d7_KjU ()J
public final fun getTextTertiary-0d7_KjU ()J
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ internal fun MediaAttachmentContentItem(
imageRequest = imageRequest,
modifier = Modifier
.fillMaxSize()
.background(ChatTheme.colors.backgroundCoreSurface),
.background(ChatTheme.colors.backgroundCoreSurfaceDefault),
contentScale = ContentScale.Crop,
) { asyncImageState ->
Crossfade(targetState = asyncImageState) { state ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ internal fun ChannelMediaAttachmentsItem(
.align(Alignment.TopStart)
.padding(StreamTokens.spacingXs)
.size(AvatarSize.Small + borderSize)
.border(borderSize, ChatTheme.colors.borderCoreInverse, CircleShape)
.border(borderSize, ChatTheme.colors.borderCoreOnInverse, CircleShape)
.padding(borderSize),
user = item.message.user,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public fun ChannelItem(
.fillMaxWidth()
.wrapContentHeight()
.semantics { contentDescription = description }
.applyIf(isFocused) { border(2.dp, ChatTheme.colors.borderUtilitySelected, shape) }
.applyIf(isFocused) { border(2.dp, ChatTheme.colors.borderUtilityFocused, shape) }
.clip(shape)
.applyIf(channelItem.isSelected) { background(ChatTheme.colors.backgroundUtilitySelected, shape) }
.combinedClickable(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public fun SwipeActionItem(
val colors = ChatTheme.colors
val (bg, content) = when (style) {
SwipeActionStyle.Primary -> colors.accentPrimary to colors.buttonPrimaryTextOnAccent
SwipeActionStyle.Secondary -> colors.backgroundCoreSurface to colors.textPrimary
SwipeActionStyle.Secondary -> colors.backgroundCoreSurfaceDefault to colors.textPrimary
SwipeActionStyle.Destructive -> colors.accentError to colors.buttonDestructiveTextOnAccent
}
SwipeActionItem(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import io.getstream.chat.android.compose.ui.theme.StreamShimmerTheme
@Composable
internal fun ShimmerProgressIndicator(
modifier: Modifier = Modifier,
baseColor: Color = ChatTheme.colors.backgroundCoreSurface,
baseColor: Color = ChatTheme.colors.backgroundCoreSurfaceDefault,
highlightColor: Color = ChatTheme.colors.backgroundCoreApp,
) {
Box(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ internal fun UserAvatarStack(
params = UserAvatarParams(
modifier = Modifier
.size(avatarSize + borderSize)
.border(borderSize, colors.borderCoreInverse, CircleShape)
.border(borderSize, colors.borderCoreOnInverse, CircleShape)
.padding(borderSize),
user = user,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private object StackedGroupAvatarSpecs {

return Modifier
.size(avatarSize + borderWidth)
.border(BorderStroke(borderWidth, ChatTheme.colors.borderCoreInverse), CircleShape)
.border(BorderStroke(borderWidth, ChatTheme.colors.borderCoreOnInverse), CircleShape)
.padding(borderWidth)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ internal fun CommandChip(
modifier = Modifier.size(12.dp),
painter = painterResource(id = R.drawable.stream_compose_ic_command_chip),
contentDescription = null,
tint = ChatTheme.colors.textInverse,
tint = ChatTheme.colors.textOnInverse,
)
Text(
text = command.name.uppercase(Locale.ROOT),
style = ChatTheme.typography.metadataEmphasis,
color = ChatTheme.colors.textInverse,
color = ChatTheme.colors.textOnInverse,
)
Icon(
painter = painterResource(id = R.drawable.stream_compose_ic_command_chip_cancel),
contentDescription = stringResource(id = R.string.stream_compose_cancel),
tint = ChatTheme.colors.textInverse,
tint = ChatTheme.colors.textOnInverse,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private fun MediaBadge(
Icon(
painter = painterResource(iconRes),
contentDescription = null,
tint = ChatTheme.colors.textInverse,
tint = ChatTheme.colors.textOnInverse,
)
Text(
text = if (compact) {
Expand All @@ -96,7 +96,7 @@ private fun MediaBadge(
durationInSeconds.toPreciseDuration()
},
style = ChatTheme.typography.numericMedium,
color = ChatTheme.colors.textInverse,
color = ChatTheme.colors.textOnInverse,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private fun Content(
modifier = Modifier
.padding(horizontal = 16.dp)
.clip(shape = RoundedCornerShape(StreamTokens.radiusXl))
.background(ChatTheme.colors.backgroundCoreSurface)
.background(ChatTheme.colors.backgroundCoreSurfaceDefault)
.padding(16.dp),
state = listState,
verticalArrangement = Arrangement.spacedBy(16.dp),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ public fun MessageModerationDialog(
message = selectedMessage,
modifier = Modifier.background(
shape = MaterialTheme.shapes.medium,
color = ChatTheme.colors.backgroundCoreSurface,
color = ChatTheme.colors.backgroundCoreSurfaceDefault,
),
onDismissRequest = remember(listViewModel) { { listViewModel.removeOverlay() } },
onDialogOptionInteraction = remember(listViewModel, composerViewModel) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,11 @@ private fun PollSwitchListItem(
.animateContentSize()
.border(
width = 1.dp,
color = ChatTheme.colors.backgroundCoreSurface,
color = ChatTheme.colors.backgroundCoreSurfaceDefault,
shape = RoundedCornerShape(StreamTokens.radiusXl),
)
.clip(shape = RoundedCornerShape(StreamTokens.radiusXl))
.background(ChatTheme.colors.backgroundCoreSurface)
.background(ChatTheme.colors.backgroundCoreSurfaceDefault)
.padding(StreamTokens.spacingMd),
) {
PollSwitchHeader(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2820,7 +2820,7 @@ public interface ChatComponentFactory {
.padding(horizontal = StreamTokens.spacingSm, vertical = StreamTokens.spacingXs),
text = params.label,
style = ChatTheme.typography.captionEmphasis,
color = ChatTheme.colors.textInverse,
color = ChatTheme.colors.textOnInverse,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public data class ComposerInputFieldTheme(
): ComposerInputFieldTheme {
return ComposerInputFieldTheme(
borderShape = RoundedCornerShape(StreamTokens.radius3xl),
backgroundColor = colors.backgroundCoreSurface,
backgroundColor = colors.backgroundCoreSurfaceDefault,
textStyle = typography.bodyDefault.copy(
color = colors.textPrimary,
textDirection = TextDirection.Content,
Expand Down
Loading
Loading