Use static map image in bottom sheet.

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

@@ -17,25 +17,28 @@
 package im.vector.app.core.epoxy.bottomsheet
 
 import android.text.method.MovementMethod
+import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
+import com.bumptech.glide.request.RequestOptions
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.glide.GlideApp
 import im.vector.app.features.displayname.getBestName
 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.INITIAL_MAP_ZOOM_IN_TIMELINE
 import im.vector.app.features.location.LocationData
-import im.vector.app.features.location.MapState
+import im.vector.app.features.location.getStaticMapUrl
-import im.vector.app.features.location.MapTilerMapView
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.lib.core.utils.epoxy.charsequence.EpoxyCharSequence
 import org.matrix.android.sdk.api.util.MatrixItem
@@ -82,6 +85,12 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var userClicked: ClickListener? = null
 
+    @EpoxyAttribute
+    var mapWidth: Int = 1200
+
+    @EpoxyAttribute
+    var mapHeight: Int = 800
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         avatarRenderer.render(matrixItem, holder.avatar)
@@ -98,27 +107,21 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
         body.charSequence.findPillsAndProcess(coroutineScope) { it.bind(holder.body) }
         holder.timestamp.setTextOrHide(time)
 
-        holder.mapView.isVisible = locationData != null
+        if (locationData == null) {
-        holder.body.isVisible = locationData == null
+            holder.body.isVisible = true
-        holder.mapView.initialize()
+            holder.mapViewContainer.isVisible = false
-        holder.mapView.render(
+        } else {
-                MapState(
+            holder.body.isVisible = false
-                        zoomOnlyOnce = false,
+            holder.mapViewContainer.isVisible = true
-                        pinLocationData = locationData,
+            GlideApp.with(holder.staticMapImageView)
-                        pinId = matrixItem.id,
+                    .load(getStaticMapUrl(locationData!!.latitude, locationData!!.longitude, INITIAL_MAP_ZOOM_IN_TIMELINE, mapWidth, mapHeight))
-                        pinDrawable = null
+                    .apply(RequestOptions.centerCropTransform())
-                )
+                    .into(holder.staticMapImageView)
-        )
+
             locationPinProvider?.create(matrixItem.id) { pinDrawable ->
-            if (holder.view.isAttachedToWindow) {
+                GlideApp.with(holder.staticMapPinImageView)
-                holder.mapView.render(
+                        .load(pinDrawable)
-                        MapState(
+                        .into(holder.staticMapPinImageView)
-                                zoomOnlyOnce = false,
-                                pinLocationData = locationData,
-                                pinId = matrixItem.id,
-                                pinDrawable = pinDrawable
-                        )
-                )
             }
         }
     }
@@ -135,6 +138,8 @@ 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)
+        val mapViewContainer by bind<FrameLayout>(R.id.mapViewContainer)
+        val staticMapImageView by bind<ImageView>(R.id.staticMapImageView)
+        val staticMapPinImageView by bind<ImageView>(R.id.staticMapPinImageView)
     }
 }

vector/src/main/java/im/vector/app/features/location/Config.kt

@@ -44,5 +44,6 @@ fun getStaticMapUrl(latitude: Double,
         append(height)
         append(".png?key=")
         append(BuildConfig.mapTilerKey)
+        append("&attribution=bottomleft")
     }
 }

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

@@ -103,18 +103,32 @@
         tools:text="1080 x 1024 - 43s - 12kB"
         tools:visibility="visible" />
 
-    <im.vector.app.features.location.MapTilerMapView
+
-        android:id="@+id/bottom_sheet_message_preview_location"
+    <FrameLayout
+        android:id="@+id/mapViewContainer"
         android:layout_width="0dp"
-        android:layout_height="200dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
-        android:contentDescription="@string/attachment_type_location"
-        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"
-        app:mapbox_renderTextureMode="true"
+        tools:visibility="visible">
-        tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/staticMapImageView"
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:contentDescription="@string/a11y_static_map_image" />
+
+        <ImageView
+            android:id="@+id/staticMapPinImageView"
+            android:layout_width="51dp"
+            android:layout_height="55dp"
+            android:layout_gravity="center"
+            android:layout_marginBottom="28dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/bg_map_user_pin" />
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>