Merge pull request #4378 from element-hq/feature/bma/customSuperButton

Be able to correctly render the UI with other colors.

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt

@@ -48,6 +48,7 @@ import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.bindings
 import io.element.android.libraries.core.log.logger.LoggerTag
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import timber.log.Timber
@@ -64,6 +65,7 @@ class ElementCallActivity :
     @Inject lateinit var appPreferencesStore: AppPreferencesStore
     @Inject lateinit var enterpriseService: EnterpriseService
     @Inject lateinit var pictureInPicturePresenter: PictureInPicturePresenter
+    @Inject lateinit var buildMeta: BuildMeta
 
     private lateinit var presenter: Presenter<CallScreenState>
 
@@ -114,6 +116,7 @@ class ElementCallActivity :
             ElementThemeApp(
                 appPreferencesStore = appPreferencesStore,
                 enterpriseService = enterpriseService,
+                buildMeta = buildMeta,
             ) {
                 val state = presenter.present()
                 eventSink = state.eventSink

features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/IncomingCallActivity.kt

@@ -21,6 +21,7 @@ import io.element.android.features.call.impl.utils.ActiveCallManager
 import io.element.android.features.call.impl.utils.CallState
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.libraries.architecture.bindings
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import kotlinx.coroutines.flow.filter
@@ -51,6 +52,9 @@ class IncomingCallActivity : AppCompatActivity() {
     @Inject
     lateinit var enterpriseService: EnterpriseService
 
+    @Inject
+    lateinit var buildMeta: BuildMeta
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -71,6 +75,7 @@ class IncomingCallActivity : AppCompatActivity() {
                 ElementThemeApp(
                     appPreferencesStore = appPreferencesStore,
                     enterpriseService = enterpriseService,
+                    buildMeta = buildMeta,
                 ) {
                     IncomingCallScreen(
                         notificationData = notificationData,

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/activity/PinUnlockActivity.kt

@@ -22,6 +22,7 @@ import io.element.android.features.lockscreen.impl.unlock.PinUnlockPresenter
 import io.element.android.features.lockscreen.impl.unlock.PinUnlockView
 import io.element.android.features.lockscreen.impl.unlock.di.PinUnlockBindings
 import io.element.android.libraries.architecture.bindings
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.theme.ElementThemeApp
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import kotlinx.coroutines.launch
@@ -38,6 +39,7 @@ class PinUnlockActivity : AppCompatActivity() {
     @Inject lateinit var lockScreenService: LockScreenService
     @Inject lateinit var appPreferencesStore: AppPreferencesStore
     @Inject lateinit var enterpriseService: EnterpriseService
+    @Inject lateinit var buildMeta: BuildMeta
 
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
@@ -47,6 +49,7 @@ class PinUnlockActivity : AppCompatActivity() {
             ElementThemeApp(
                 appPreferencesStore = appPreferencesStore,
                 enterpriseService = enterpriseService,
+                buildMeta = buildMeta,
             ) {
                 val state = presenter.present()
                 PinUnlockView(

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt

@@ -8,6 +8,8 @@
 package io.element.android.features.messages.impl.timeline.components
 
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -28,7 +30,10 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemStateContent
 import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionEvent
 import io.element.android.features.messages.impl.timeline.protection.TimelineProtectionState
+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.designsystem.theme.highlightedMessageBackgroundColor
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
@@ -171,8 +176,13 @@ private fun Modifier.focusedEvent(
     focusedEventOffset: Dp
 ): Modifier {
     val highlightedLineColor = ElementTheme.colors.textActionAccent
+    val gradientFirstColor = if (LocalBuildMeta.current.isEnterpriseBuild) {
+        ElementTheme.colors.textActionAccent.copy(alpha = 0.125f)
+    } else {
+        ElementTheme.colors.highlightedMessageBackgroundColor
+    }
     val gradientColors = listOf(
-        ElementTheme.colors.highlightedMessageBackgroundColor,
+        gradientFirstColor,
         ElementTheme.colors.bgCanvasDefault,
     )
     val verticalOffset = focusedEventOffset.toPx()
@@ -196,3 +206,15 @@ private fun Modifier.focusedEvent(
         }
     }.padding(top = 4.dp)
 }
+
+@PreviewsDayNight
+@Composable
+internal fun FocusedEventPreview() = ElementPreview {
+    Box(
+        modifier = Modifier
+            .padding(16.dp)
+            .fillMaxWidth()
+            .height(160.dp)
+            .focusedEvent(0.dp),
+    )
+}

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/virtual/TimelineItemReadMarkerView.kt

@@ -37,13 +37,13 @@ internal fun TimelineItemReadMarkerView(
         Text(
             text = stringResource(id = R.string.screen_room_timeline_read_marker_title).uppercase(),
             style = ElementTheme.typography.fontBodySmMedium,
-            color = ElementTheme.colors.textSecondary,
+            color = ElementTheme.colors.textActionAccent,
         )
         HorizontalDivider(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = 2.dp),
-            color = ElementTheme.colors.borderInteractivePrimary,
+            color = ElementTheme.colors.textActionAccent,
         )
     }
 }