diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt index 935d5e9aa1..300b7785f5 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt @@ -85,6 +85,7 @@ abstract class AbsMessageLocationItem : AbsMe ): Boolean { holder.staticMapPinImageView.setImageResource(R.drawable.ic_location_pin_failed) holder.staticMapErrorTextView.isVisible = true + holder.mapCopyrightTextView.isVisible = false return false } @@ -100,6 +101,7 @@ abstract class AbsMessageLocationItem : AbsMe holder.staticMapPinImageView.setImageDrawable(pinDrawable) } holder.staticMapErrorTextView.isVisible = false + holder.mapCopyrightTextView.isVisible = true return false } }) @@ -111,5 +113,6 @@ abstract class AbsMessageLocationItem : AbsMe val staticMapImageView by bind(R.id.staticMapImageView) val staticMapPinImageView by bind(R.id.staticMapPinImageView) val staticMapErrorTextView by bind(R.id.staticMapErrorTextView) + val mapCopyrightTextView by bind(R.id.mapCopyrightTextView) } } diff --git a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt index f0d1581724..8952ba8c15 100644 --- a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt +++ b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt @@ -63,10 +63,8 @@ class UrlMapProvider @Inject constructor( append(height) append(".png") append(keyParam) - if (!localeProvider.isRTL()) { - // On LTR languages we want the legal mentions to be displayed on the bottom left of the image - append("&attribution=bottomleft") - } + // Since the default copyright font is too small we put a custom one on map + append("&attribution=0") } } } diff --git a/vector/src/main/res/layout/item_timeline_event_location_stub.xml b/vector/src/main/res/layout/item_timeline_event_location_stub.xml index d99ac9fa26..5f895b6bff 100644 --- a/vector/src/main/res/layout/item_timeline_event_location_stub.xml +++ b/vector/src/main/res/layout/item_timeline_event_location_stub.xml @@ -62,4 +62,14 @@ android:orientation="horizontal" app:layout_constraintGuide_percent="0.5" /> + + diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 788dee1bc3..25ded45616 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -3036,6 +3036,7 @@ Temporary implementation: locations persist in room history Stop sharing Updated %1$s ago + © MapTiler © OpenStreetMap contributors Show Message bubbles