Merge pull request #1286 from vector-im/feature/bma/timestampAlign

Timestamp align

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

@@ -18,10 +18,14 @@ package io.element.android.features.messages.impl.timeline.components.event
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.times
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
 import io.element.android.libraries.core.bool.orFalse
+import io.element.android.libraries.designsystem.text.toDp
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -69,3 +73,10 @@ fun ExtraPadding.getStr(fontSize: TextUnit): String {
     // A space and some unbreakable spaces
     return " " + "\u00A0".repeat(nbOfSpaces)
 }
+
+@Composable
+fun ExtraPadding.getDpSize(): Dp {
+    if (nbChars == 0) return 0.dp
+    val timestampFontSize = ElementTheme.typography.fontBodyXsRegular.fontSize // 11.sp
+    return nbChars * timestampFontSize.toDp() / 3
+}

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

@@ -18,9 +18,6 @@ package io.element.android.features.messages.impl.timeline.components.event
 
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -28,7 +25,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import io.element.android.features.messages.impl.timeline.components.html.HtmlDocument
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemTextBasedContent
@@ -51,18 +47,14 @@ fun TimelineItemTextView(
     CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.textPrimary) {
         val htmlDocument = content.htmlDocument
         if (htmlDocument != null) {
-            // For now we ignore the extra padding for html content, so add some spacing
-            // below the content (as previous behavior)
-            Column(modifier = modifier) {
-                HtmlDocument(
-                    document = htmlDocument,
-                    modifier = Modifier,
-                    onTextClicked = onTextClicked,
-                    onTextLongClicked = onTextLongClicked,
-                    interactionSource = interactionSource
-                )
-                Spacer(Modifier.height(16.dp))
-            }
+            HtmlDocument(
+                document = htmlDocument,
+                extraPadding = extraPadding,
+                modifier = modifier,
+                onTextClicked = onTextClicked,
+                onTextLongClicked = onTextLongClicked,
+                interactionSource = interactionSource
+            )
         } else {
             Box(modifier) {
                 val textWithPadding = remember(content.body) {

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

@@ -25,8 +25,10 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
@@ -53,13 +55,18 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import io.element.android.features.messages.impl.timeline.components.event.ExtraPadding
+import io.element.android.features.messages.impl.timeline.components.event.getDpSize
+import io.element.android.features.messages.impl.timeline.components.event.noExtraPadding
 import io.element.android.libraries.designsystem.components.ClickableLinkText
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.text.toDp
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
+import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.theme.LinkColor
 import kotlinx.collections.immutable.persistentMapOf
 import org.jsoup.nodes.Document
@@ -72,18 +79,28 @@ private const val CHIP_ID = "chip"
 @Composable
 fun HtmlDocument(
     document: Document,
+    extraPadding: ExtraPadding,
     interactionSource: MutableInteractionSource,
     modifier: Modifier = Modifier,
     onTextClicked: () -> Unit = {},
     onTextLongClicked: () -> Unit = {},
 ) {
-    HtmlBody(
-        body = document.body(),
-        interactionSource = interactionSource,
+    FlowRow(
         modifier = modifier,
-        onTextClicked = onTextClicked,
-        onTextLongClicked = onTextLongClicked,
-    )
+    ) {
+        HtmlBody(
+            body = document.body(),
+            interactionSource = interactionSource,
+            onTextClicked = onTextClicked,
+            onTextLongClicked = onTextLongClicked,
+        )
+        Spacer(
+            modifier = Modifier.size(
+                width = extraPadding.getDpSize(),
+                height = ElementTheme.typography.fontBodyXsRegular.fontSize.toDp() * 1.25f
+            )
+        )
+    }
 }
 
 @Composable
@@ -603,5 +620,9 @@ internal fun HtmlDocumentDarkPreview(@PreviewParameter(DocumentProvider::class)
 
 @Composable
 private fun ContentToPreview(document: Document) {
-    HtmlDocument(document, remember { MutableInteractionSource() })
+    HtmlDocument(
+        document = document,
+        extraPadding = noExtraPadding,
+        interactionSource = remember { MutableInteractionSource() }
+    )
 }