Allow to reply location messages.

vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt

@@ -30,10 +30,16 @@ import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.epoxy.util.preventMutation
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
 import im.vector.app.features.home.room.detail.timeline.item.BindingOptions
 import im.vector.app.features.home.room.detail.timeline.tools.findPillsAndProcess
+import im.vector.app.features.location.LocationData
+import im.vector.app.features.location.MapTilerMapView
+import im.vector.app.features.location.VectorMapListener
 import im.vector.app.features.media.ImageContentRenderer
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.room.model.message.LocationInfo
+import org.matrix.android.sdk.api.session.room.model.message.MessageLocationContent
 import org.matrix.android.sdk.api.util.MatrixItem
 
 /**
@@ -66,6 +72,12 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
     @EpoxyAttribute
     var time: CharSequence? = null
 
+    @EpoxyAttribute
+    var locationData: LocationData? = null
+
+    @EpoxyAttribute
+    var locationPinProvider: LocationPinProvider? = null
+
     @EpoxyAttribute
     var movementMethod: MovementMethod? = null
 
@@ -91,6 +103,20 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
         holder.bodyDetails.setTextOrHide(bodyDetails)
         body.findPillsAndProcess(coroutineScope) { it.bind(holder.body) }
         holder.timestamp.setTextOrHide(time)
+
+        holder.mapView.isVisible = locationData != null
+        holder.body.isVisible = locationData == null
+        locationData?.let { location ->
+            holder.mapView.initialize(object : VectorMapListener {
+                override fun onMapReady() {
+                    holder.mapView.zoomToLocation(location.latitude, location.longitude, 15.0)
+                    locationPinProvider?.create(matrixItem.id) { pinDrawable ->
+                        holder.mapView.addPinToMap(matrixItem.id, pinDrawable)
+                        holder.mapView.updatePinLocation(matrixItem.id, location.latitude, location.longitude)
+                    }
+                }
+            })
+        }
     }
 
     override fun unbind(holder: Holder) {
@@ -105,5 +131,6 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
         val bodyDetails by bind<TextView>(R.id.bottom_sheet_message_preview_body_details)
         val timestamp by bind<TextView>(R.id.bottom_sheet_message_preview_timestamp)
         val imagePreview by bind<ImageView>(R.id.bottom_sheet_message_preview_image)
+        val mapView by bind<MapTilerMapView>(R.id.bottom_sheet_message_preview_location)
     }
 }

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt

@@ -33,14 +33,19 @@ import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.format.EventDetailsFormatter
+import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
 import im.vector.app.features.home.room.detail.timeline.image.buildImageContentRendererData
 import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
 import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
 import im.vector.app.features.home.room.detail.timeline.tools.linkify
 import im.vector.app.features.html.SpanUtils
+import im.vector.app.features.location.LocationData
 import im.vector.app.features.media.ImageContentRenderer
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageLocationContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import javax.inject.Inject
 
@@ -56,7 +61,8 @@ class MessageActionsEpoxyController @Inject constructor(
         private val errorFormatter: ErrorFormatter,
         private val spanUtils: SpanUtils,
         private val eventDetailsFormatter: EventDetailsFormatter,
-        private val dateFormatter: VectorDateFormatter
+        private val dateFormatter: VectorDateFormatter,
+        private val locationPinProvider: LocationPinProvider
 ) : TypedEpoxyController<MessageActionState>() {
 
     var listener: MessageActionsEpoxyControllerListener? = null
@@ -68,6 +74,9 @@ class MessageActionsEpoxyController @Inject constructor(
         val formattedDate = dateFormatter.format(date, DateFormatKind.MESSAGE_DETAIL)
         val body = state.messageBody.linkify(host.listener)
         val bindingOptions = spanUtils.getBindingOptions(body)
+        val locationData = state.timelineEvent()?.root?.getClearContent()?.toModel<MessageLocationContent>(catchError = true)?.let {
+            LocationData.create(it.locationInfo?.geoUri ?: it.geoUri)
+        }
         bottomSheetMessagePreviewItem {
             id("preview")
             avatarRenderer(host.avatarRenderer)
@@ -80,6 +89,8 @@ class MessageActionsEpoxyController @Inject constructor(
             body(body)
             bodyDetails(host.eventDetailsFormatter.format(state.timelineEvent()?.root))
             time(formattedDate)
+            locationData(locationData)
+            locationPinProvider(host.locationPinProvider)
         }
 
         // Send state

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt

@@ -424,8 +424,9 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
             MessageType.MSGTYPE_VIDEO,
             MessageType.MSGTYPE_AUDIO,
             MessageType.MSGTYPE_FILE,
-            MessageType.MSGTYPE_POLL_START -> true
-            else                           -> false
+            MessageType.MSGTYPE_POLL_START,
+            MessageType.MSGTYPE_LOCATION -> true
+            else                         -> false
         }
     }
 

vector/src/main/res/layout/item_bottom_sheet_message_preview.xml

@@ -103,4 +103,17 @@
         tools:text="1080 x 1024 - 43s - 12kB"
         tools:visibility="visible" />
 
+    <im.vector.app.features.location.MapTilerMapView
+        android:id="@+id/bottom_sheet_message_preview_location"
+        android:layout_width="0dp"
+        android:layout_height="200dp"
+        android:layout_marginTop="6dp"
+        android:importantForAccessibility="no"
+        android:scaleType="centerCrop"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="@id/bottom_sheet_message_preview_timestamp"
+        app:layout_constraintStart_toStartOf="@id/bottom_sheet_message_preview_sender"
+        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_sender"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>