Merge pull request #1805 from vector-im/feature/bma/renderReadMarker

Timeline: render TimelineItemReadMarkerModel

Author: bmarty

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

@@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
 import io.element.android.features.messages.impl.timeline.session.SessionState
 import io.element.android.features.messages.impl.timeline.components.virtual.TimelineEncryptedHistoryBannerView
 import io.element.android.features.messages.impl.timeline.components.virtual.TimelineItemDaySeparatorView
+import io.element.android.features.messages.impl.timeline.components.virtual.TimelineItemReadMarkerView
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel
 import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemEncryptedHistoryBannerVirtualModel
@@ -34,7 +35,7 @@ fun TimelineItemVirtualRow(
 ) {
     when (virtual.model) {
         is TimelineItemDaySeparatorModel -> TimelineItemDaySeparatorView(virtual.model, modifier)
-        TimelineItemReadMarkerModel -> return
+        TimelineItemReadMarkerModel -> TimelineItemReadMarkerView()
         is TimelineItemEncryptedHistoryBannerVirtualModel -> TimelineEncryptedHistoryBannerView(sessionState, modifier)
     }
 }

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.messages.impl.timeline.components.virtual
+
+import androidx.compose.foundation.layout.Arrangement.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import io.element.android.features.messages.impl.R
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.HorizontalDivider
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.theme.ElementTheme
+
+@Composable
+internal fun TimelineItemReadMarkerView(
+    modifier: Modifier = Modifier
+) {
+    Column(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(vertical = 12.dp, horizontal = 18.dp),
+        horizontalAlignment = Alignment.End,
+        verticalArrangement = spacedBy(4.dp),
+    ) {
+        Text(
+            text = stringResource(id = R.string.room_timeline_read_marker_title).uppercase(),
+            style = ElementTheme.typography.fontBodySmMedium,
+            color = ElementTheme.colors.textSecondary,
+        )
+        HorizontalDivider(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 2.dp),
+            color = ElementTheme.colors.borderInteractivePrimary,
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun TimelineItemReadMarkerViewPreview() = ElementPreview {
+    TimelineItemReadMarkerView()
+}

features/messages/impl/src/main/res/values-cs/translations.xml

@@ -17,6 +17,7 @@
   <string name="report_content_hint">"Důvod nahlášení tohoto obsahu"</string>
   <string name="room_timeline_beginning_of_room">"Toto je začátek %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Toto je začátek této konverzace."</string>
+  <string name="room_timeline_read_marker_title">"Nové"</string>
   <string name="screen_room_mentions_at_room_subtitle">"Informujte celou místnost"</string>
   <string name="screen_report_content_block_user_hint">"Zaškrtněte, pokud chcete skrýt všechny aktuální a budoucí zprávy od tohoto uživatele"</string>
   <string name="screen_room_attachment_source_camera">"Fotoaparát"</string>

features/messages/impl/src/main/res/values-de/translations.xml

@@ -16,6 +16,7 @@
   <string name="report_content_hint">"Grund für die Meldung dieses Inhalts"</string>
   <string name="room_timeline_beginning_of_room">"Dies ist der Anfang von %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Dies ist der Anfang dieses Gesprächs."</string>
+  <string name="room_timeline_read_marker_title">"Neu"</string>
   <string name="screen_report_content_block_user_hint">"Prüfe, ob du alle aktuellen und zukünftigen Nachrichten dieses Benutzers ausblenden möchtest"</string>
   <string name="screen_room_attachment_source_camera">"Kamera"</string>
   <string name="screen_room_attachment_source_camera_photo">"Foto machen"</string>

features/messages/impl/src/main/res/values-es/translations.xml

@@ -16,6 +16,7 @@
   <string name="report_content_hint">"Motivo para denunciar este contenido"</string>
   <string name="room_timeline_beginning_of_room">"Este es el principio de %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Este es el principio de esta conversación."</string>
+  <string name="room_timeline_read_marker_title">"Nuevos"</string>
   <string name="screen_report_content_block_user_hint">"Marque si quieres ocultar todos los mensajes actuales y futuros de este usuario"</string>
   <string name="screen_report_content_block_user">"Bloquear usuario"</string>
 </resources>

features/messages/impl/src/main/res/values-fr/translations.xml

@@ -16,6 +16,7 @@
   <string name="report_content_hint">"Raison du signalement de ce contenu"</string>
   <string name="room_timeline_beginning_of_room">"Ceci est le début de %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Ceci est le début de cette conversation."</string>
+  <string name="room_timeline_read_marker_title">"Nouveau"</string>
   <string name="screen_room_mentions_at_room_subtitle">"Notifier tout le salon"</string>
   <string name="screen_report_content_block_user_hint">"Cochez si vous souhaitez masquer tous les messages actuels et futurs de cet utilisateur."</string>
   <string name="screen_room_attachment_source_camera">"Appareil photo"</string>

features/messages/impl/src/main/res/values-it/translations.xml

@@ -16,6 +16,7 @@
   <string name="report_content_hint">"Motivo della segnalazione di questo contenuto"</string>
   <string name="room_timeline_beginning_of_room">"Questo è l\'inizio di %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Questo è l\'inizio della conversazione."</string>
+  <string name="room_timeline_read_marker_title">"Nuovo"</string>
   <string name="screen_report_content_block_user_hint">"Seleziona se vuoi nascondere tutti i messaggi attuali e futuri di questo utente"</string>
   <string name="screen_report_content_block_user">"Blocca utente"</string>
 </resources>

features/messages/impl/src/main/res/values-ro/translations.xml

@@ -17,6 +17,7 @@
   <string name="report_content_hint">"Motivul raportării acestui conținut"</string>
   <string name="room_timeline_beginning_of_room">"Acesta este începutul conversației %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Acesta este începutul acestei conversații."</string>
+  <string name="room_timeline_read_marker_title">"Nou"</string>
   <string name="screen_report_content_block_user_hint">"Confirmați că doriți să ascundeți toate mesajele curente și viitoare de la acest utilizator"</string>
   <string name="screen_room_attachment_source_camera">"Cameră foto"</string>
   <string name="screen_room_attachment_source_camera_photo">"Faceți o fotografie"</string>

features/messages/impl/src/main/res/values-ru/translations.xml

@@ -17,6 +17,7 @@
   <string name="report_content_hint">"Причина, по которой вы пожаловались на этот контент"</string>
   <string name="room_timeline_beginning_of_room">"Это начало %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Это начало разговора."</string>
+  <string name="room_timeline_read_marker_title">"Новый"</string>
   <string name="screen_room_mentions_at_room_subtitle">"Уведомить всю комнату"</string>
   <string name="screen_report_content_block_user_hint">"Отметьте, хотите ли вы скрыть все текущие и будущие сообщения от этого пользователя"</string>
   <string name="screen_room_attachment_source_camera">"Камера"</string>

features/messages/impl/src/main/res/values-sk/translations.xml

@@ -17,6 +17,7 @@
   <string name="report_content_hint">"Dôvod nahlásenia tohto obsahu"</string>
   <string name="room_timeline_beginning_of_room">"Toto je začiatok %1$s."</string>
   <string name="room_timeline_beginning_of_room_no_name">"Toto je začiatok tejto konverzácie."</string>
+  <string name="room_timeline_read_marker_title">"Nové"</string>
   <string name="screen_room_mentions_at_room_subtitle">"Informovať celú miestnosť"</string>
   <string name="screen_report_content_block_user_hint">"Označte, či chcete skryť všetky aktuálne a budúce správy od tohto používateľa"</string>
   <string name="screen_room_attachment_source_camera">"Kamera"</string>