Introduce LiveLocationContent for the timeline (needs sdk)

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

@@ -39,7 +39,7 @@ import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugIn
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageShield
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
-import io.element.android.libraries.matrix.ui.messages.reply.aProfileTimelineDetailsReady
+import io.element.android.libraries.matrix.ui.messages.reply.aProfileDetailsReady
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -166,7 +166,7 @@ internal fun aTimelineItemEvent(
         isMine = isMine,
         isEditable = isEditable,
         canBeRepliedTo = canBeRepliedTo,
-        senderProfile = aProfileTimelineDetailsReady(
+        senderProfile = aProfileDetailsReady(
             displayName = senderDisplayName,
             displayNameAmbiguous = displayNameAmbiguous,
         ),

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

@@ -8,10 +8,8 @@
 
 package io.element.android.features.messages.impl.timeline.components.event
 
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -19,33 +17,28 @@ import androidx.compose.ui.unit.dp
 import io.element.android.features.location.api.StaticMapView
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContentProvider
+import io.element.android.libraries.designsystem.components.PinVariant
+import io.element.android.libraries.designsystem.components.avatar.Avatar
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.Text
 
 @Composable
 fun TimelineItemLocationView(
     content: TimelineItemLocationContent,
     modifier: Modifier = Modifier,
 ) {
-    Column(modifier = modifier.fillMaxWidth()) {
-        content.description?.let {
-            Text(
-                text = it,
-                modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 8.dp, bottom = 8.dp),
-            )
-        }
-
-        StaticMapView(
-            modifier = Modifier
-                .fillMaxWidth()
-                .heightIn(max = 188.dp),
-            lat = content.location.lat,
-            lon = content.location.lon,
-            zoom = 15.0,
-            contentDescription = content.body
-        )
-    }
+    StaticMapView(
+        modifier = modifier
+            .fillMaxWidth()
+            .heightIn(max = 188.dp),
+        pinVariant = content.pinVariant,
+        lat = content.location.lat,
+        lon = content.location.lon,
+        zoom = 15.0,
+        contentDescription = content.body
+    )
 }
 
 @PreviewsDayNight

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt

@@ -9,8 +9,10 @@
 package io.element.android.features.messages.impl.timeline.factories.event
 
 import dev.zacsweers.metro.Inject
+import io.element.android.features.location.api.Location
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLegacyCallInviteContent
+import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemRtcNotificationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemUnknownContent
 import io.element.android.libraries.matrix.api.core.EventId
@@ -22,6 +24,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.EventTimeline
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInviteContent
+import io.element.android.libraries.matrix.api.timeline.item.event.LiveLocationContent
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
@@ -70,10 +73,10 @@ class TimelineItemContentFactory(
             is FailedToParseMessageLikeContent -> failedToParseMessageFactory.create(itemContent)
             is FailedToParseStateContent -> failedToParseStateFactory.create(itemContent)
             is MessageContent -> {
-                val senderDisambiguatedDisplayName = senderProfile.getDisambiguatedDisplayName(sender)
                 messageFactory.create(
+                    senderId = sender,
+                    senderProfile = senderProfile,
                     content = itemContent,
-                    senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,
                     eventId = eventId,
                 )
             }
@@ -96,6 +99,24 @@ class TimelineItemContentFactory(
             is UnableToDecryptContent -> utdFactory.create(itemContent)
             is CallNotifyContent -> TimelineItemRtcNotificationContent()
             is UnknownContent -> TimelineItemUnknownContent
+            is LiveLocationContent -> {
+                val lastKnownLocation = itemContent.locations.mapNotNull { beacon ->
+                    Location.fromGeoUri(beacon.geoUri)
+                }.lastOrNull()
+                if (lastKnownLocation != null) {
+                    TimelineItemLocationContent(
+                        body = itemContent.body.trimEnd(),
+                        description = itemContent.description?.trimEnd(),
+                        assetType = itemContent.assetType,
+                        senderId = sender,
+                        senderProfile = senderProfile,
+                        location = lastKnownLocation,
+                        mode = TimelineItemLocationContent.Mode.Live(isActive = itemContent.isLive)
+                    )
+                } else {
+                    TimelineItemUnknownContent
+                }
+            }
         }
     }
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt

@@ -29,8 +29,13 @@ import io.element.android.features.messages.impl.utils.TextPillificationHelper
 import io.element.android.libraries.androidutils.filesize.FileSizeFormatter
 import io.element.android.libraries.androidutils.text.safeLinkify
 import io.element.android.libraries.core.mimetype.MimeTypes
+import io.element.android.libraries.designsystem.components.PinVariant
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
+import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.FileMessageType
@@ -39,10 +44,13 @@ import io.element.android.libraries.matrix.api.timeline.item.event.LocationMessa
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
 import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
+import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl
+import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
 import io.element.android.libraries.matrix.ui.messages.toHtmlDocument
 import io.element.android.libraries.mediaviewer.api.util.FileExtensionExtractor
 import kotlinx.collections.immutable.persistentListOf
@@ -65,11 +73,13 @@ class TimelineItemContentMessageFactory(
 ) {
     fun create(
         content: MessageContent,
-        senderDisambiguatedDisplayName: String,
+        senderId: UserId,
+        senderProfile: ProfileDetails,
         eventId: EventId?,
     ): TimelineItemEventContent {
         return when (val messageType = content.type) {
             is EmoteMessageType -> {
+                val senderDisambiguatedDisplayName = senderProfile.getDisambiguatedDisplayName(senderId)
                 val emoteBody = "* $senderDisambiguatedDisplayName ${messageType.body.trimEnd()}"
                 val dom = messageType.formatted?.toHtmlDocument(
                     permalinkParser = permalinkParser,
@@ -135,8 +145,8 @@ class TimelineItemContentMessageFactory(
             }
             is LocationMessageType -> {
                 val location = Location.fromGeoUri(messageType.geoUri)
+                val body = messageType.body.trimEnd()
                 if (location == null) {
-                    val body = messageType.body.trimEnd()
                     TimelineItemTextContent(
                         body = body,
                         htmlDocument = null,
@@ -145,9 +155,13 @@ class TimelineItemContentMessageFactory(
                     )
                 } else {
                     TimelineItemLocationContent(
-                        body = messageType.body.trimEnd(),
+                        body = body,
                         location = location,
-                        description = messageType.description
+                        description = messageType.description,
+                        senderId = senderId,
+                        senderProfile = senderProfile,
+                        assetType = messageType.assetType,
+                        mode = TimelineItemLocationContent.Mode.Static
                     )
                 }
             }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/groups/Groupability.kt

@@ -31,6 +31,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.CallNotifyCon
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseMessageLikeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.FailedToParseStateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.LegacyCallInviteContent
+import io.element.android.libraries.matrix.api.timeline.item.event.LiveLocationContent
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
@@ -81,7 +82,8 @@ internal fun MatrixTimelineItem.Event.canBeDisplayedInBubbleBlock(): Boolean {
         RedactedContent,
         is StickerContent,
         is PollContent,
-        is UnableToDecryptContent -> true
+        is UnableToDecryptContent,
+        is LiveLocationContent -> true
         // Can't be grouped
         is FailedToParseStateContent,
         is ProfileChangeContent,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContentProvider.kt

@@ -28,7 +28,8 @@ class TimelineItemEventContentProvider : PreviewParameterProvider<TimelineItemEv
         aTimelineItemAudioContent("An even bigger bigger bigger bigger bigger bigger bigger sound name which doesn't fit .mp3"),
         aTimelineItemVoiceContent(),
         aTimelineItemLocationContent(),
-        aTimelineItemLocationContent("Location description"),
+        aTimelineItemLocationContent(),
+        aTimelineItemLocationContent(mode = TimelineItemLocationContent.Mode.Live(isActive = true)),
         aTimelineItemPollContent(),
         aTimelineItemNoticeContent(),
         aTimelineItemRedactedContent(),

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContent.kt

@@ -9,13 +9,55 @@
 package io.element.android.features.messages.impl.timeline.model.event
 
 import io.element.android.features.location.api.Location
+import io.element.android.libraries.designsystem.components.PinVariant
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.location.AssetType
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+import io.element.android.libraries.matrix.api.timeline.item.event.getAvatarUrl
+import io.element.android.libraries.matrix.api.timeline.item.event.getDisplayName
 
 data class TimelineItemLocationContent(
     val body: String,
+    val senderId: UserId,
+    val senderProfile: ProfileDetails,
     val location: Location,
     val description: String? = null,
     val assetType: AssetType? = null,
+    val mode: Mode,
 ) : TimelineItemEventContent {
+
+    val pinVariant = when (mode) {
+        is Mode.Live -> {
+            if (mode.isActive) {
+                PinVariant.UserLocation(avatarData = senderAvatar(), isLive = true)
+            } else {
+                PinVariant.StaleLocation
+            }
+        }
+        Mode.Static -> {
+            when (assetType) {
+                AssetType.PIN -> PinVariant.PinnedLocation
+                AssetType.SENDER,
+                null -> PinVariant.UserLocation(avatarData = senderAvatar(), isLive = false)
+            }
+        }
+    }
+
+    private fun senderAvatar() = AvatarData(
+        senderId.value,
+        name = senderProfile.getDisplayName(),
+        url = senderProfile.getAvatarUrl(),
+        // Size is irrelevant as the PinMarker will override anyway.
+        size = AvatarSize.TimelineSender
+    )
+
+    sealed interface Mode {
+        data object Static : Mode
+        data class Live(val isActive: Boolean) : Mode
+    }
+
     override val type: String = "TimelineItemLocationContent"
 }
+

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContentProvider.kt

@@ -10,21 +10,34 @@ package io.element.android.features.messages.impl.timeline.model.event
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.location.api.Location
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileDetails
+import io.element.android.libraries.matrix.ui.components.aMatrixUser
+import io.element.android.libraries.matrix.ui.messages.reply.aProfileDetailsReady
 
 open class TimelineItemLocationContentProvider : PreviewParameterProvider<TimelineItemLocationContent> {
     override val values: Sequence<TimelineItemLocationContent>
         get() = sequenceOf(
             aTimelineItemLocationContent(),
-            aTimelineItemLocationContent("This is a description!"),
+            aTimelineItemLocationContent(mode = TimelineItemLocationContent.Mode.Live(isActive = true)),
+            aTimelineItemLocationContent(mode = TimelineItemLocationContent.Mode.Live(isActive = false)),
         )
 }
 
-fun aTimelineItemLocationContent(description: String? = null) = TimelineItemLocationContent(
-    body = "User location geo:52.2445,0.7186;u=5000",
+fun aTimelineItemLocationContent(
+    body: String = "",
+    senderId: UserId = UserId("@sender:matrix.org"),
+    senderProfile: ProfileDetails = aProfileDetailsReady(),
+    mode: TimelineItemLocationContent.Mode = TimelineItemLocationContent.Mode.Static,
+) = TimelineItemLocationContent(
+    body = body,
     location = Location(
         lat = 52.2445,
         lon = 0.7186,
         accuracy = 5000f,
     ),
-    description = description,
+    senderId = senderId,
+    senderProfile = senderProfile,
+    mode = mode
 )