File tree Expand file tree Collapse file tree 4 files changed +11
-3
lines changed
features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl
designsystem/src/main/kotlin/io/element/android/libraries/designsystem
matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components Expand file tree Collapse file tree 4 files changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -56,6 +56,7 @@ import io.element.android.libraries.designsystem.theme.components.Button
5656import io.element.android.libraries.designsystem.theme.components.Icon
5757import io.element.android.libraries.designsystem.theme.components.Text
5858import io.element.android.libraries.designsystem.theme.components.TextButton
59+ import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
5960import io.element.android.libraries.designsystem.utils.LogCompositions
6061import io.element.android.libraries.theme.ElementTheme
6162import io.element.android.libraries.ui.strings.CommonStrings
@@ -159,7 +160,7 @@ private fun AnalyticsOptInContentRow(
159160 modifier = modifier
160161 .fillMaxWidth()
161162 .background(
162- color = ElementTheme .materialColors.surfaceVariant ,
163+ color = ElementTheme .colors.temporaryColorBgSpecial ,
163164 shape = bgShape,
164165 )
165166 .padding(vertical = 12 .dp, horizontal = 20 .dp),
Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ import androidx.compose.ui.unit.dp
3636import io.element.android.libraries.designsystem.preview.ElementPreviewDark
3737import io.element.android.libraries.designsystem.preview.ElementPreviewLight
3838import io.element.android.libraries.designsystem.theme.components.Icon
39+ import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
3940import io.element.android.libraries.theme.ElementTheme
4041
4142/* *
@@ -59,7 +60,7 @@ fun RoundedIconAtom(
5960 modifier = modifier
6061 .size(size.toContainerSize())
6162 .background(
62- color = ElementTheme .materialColors.surfaceVariant ,
63+ color = ElementTheme .colors.temporaryColorBgSpecial ,
6364 shape = RoundedCornerShape (size.toCornerSize())
6465 )
6566 ) {
Original file line number Diff line number Diff line change @@ -65,6 +65,10 @@ val SemanticColors.messageFromOtherBackground
6565 Color (0xFF26282D )
6666 }
6767
68+ // Temporary color, which is not in the token right now
69+ val SemanticColors .temporaryColorBgSpecial
70+ get() = if (isLight) Color (0xFFE4E8F0 ) else Color (0xFF3A4048 )
71+
6872@Preview
6973@Composable
7074internal fun ColorAliasesLightPreview () = ElementPreviewLight { ContentToPreview () }
@@ -86,6 +90,7 @@ private fun ContentToPreview() {
8690 " placeholderBackground" to ElementTheme .colors.placeholderBackground,
8791 " messageFromMeBackground" to ElementTheme .colors.messageFromMeBackground,
8892 " messageFromOtherBackground" to ElementTheme .colors.messageFromOtherBackground,
93+ " temporaryColorBgSpecial" to ElementTheme .colors.temporaryColorBgSpecial,
8994 )
9095 )
9196}
Original file line number Diff line number Diff line change @@ -40,6 +40,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewDark
4040import io.element.android.libraries.designsystem.preview.ElementPreviewLight
4141import io.element.android.libraries.designsystem.preview.debugPlaceholderBackground
4242import io.element.android.libraries.designsystem.theme.components.Icon
43+ import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
4344import io.element.android.libraries.theme.ElementTheme
4445
4546/* *
@@ -69,7 +70,7 @@ fun UnsavedAvatar(
6970 contentDescription = null ,
7071 )
7172 } else {
72- Box (modifier = commonModifier.background(ElementTheme .materialColors.surfaceVariant )) {
73+ Box (modifier = commonModifier.background(ElementTheme .colors.temporaryColorBgSpecial )) {
7374 Icon (
7475 imageVector = Icons .Outlined .AddAPhoto ,
7576 contentDescription = " " ,
You can’t perform that action at this time.
0 commit comments