From 370300f81055a20ea55d63e867bd99fcbfb7f59e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 15 Oct 2025 14:10:42 +0200 Subject: [PATCH] Remove custom color for enterprise build. --- .../timeline/components/TimelineItemRow.kt | 23 +------------------ .../tests/konsist/KonsistPreviewTest.kt | 1 - ...onents_FocusedEventEnterprise_Day_0_en.png | 3 --- ...ents_FocusedEventEnterprise_Night_0_en.png | 3 --- 4 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Day_0_en.png delete mode 100644 tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Night_0_en.png diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt index 09332ef5c3..917ea2eba0 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt @@ -42,7 +42,6 @@ import io.element.android.libraries.designsystem.modifiers.onKeyboardContextMenu import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.text.toPx -import io.element.android.libraries.designsystem.theme.LocalBuildMeta import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.timeline.Timeline import io.element.android.libraries.matrix.api.user.MatrixUser @@ -220,13 +219,8 @@ internal fun TimelineItemRow( @Composable private fun Modifier.focusedEvent( focusedEventOffset: Dp, - isEnterpriseBuild: Boolean = LocalBuildMeta.current.isEnterpriseBuild, ): Modifier { - val highlightedLineColor = if (isEnterpriseBuild) { - ElementTheme.colors.textActionAccent - } else { - ElementTheme.colors.borderAccentSubtle - } + val highlightedLineColor = ElementTheme.colors.borderAccentSubtle val gradientColors = gradientSubtleColors() val verticalOffset = focusedEventOffset.toPx() val verticalRatio = 0.7f @@ -261,18 +255,3 @@ internal fun FocusedEventPreview() = ElementPreview { .focusedEvent(0.dp), ) } - -@PreviewsDayNight -@Composable -internal fun FocusedEventEnterprisePreview() = ElementPreview { - Box( - modifier = Modifier - .padding(16.dp) - .fillMaxWidth() - .height(160.dp) - .focusedEvent( - focusedEventOffset = 0.dp, - isEnterpriseBuild = true, - ), - ) -} diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt index bf41ce7933..941fde0124 100644 --- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt +++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistPreviewTest.kt @@ -83,7 +83,6 @@ class KonsistPreviewTest { "ColorAliasesPreview", "DefaultRoomListTopBarMultiAccountPreview", "DefaultRoomListTopBarWithIndicatorPreview", - "FocusedEventEnterprisePreview", "FocusedEventPreview", "GradientFloatingActionButtonCircleShapePreview", "HeaderFooterPageScrollablePreview", diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Day_0_en.png deleted file mode 100644 index 581c5d919f..0000000000 --- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Day_0_en.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6349c9b5e5697b05e8c12896cf5e230edfe09330323c4b1658dfd84d3ebdaa38 -size 9664 diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Night_0_en.png deleted file mode 100644 index f4cf788891..0000000000 --- a/tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components_FocusedEventEnterprise_Night_0_en.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34bfc1aa893118f9e5f3da63896fcf85f946f0072c460d7f8a4f1d5722b6ec17 -size 9075