From 46684702a157070e0bcd879af72bfd4aade72180 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 25 Jul 2022 09:46:41 +0200
Subject: [PATCH 01/12] Hiding bottom sheet when no more lives

---
 .../location/live/map/LocationLiveMapViewFragment.kt  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
index e19580f13b..bbb838a41a 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
@@ -22,6 +22,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.drawable.toBitmap
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -57,7 +59,6 @@ import javax.inject.Inject
 /**
  * Screen showing a map with all the current users sharing their live location in a room.
  */
-
 @AndroidEntryPoint
 class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<FragmentLocationLiveMapViewBinding>() {
 
@@ -173,7 +174,13 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
     }
 
     private fun updateUserListBottomSheet(userLocations: List<UserLiveLocationViewState>) {
-        bottomSheetController.setData(userLocations)
+        if (userLocations.isEmpty()) {
+            views.bottomSheet.isGone = true
+            // TODO show Live location ended view
+        } else {
+            views.bottomSheet.isVisible = true
+            bottomSheetController.setData(userLocations)
+        }
     }
 
     private fun updateMap(userLiveLocations: List<UserLiveLocationViewState>) {

From 1276b1218888bb1ef5a52ac423658f41889e84ea Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 25 Jul 2022 09:48:26 +0200
Subject: [PATCH 02/12] Renaming banner view for running live

---
 .../timeline/item/MessageLiveLocationItem.kt  | 10 +--
 ...ew.kt => LocationLiveRunningBannerView.kt} |  6 +-
 .../item_timeline_event_location_stub.xml     |  2 +-
 .../view_location_live_running_banner.xml     | 67 +++++++++++++++++++
 4 files changed, 76 insertions(+), 9 deletions(-)
 rename vector/src/main/java/im/vector/app/features/location/live/{LocationLiveMessageBannerView.kt => LocationLiveRunningBannerView.kt} (96%)
 create mode 100644 vector/src/main/res/layout/view_location_live_running_banner.xml

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
index 84080eaad9..03b9a04008 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
@@ -26,7 +26,7 @@ import im.vector.app.core.resources.toTimestamp
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
-import im.vector.app.features.location.live.LocationLiveMessageBannerView
+import im.vector.app.features.location.live.LocationLiveRunningBannerView
 import im.vector.app.features.location.live.LocationLiveMessageBannerViewState
 import org.threeten.bp.LocalDateTime
 
@@ -52,9 +52,9 @@ abstract class MessageLiveLocationItem : AbsMessageLocationItem<MessageLiveLocat
         val isEmitter = currentUserId != null && currentUserId == locationUserId
         val messageLayout = attributes.informationData.messageLayout
         val viewState = buildViewState(holder, messageLayout, isEmitter)
-        holder.locationLiveMessageBanner.isVisible = true
-        holder.locationLiveMessageBanner.render(viewState)
-        holder.locationLiveMessageBanner.stopButton.setOnClickListener {
+        holder.locationLiveRunningBanner.isVisible = true
+        holder.locationLiveRunningBanner.render(viewState)
+        holder.locationLiveRunningBanner.stopButton.setOnClickListener {
             attributes.callback?.onTimelineItemAction(RoomDetailAction.StopLiveLocationSharing)
         }
     }
@@ -112,7 +112,7 @@ abstract class MessageLiveLocationItem : AbsMessageLocationItem<MessageLiveLocat
     override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageLocationItem.Holder(STUB_ID) {
-        val locationLiveMessageBanner by bind<LocationLiveMessageBannerView>(R.id.locationLiveMessageBanner)
+        val locationLiveRunningBanner by bind<LocationLiveRunningBannerView>(R.id.locationLiveMessageBanner)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveMessageBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt
similarity index 96%
rename from vector/src/main/java/im/vector/app/features/location/live/LocationLiveMessageBannerView.kt
rename to vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt
index 51c7caed3a..1786ccdb8b 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveMessageBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt
@@ -31,19 +31,19 @@ import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners
 import im.vector.app.R
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.utils.TextUtils
-import im.vector.app.databinding.ViewLocationLiveMessageBannerBinding
+import im.vector.app.databinding.ViewLocationLiveRunningBannerBinding
 import im.vector.app.features.themes.ThemeUtils
 import org.threeten.bp.Duration
 
 private const val REMAINING_TIME_COUNTER_INTERVAL_IN_MS = 1000L
 
-class LocationLiveMessageBannerView @JvmOverloads constructor(
+class LocationLiveRunningBannerView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
-    private val binding = ViewLocationLiveMessageBannerBinding.inflate(
+    private val binding = ViewLocationLiveRunningBannerBinding.inflate(
             LayoutInflater.from(context),
             this
     )
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 a696140669..54de86e57f 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
@@ -45,7 +45,7 @@
         app:layout_constraintTop_toBottomOf="@id/staticMapPinImageView"
         tools:visibility="visible" />
 
-    <im.vector.app.features.location.live.LocationLiveMessageBannerView
+    <im.vector.app.features.location.live.LocationLiveRunningBannerView
         android:id="@+id/locationLiveMessageBanner"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/view_location_live_running_banner.xml b/vector/src/main/res/layout/view_location_live_running_banner.xml
new file mode 100644
index 0000000000..5c8f3a8970
--- /dev/null
+++ b/vector/src/main/res/layout/view_location_live_running_banner.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/locationLiveMessageBannerBackground"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:alpha="0.75"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="?android:colorBackground"
+        tools:ignore="ContentDescription" />
+
+    <ImageView
+        android:id="@+id/locationLiveMessageBannerIcon"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginHorizontal="8dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?vctr_live_location"
+        android:padding="3dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@id/locationLiveMessageBannerBackground"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_attachment_location_live_white"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:id="@+id/locationLiveMessageBannerTitle"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="8dp"
+        android:textColor="?colorOnSurface"
+        app:layout_constraintBottom_toTopOf="@id/locationLiveMessageBannerSubTitle"
+        app:layout_constraintStart_toEndOf="@id/locationLiveMessageBannerIcon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@string/location_share_live_enabled" />
+
+    <TextView
+        android:id="@+id/locationLiveMessageBannerSubTitle"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?vctr_content_secondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@id/locationLiveMessageBannerTitle"
+        app:layout_constraintTop_toBottomOf="@id/locationLiveMessageBannerTitle"
+        tools:text="9min left" />
+
+    <Button
+        android:id="@+id/locationLiveMessageBannerStop"
+        style="@style/Widget.Vector.Button.Text.LocationLive"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/location_share_live_stop"
+        app:layout_constraintBottom_toBottomOf="@id/locationLiveMessageBannerBackground"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/locationLiveMessageBannerBackground" />
+</merge>

From 732582b6fe61574189ba2cb657437c196f9e3409 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 25 Jul 2022 09:49:18 +0200
Subject: [PATCH 03/12] Banner view for ended live

---
 .../item/MessageLiveLocationInactiveItem.kt   |  2 +-
 .../live/LocationLiveEndedBannerView.kt       | 37 +++++++++
 ...line_event_live_location_inactive_stub.xml | 40 +---------
 .../view_location_live_ended_banner.xml       | 49 ++++++++++++
 .../view_location_live_message_banner.xml     | 75 -------------------
 5 files changed, 90 insertions(+), 113 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
 create mode 100644 vector/src/main/res/layout/view_location_live_ended_banner.xml
 delete mode 100644 vector/src/main/res/layout/view_location_live_message_banner.xml

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt
index bc6e96b0ee..fae8091f06 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt
@@ -42,7 +42,7 @@ abstract class MessageLiveLocationInactiveItem :
     override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageItem.Holder(STUB_ID) {
-        val bannerImageView by bind<ImageView>(R.id.locationLiveInactiveBanner)
+        val bannerImageView by bind<ImageView>(R.id.locationLiveEndedBannerBackground)
         val noLocationMapImageView by bind<ImageView>(R.id.locationLiveInactiveMap)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
new file mode 100644
index 0000000000..95b444aee5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import im.vector.app.databinding.ViewLocationLiveEndedBannerBinding
+
+class LocationLiveEndedBannerView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    init {
+        ViewLocationLiveEndedBannerBinding.inflate(
+                LayoutInflater.from(context),
+                this
+        )
+    }
+}
diff --git a/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml b/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
index ba0ff33230..df8559f34b 100644
--- a/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
@@ -15,16 +15,13 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
-        android:id="@+id/locationLiveInactiveBanner"
+    <im.vector.app.features.location.live.LocationLiveEndedBannerView
+        android:id="@+id/locationLiveEndedBanner"
         android:layout_width="0dp"
         android:layout_height="48dp"
-        android:alpha="0.75"
-        android:src="?android:colorBackground"
         app:layout_constraintBottom_toBottomOf="@id/locationLiveInactiveMap"
         app:layout_constraintEnd_toEndOf="@id/locationLiveInactiveMap"
-        app:layout_constraintStart_toStartOf="@id/locationLiveInactiveMap"
-        tools:ignore="ContentDescription" />
+        app:layout_constraintStart_toStartOf="@id/locationLiveInactiveMap" />
 
     <ImageView
         android:id="@+id/locationLiveInactiveIcon"
@@ -37,37 +34,6 @@
         app:tint="?vctr_content_quaternary"
         tools:ignore="ContentDescription" />
 
-    <ImageView
-        android:id="@+id/locationLiveInactiveBannerIcon"
-        android:layout_width="26dp"
-        android:layout_height="26dp"
-        android:layout_marginVertical="8dp"
-        android:layout_marginStart="8dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?vctr_content_quaternary"
-        android:padding="3dp"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveInactiveBanner"
-        app:layout_constraintStart_toStartOf="@id/locationLiveInactiveBanner"
-        app:layout_constraintTop_toTopOf="@id/locationLiveInactiveBanner"
-        app:srcCompat="@drawable/ic_attachment_location_live_white"
-        app:tint="?android:colorBackground"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/locationLiveInactiveTitle"
-        style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:lines="1"
-        android:text="@string/location_share_live_ended"
-        android:ellipsize="end"
-        android:textColor="?vctr_content_tertiary"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveInactiveBanner"
-        app:layout_constraintStart_toEndOf="@id/locationLiveInactiveBannerIcon"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveInactiveBanner"
-        app:layout_constraintTop_toTopOf="@id/locationLiveInactiveBanner" />
-
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/locationLiveInactiveVerticalCenter"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/view_location_live_ended_banner.xml b/vector/src/main/res/layout/view_location_live_ended_banner.xml
new file mode 100644
index 0000000000..c9da0ce62c
--- /dev/null
+++ b/vector/src/main/res/layout/view_location_live_ended_banner.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/locationLiveEndedBannerBackground"
+        android:layout_width="0dp"
+        android:layout_height="48dp"
+        android:alpha="0.75"
+        android:src="?android:colorBackground"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="ContentDescription" />
+
+    <ImageView
+        android:id="@+id/locationLiveEndedBannerIcon"
+        android:layout_width="26dp"
+        android:layout_height="26dp"
+        android:layout_marginVertical="8dp"
+        android:layout_marginStart="8dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?vctr_content_quaternary"
+        android:padding="3dp"
+        app:layout_constraintBottom_toBottomOf="@id/locationLiveEndedBannerBackground"
+        app:layout_constraintStart_toStartOf="@id/locationLiveEndedBannerBackground"
+        app:layout_constraintTop_toTopOf="@id/locationLiveEndedBannerBackground"
+        app:srcCompat="@drawable/ic_attachment_location_live_white"
+        app:tint="?android:colorBackground"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:id="@+id/locationLiveEndedTitle"
+        style="@style/Widget.Vector.TextView.Caption"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:ellipsize="end"
+        android:lines="1"
+        android:text="@string/location_share_live_ended"
+        android:textColor="?vctr_content_tertiary"
+        app:layout_constraintBottom_toBottomOf="@id/locationLiveEndedBannerBackground"
+        app:layout_constraintEnd_toEndOf="@id/locationLiveEndedBannerBackground"
+        app:layout_constraintStart_toEndOf="@id/locationLiveEndedBannerIcon"
+        app:layout_constraintTop_toTopOf="@id/locationLiveEndedBannerBackground" />
+</merge>
diff --git a/vector/src/main/res/layout/view_location_live_message_banner.xml b/vector/src/main/res/layout/view_location_live_message_banner.xml
deleted file mode 100644
index f13696a5c7..0000000000
--- a/vector/src/main/res/layout/view_location_live_message_banner.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
-
-    <ImageView
-        android:id="@+id/locationLiveMessageBannerBackground"
-        android:layout_width="0dp"
-        android:layout_height="50dp"
-        android:alpha="0.75"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:background="?android:colorBackground"
-        tools:ignore="ContentDescription" />
-
-    <ImageView
-        android:id="@+id/locationLiveMessageBannerIcon"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginHorizontal="8dp"
-        android:background="@drawable/circle"
-        android:backgroundTint="?vctr_live_location"
-        android:padding="3dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/locationLiveMessageBannerBackground"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_attachment_location_live_white"
-        tools:ignore="ContentDescription" />
-
-    <TextView
-        android:id="@+id/locationLiveMessageBannerTitle"
-        style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="8dp"
-        android:ellipsize="end"
-        android:lines="1"
-        android:textColor="?colorOnSurface"
-        app:layout_constraintBottom_toTopOf="@id/locationLiveMessageBannerSubTitle"
-        app:layout_constraintEnd_toStartOf="@id/locationLiveMessageBannerStop"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/locationLiveMessageBannerIcon"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@string/location_share_live_enabled" />
-
-    <TextView
-        android:id="@+id/locationLiveMessageBannerSubTitle"
-        style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:lines="1"
-        android:textColor="?vctr_content_secondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveMessageBannerTitle"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="@id/locationLiveMessageBannerTitle"
-        app:layout_constraintTop_toBottomOf="@id/locationLiveMessageBannerTitle"
-        tools:text="9min left" />
-
-    <Button
-        android:id="@+id/locationLiveMessageBannerStop"
-        style="@style/Widget.Vector.Button.Text.LocationLive"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/location_share_live_stop"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveMessageBannerBackground"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/locationLiveMessageBannerBackground" />
-</merge>

From 5e59eb474aeae85a2410c410accf4e3ed6a446cf Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 25 Jul 2022 10:36:28 +0200
Subject: [PATCH 04/12] Adding attribute to control alpha of the banner
 background

---
 ...ylable_location_live_ended_banner_view.xml |  8 ++++++
 .../live/LocationLiveEndedBannerView.kt       | 28 ++++++++++++++++---
 ...line_event_live_location_inactive_stub.xml |  3 +-
 .../view_location_live_ended_banner.xml       |  1 -
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml

diff --git a/library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml b/library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml
new file mode 100644
index 0000000000..cd187586e7
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="LocationLiveEndedBannerView">
+        <attr name="locLiveEndedBkgWithAlpha" format="boolean" />
+    </declare-styleable>
+
+</resources>
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
index 95b444aee5..dc4938fe7a 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
@@ -17,9 +17,11 @@
 package im.vector.app.features.location.live
 
 import android.content.Context
+import android.content.res.TypedArray
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
+import im.vector.app.R
 import im.vector.app.databinding.ViewLocationLiveEndedBannerBinding
 
 class LocationLiveEndedBannerView @JvmOverloads constructor(
@@ -28,10 +30,28 @@ class LocationLiveEndedBannerView @JvmOverloads constructor(
         defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
+    private val binding = ViewLocationLiveEndedBannerBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+
     init {
-        ViewLocationLiveEndedBannerBinding.inflate(
-                LayoutInflater.from(context),
-                this
-        )
+        context.theme.obtainStyledAttributes(
+                attrs,
+                R.styleable.LocationLiveEndedBannerView,
+                0,
+                0
+        ).run {
+            try {
+                setBackgroundAlpha(this)
+            } finally {
+                recycle()
+            }
+        }
+    }
+
+    private fun setBackgroundAlpha(typedArray: TypedArray) {
+        val withAlpha = typedArray.getBoolean(R.styleable.LocationLiveEndedBannerView_locLiveEndedBkgWithAlpha, false)
+        binding.locationLiveEndedBannerBackground.alpha = if (withAlpha) 0.75f else 1f
     }
 }
diff --git a/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml b/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
index df8559f34b..074ebf2f86 100644
--- a/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
@@ -21,7 +21,8 @@
         android:layout_height="48dp"
         app:layout_constraintBottom_toBottomOf="@id/locationLiveInactiveMap"
         app:layout_constraintEnd_toEndOf="@id/locationLiveInactiveMap"
-        app:layout_constraintStart_toStartOf="@id/locationLiveInactiveMap" />
+        app:layout_constraintStart_toStartOf="@id/locationLiveInactiveMap"
+        app:locLiveEndedBkgWithAlpha="true" />
 
     <ImageView
         android:id="@+id/locationLiveInactiveIcon"
diff --git a/vector/src/main/res/layout/view_location_live_ended_banner.xml b/vector/src/main/res/layout/view_location_live_ended_banner.xml
index c9da0ce62c..2a6036139a 100644
--- a/vector/src/main/res/layout/view_location_live_ended_banner.xml
+++ b/vector/src/main/res/layout/view_location_live_ended_banner.xml
@@ -10,7 +10,6 @@
         android:id="@+id/locationLiveEndedBannerBackground"
         android:layout_width="0dp"
         android:layout_height="48dp"
-        android:alpha="0.75"
         android:src="?android:colorBackground"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From e51488bc575b9ee996646bd381d08de4ab0c2e25 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 25 Jul 2022 12:01:10 +0200
Subject: [PATCH 05/12] Adding ended live banner view in the map screen

---
 .../live/map/LocationLiveMapViewFragment.kt   | 49 ++++++++++++++-----
 .../fragment_location_live_map_view.xml       | 11 ++++-
 ...imeline_event_live_location_start_stub.xml |  4 +-
 .../view_location_live_ended_banner.xml       | 10 ++--
 4 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
index bbb838a41a..3aacd70f0e 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
@@ -111,13 +111,6 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
     private fun setupMap() {
         val mapFragment = getOrCreateSupportMapFragment()
         mapFragment.getMapAsync { mapboxMap ->
-            val bottomSheetHeight = BottomSheetBehavior.from(views.bottomSheet).peekHeight
-            mapboxMap.uiSettings.apply {
-                // Place copyright above the user list bottom sheet
-                setLogoMargins(dimensionConverter.dpToPx(8), 0, 0, bottomSheetHeight + dimensionConverter.dpToPx(8))
-                setAttributionMargins(dimensionConverter.dpToPx(96), 0, 0, bottomSheetHeight + dimensionConverter.dpToPx(8))
-            }
-
             lifecycleScope.launch {
                 mapboxMap.setStyle(urlMapProvider.getMapUrl()) { style ->
                     mapStyle = style
@@ -175,11 +168,43 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
 
     private fun updateUserListBottomSheet(userLocations: List<UserLiveLocationViewState>) {
         if (userLocations.isEmpty()) {
-            views.bottomSheet.isGone = true
-            // TODO show Live location ended view
+            showEndedLiveBanner()
         } else {
-            views.bottomSheet.isVisible = true
-            bottomSheetController.setData(userLocations)
+            showUserList(userLocations)
+        }
+    }
+
+    private fun showEndedLiveBanner() {
+        views.bottomSheet.isGone = true
+        views.liveLocationMapFragmentEndedBanner.isVisible = true
+        updateCopyrightMargin(bottomOffset = views.liveLocationMapFragmentEndedBanner.height)
+    }
+
+    private fun showUserList(userLocations: List<UserLiveLocationViewState>) {
+        val bottomSheetHeight = BottomSheetBehavior.from(views.bottomSheet).peekHeight
+        updateCopyrightMargin(bottomOffset = bottomSheetHeight)
+        views.bottomSheet.isVisible = true
+        views.liveLocationMapFragmentEndedBanner.isGone = true
+        bottomSheetController.setData(userLocations)
+    }
+
+    private fun updateCopyrightMargin(bottomOffset: Int) {
+        getOrCreateSupportMapFragment().getMapAsync { mapboxMap ->
+            mapboxMap.uiSettings.apply {
+                // Place copyright above the user list bottom sheet
+                setLogoMargins(
+                        dimensionConverter.dpToPx(COPYRIGHT_MARGIN_DP),
+                        0,
+                        0,
+                        bottomOffset + dimensionConverter.dpToPx(COPYRIGHT_MARGIN_DP)
+                )
+                setAttributionMargins(
+                        dimensionConverter.dpToPx(COPYRIGHT_ATTRIBUTION_MARGIN_DP),
+                        0,
+                        0,
+                        bottomOffset + dimensionConverter.dpToPx(COPYRIGHT_MARGIN_DP)
+                )
+            }
         }
     }
 
@@ -285,5 +310,7 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
 
     companion object {
         private const val MAP_FRAGMENT_TAG = "im.vector.app.features.location.live.map"
+        private const val COPYRIGHT_MARGIN_DP = 8
+        private const val COPYRIGHT_ATTRIBUTION_MARGIN_DP = 96
     }
 }
diff --git a/vector/src/main/res/layout/fragment_location_live_map_view.xml b/vector/src/main/res/layout/fragment_location_live_map_view.xml
index 95598db0de..ac8f18479b 100644
--- a/vector/src/main/res/layout/fragment_location_live_map_view.xml
+++ b/vector/src/main/res/layout/fragment_location_live_map_view.xml
@@ -10,7 +10,7 @@
         android:id="@+id/liveLocationPopupAnchor"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center" />
 
     <FrameLayout
         android:id="@+id/liveLocationMapFragmentContainer"
@@ -49,4 +49,13 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <im.vector.app.features.location.live.LocationLiveEndedBannerView
+        android:id="@+id/liveLocationMapFragmentEndedBanner"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_gravity="bottom"
+        android:visibility="gone"
+        app:locLiveEndedBkgWithAlpha="false"
+        tools:visibility="visible" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml b/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml
index d8b04413fe..2cf1eb1787 100644
--- a/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml
@@ -28,8 +28,8 @@
 
     <ImageView
         android:id="@+id/locationLiveStartIcon"
-        android:layout_width="26dp"
-        android:layout_height="26dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:layout_marginVertical="8dp"
         android:layout_marginStart="8dp"
         android:background="@drawable/circle"
diff --git a/vector/src/main/res/layout/view_location_live_ended_banner.xml b/vector/src/main/res/layout/view_location_live_ended_banner.xml
index 2a6036139a..983f268757 100644
--- a/vector/src/main/res/layout/view_location_live_ended_banner.xml
+++ b/vector/src/main/res/layout/view_location_live_ended_banner.xml
@@ -3,22 +3,24 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="48dp"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <ImageView
         android:id="@+id/locationLiveEndedBannerBackground"
         android:layout_width="0dp"
-        android:layout_height="48dp"
+        android:layout_height="0dp"
         android:src="?android:colorBackground"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         tools:ignore="ContentDescription" />
 
     <ImageView
         android:id="@+id/locationLiveEndedBannerIcon"
-        android:layout_width="26dp"
-        android:layout_height="26dp"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
         android:layout_marginVertical="8dp"
         android:layout_marginStart="8dp"
         android:background="@drawable/circle"

From e1ea10e0a22a85523abf932587463d751d7e5174 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 25 Jul 2022 14:17:07 +0200
Subject: [PATCH 06/12] Adding attribute to set the start margin of icon

---
 .../values/stylable_location_live_ended_banner_view.xml  | 1 +
 .../location/live/LocationLiveEndedBannerView.kt         | 9 +++++++++
 .../main/res/layout/fragment_location_live_map_view.xml  | 1 +
 .../item_timeline_event_live_location_inactive_stub.xml  | 3 ++-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml b/library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml
index cd187586e7..81e377d39b 100644
--- a/library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml
+++ b/library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml
@@ -3,6 +3,7 @@
 
     <declare-styleable name="LocationLiveEndedBannerView">
         <attr name="locLiveEndedBkgWithAlpha" format="boolean" />
+        <attr name="locLiveEndedIconMarginStart" format="dimension" />
     </declare-styleable>
 
 </resources>
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
index dc4938fe7a..49d6985840 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
@@ -21,6 +21,7 @@ import android.content.res.TypedArray
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.updateLayoutParams
 import im.vector.app.R
 import im.vector.app.databinding.ViewLocationLiveEndedBannerBinding
 
@@ -44,6 +45,7 @@ class LocationLiveEndedBannerView @JvmOverloads constructor(
         ).run {
             try {
                 setBackgroundAlpha(this)
+                setIconMarginStart(this)
             } finally {
                 recycle()
             }
@@ -54,4 +56,11 @@ class LocationLiveEndedBannerView @JvmOverloads constructor(
         val withAlpha = typedArray.getBoolean(R.styleable.LocationLiveEndedBannerView_locLiveEndedBkgWithAlpha, false)
         binding.locationLiveEndedBannerBackground.alpha = if (withAlpha) 0.75f else 1f
     }
+
+    private fun setIconMarginStart(typedArray: TypedArray) {
+        val margin = typedArray.getDimensionPixelOffset(R.styleable.LocationLiveEndedBannerView_locLiveEndedIconMarginStart, 0)
+        binding.locationLiveEndedBannerIcon.updateLayoutParams<MarginLayoutParams> {
+            marginStart = margin
+        }
+    }
 }
diff --git a/vector/src/main/res/layout/fragment_location_live_map_view.xml b/vector/src/main/res/layout/fragment_location_live_map_view.xml
index ac8f18479b..f0a3fbfc89 100644
--- a/vector/src/main/res/layout/fragment_location_live_map_view.xml
+++ b/vector/src/main/res/layout/fragment_location_live_map_view.xml
@@ -56,6 +56,7 @@
         android:layout_gravity="bottom"
         android:visibility="gone"
         app:locLiveEndedBkgWithAlpha="false"
+        app:locLiveEndedIconMarginStart="16dp"
         tools:visibility="visible" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml b/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
index 074ebf2f86..53b740bb4e 100644
--- a/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
@@ -22,7 +22,8 @@
         app:layout_constraintBottom_toBottomOf="@id/locationLiveInactiveMap"
         app:layout_constraintEnd_toEndOf="@id/locationLiveInactiveMap"
         app:layout_constraintStart_toStartOf="@id/locationLiveInactiveMap"
-        app:locLiveEndedBkgWithAlpha="true" />
+        app:locLiveEndedBkgWithAlpha="true"
+        app:locLiveEndedIconMarginStart="8dp" />
 
     <ImageView
         android:id="@+id/locationLiveInactiveIcon"

From 7509e07df5b9285f8a436486fa79037438068d59 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 25 Jul 2022 14:23:10 +0200
Subject: [PATCH 07/12] Adding changelog entry

---
 changelog.d/6635.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6635.misc

diff --git a/changelog.d/6635.misc b/changelog.d/6635.misc
new file mode 100644
index 0000000000..6546659d11
--- /dev/null
+++ b/changelog.d/6635.misc
@@ -0,0 +1 @@
+[Location Share] - Expanded map state when no more live location shares

From d0a9e9eda084d716a97dc60d5ee0adf61ebc7756 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 25 Jul 2022 14:37:31 +0200
Subject: [PATCH 08/12] Reverting some after rebase changes

---
 .../item_timeline_event_live_location_start_stub.xml |  1 +
 .../res/layout/view_location_live_running_banner.xml | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml b/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml
index 2cf1eb1787..9b44cc495b 100644
--- a/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml
@@ -49,6 +49,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:lines="1"
+        android:ellipsize="end"
         android:text="@string/location_share_live_started"
         android:textColor="?vctr_content_tertiary"
         app:layout_constraintBottom_toBottomOf="@id/locationLiveStartBanner"
diff --git a/vector/src/main/res/layout/view_location_live_running_banner.xml b/vector/src/main/res/layout/view_location_live_running_banner.xml
index 5c8f3a8970..f13696a5c7 100644
--- a/vector/src/main/res/layout/view_location_live_running_banner.xml
+++ b/vector/src/main/res/layout/view_location_live_running_banner.xml
@@ -34,11 +34,15 @@
     <TextView
         android:id="@+id/locationLiveMessageBannerTitle"
         style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
+        android:ellipsize="end"
+        android:lines="1"
         android:textColor="?colorOnSurface"
         app:layout_constraintBottom_toTopOf="@id/locationLiveMessageBannerSubTitle"
+        app:layout_constraintEnd_toStartOf="@id/locationLiveMessageBannerStop"
+        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@id/locationLiveMessageBannerIcon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
@@ -47,10 +51,14 @@
     <TextView
         android:id="@+id/locationLiveMessageBannerSubTitle"
         style="@style/Widget.Vector.TextView.Caption"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:lines="1"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/locationLiveMessageBannerTitle"
+        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="@id/locationLiveMessageBannerTitle"
         app:layout_constraintTop_toBottomOf="@id/locationLiveMessageBannerTitle"
         tools:text="9min left" />

From 4cfb79d56694cc6b56715fedc7041b5d0efb13e1 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 25 Jul 2022 14:49:49 +0200
Subject: [PATCH 09/12] Small renamings to be more consistent

---
 .../timeline/item/MessageLiveLocationItem.kt  |  4 +--
 .../live/LocationLiveRunningBannerView.kt     | 16 +++++------
 .../item_timeline_event_location_stub.xml     |  2 +-
 .../view_location_live_running_banner.xml     | 28 +++++++++----------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
index 03b9a04008..b35b4dff8b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
@@ -26,8 +26,8 @@ import im.vector.app.core.resources.toTimestamp
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
-import im.vector.app.features.location.live.LocationLiveRunningBannerView
 import im.vector.app.features.location.live.LocationLiveMessageBannerViewState
+import im.vector.app.features.location.live.LocationLiveRunningBannerView
 import org.threeten.bp.LocalDateTime
 
 @EpoxyModelClass
@@ -112,7 +112,7 @@ abstract class MessageLiveLocationItem : AbsMessageLocationItem<MessageLiveLocat
     override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageLocationItem.Holder(STUB_ID) {
-        val locationLiveRunningBanner by bind<LocationLiveRunningBannerView>(R.id.locationLiveMessageBanner)
+        val locationLiveRunningBanner by bind<LocationLiveRunningBannerView>(R.id.locationLiveRunningBanner)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt
index 1786ccdb8b..4ca8475da1 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt
@@ -49,16 +49,16 @@ class LocationLiveRunningBannerView @JvmOverloads constructor(
     )
 
     val stopButton: Button
-        get() = binding.locationLiveMessageBannerStop
+        get() = binding.locationLiveRunningBannerStop
 
     private val background: ImageView
-        get() = binding.locationLiveMessageBannerBackground
+        get() = binding.locationLiveRunningBannerBackground
 
     private val title: TextView
-        get() = binding.locationLiveMessageBannerTitle
+        get() = binding.locationLiveRunningBannerTitle
 
     private val subTitle: TextView
-        get() = binding.locationLiveMessageBannerSubTitle
+        get() = binding.locationLiveRunningBannerSubTitle
 
     private var countDownTimer: CountDownTimer? = null
 
@@ -70,7 +70,7 @@ class LocationLiveRunningBannerView @JvmOverloads constructor(
 
         GlideApp.with(context)
                 .load(ColorDrawable(ThemeUtils.getColor(context, android.R.attr.colorBackground)))
-                .placeholder(binding.locationLiveMessageBannerBackground.drawable)
+                .placeholder(binding.locationLiveRunningBannerBackground.drawable)
                 .transform(GranularRoundedCorners(0f, 0f, viewState.bottomEndCornerRadiusInDp, viewState.bottomStartCornerRadiusInDp))
                 .into(background)
     }
@@ -109,14 +109,14 @@ class LocationLiveRunningBannerView @JvmOverloads constructor(
 
             if (viewState.isStopButtonCenteredVertically) {
                 constraintSet.connect(
-                        R.id.locationLiveMessageBannerStop,
+                        R.id.locationLiveRunningBannerStop,
                         ConstraintSet.BOTTOM,
-                        R.id.locationLiveMessageBannerBackground,
+                        R.id.locationLiveRunningBannerBackground,
                         ConstraintSet.BOTTOM,
                         0
                 )
             } else {
-                constraintSet.clear(R.id.locationLiveMessageBannerStop, ConstraintSet.BOTTOM)
+                constraintSet.clear(R.id.locationLiveRunningBannerStop, ConstraintSet.BOTTOM)
             }
 
             constraintSet.applyTo(parentLayout)
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 54de86e57f..3875a25773 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
@@ -46,7 +46,7 @@
         tools:visibility="visible" />
 
     <im.vector.app.features.location.live.LocationLiveRunningBannerView
-        android:id="@+id/locationLiveMessageBanner"
+        android:id="@+id/locationLiveRunningBanner"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/view_location_live_running_banner.xml b/vector/src/main/res/layout/view_location_live_running_banner.xml
index f13696a5c7..5bf8c8258d 100644
--- a/vector/src/main/res/layout/view_location_live_running_banner.xml
+++ b/vector/src/main/res/layout/view_location_live_running_banner.xml
@@ -7,7 +7,7 @@
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <ImageView
-        android:id="@+id/locationLiveMessageBannerBackground"
+        android:id="@+id/locationLiveRunningBannerBackground"
         android:layout_width="0dp"
         android:layout_height="50dp"
         android:alpha="0.75"
@@ -18,7 +18,7 @@
         tools:ignore="ContentDescription" />
 
     <ImageView
-        android:id="@+id/locationLiveMessageBannerIcon"
+        android:id="@+id/locationLiveRunningBannerIcon"
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginHorizontal="8dp"
@@ -26,13 +26,13 @@
         android:backgroundTint="?vctr_live_location"
         android:padding="3dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/locationLiveMessageBannerBackground"
+        app:layout_constraintStart_toStartOf="@id/locationLiveRunningBannerBackground"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_attachment_location_live_white"
         tools:ignore="ContentDescription" />
 
     <TextView
-        android:id="@+id/locationLiveMessageBannerTitle"
+        android:id="@+id/locationLiveRunningBannerTitle"
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -40,16 +40,16 @@
         android:ellipsize="end"
         android:lines="1"
         android:textColor="?colorOnSurface"
-        app:layout_constraintBottom_toTopOf="@id/locationLiveMessageBannerSubTitle"
-        app:layout_constraintEnd_toStartOf="@id/locationLiveMessageBannerStop"
+        app:layout_constraintBottom_toTopOf="@id/locationLiveRunningBannerSubTitle"
+        app:layout_constraintEnd_toStartOf="@id/locationLiveRunningBannerStop"
         app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/locationLiveMessageBannerIcon"
+        app:layout_constraintStart_toEndOf="@id/locationLiveRunningBannerIcon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@string/location_share_live_enabled" />
 
     <TextView
-        android:id="@+id/locationLiveMessageBannerSubTitle"
+        android:id="@+id/locationLiveRunningBannerSubTitle"
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -57,19 +57,19 @@
         android:lines="1"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveMessageBannerTitle"
+        app:layout_constraintEnd_toEndOf="@id/locationLiveRunningBannerTitle"
         app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="@id/locationLiveMessageBannerTitle"
-        app:layout_constraintTop_toBottomOf="@id/locationLiveMessageBannerTitle"
+        app:layout_constraintStart_toStartOf="@id/locationLiveRunningBannerTitle"
+        app:layout_constraintTop_toBottomOf="@id/locationLiveRunningBannerTitle"
         tools:text="9min left" />
 
     <Button
-        android:id="@+id/locationLiveMessageBannerStop"
+        android:id="@+id/locationLiveRunningBannerStop"
         style="@style/Widget.Vector.Button.Text.LocationLive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/location_share_live_stop"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveMessageBannerBackground"
+        app:layout_constraintBottom_toBottomOf="@id/locationLiveRunningBannerBackground"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/locationLiveMessageBannerBackground" />
+        app:layout_constraintTop_toTopOf="@id/locationLiveRunningBannerBackground" />
 </merge>

From d62cf70b8c01496cc07acca12b57f41b2d7b9e1a Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 27 Jul 2022 09:58:52 +0200
Subject: [PATCH 10/12] Add usage of TypedArray.use when possible

---
 .../vector/app/features/location/MapTilerMapView.kt   |  9 +++------
 .../location/live/LocationLiveEndedBannerView.kt      | 11 ++++-------
 .../location/option/LocationSharingOptionView.kt      | 11 ++++-------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
index 1f9cb44c91..cc41ff696f 100644
--- a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
@@ -22,6 +22,7 @@ import android.util.AttributeSet
 import android.view.Gravity
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.use
 import androidx.core.view.marginBottom
 import androidx.core.view.marginTop
 import androidx.core.view.updateLayoutParams
@@ -65,12 +66,8 @@ class MapTilerMapView @JvmOverloads constructor(
                 R.styleable.MapTilerMapView,
                 0,
                 0
-        ).run {
-            try {
-                setLocateButtonVisibility(this)
-            } finally {
-                recycle()
-            }
+        ).use {
+            setLocateButtonVisibility(it)
         }
         dimensionConverter = DimensionConverter(resources)
     }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
index 49d6985840..e2b4936f6e 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
@@ -21,6 +21,7 @@ import android.content.res.TypedArray
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
 import androidx.core.view.updateLayoutParams
 import im.vector.app.R
 import im.vector.app.databinding.ViewLocationLiveEndedBannerBinding
@@ -42,13 +43,9 @@ class LocationLiveEndedBannerView @JvmOverloads constructor(
                 R.styleable.LocationLiveEndedBannerView,
                 0,
                 0
-        ).run {
-            try {
-                setBackgroundAlpha(this)
-                setIconMarginStart(this)
-            } finally {
-                recycle()
-            }
+        ).use {
+            setBackgroundAlpha(it)
+            setIconMarginStart(it)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt
index d11ff00261..63dd8c9744 100644
--- a/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt
@@ -24,6 +24,7 @@ import android.widget.ImageView
 import androidx.annotation.ColorInt
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import androidx.core.content.res.use
 import androidx.core.view.setPadding
 import im.vector.app.R
 import im.vector.app.core.extensions.tintBackground
@@ -50,13 +51,9 @@ class LocationSharingOptionView @JvmOverloads constructor(
                 R.styleable.LocationSharingOptionView,
                 0,
                 0
-        ).run {
-            try {
-                setIcon(this)
-                setTitle(this)
-            } finally {
-                recycle()
-            }
+        ).use {
+            setIcon(it)
+            setTitle(it)
         }
     }
 

From 47960c0dfd11c5bc93876aacbe4942f91e261d78 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 27 Jul 2022 10:29:14 +0200
Subject: [PATCH 11/12] Use const to define banner background alpha

---
 .../app/features/location/live/LocationLiveEndedBannerView.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
index e2b4936f6e..7a2671d800 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
@@ -26,6 +26,8 @@ import androidx.core.view.updateLayoutParams
 import im.vector.app.R
 import im.vector.app.databinding.ViewLocationLiveEndedBannerBinding
 
+private const val BACKGROUND_ALPHA = 0.75f
+
 class LocationLiveEndedBannerView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
@@ -51,7 +53,7 @@ class LocationLiveEndedBannerView @JvmOverloads constructor(
 
     private fun setBackgroundAlpha(typedArray: TypedArray) {
         val withAlpha = typedArray.getBoolean(R.styleable.LocationLiveEndedBannerView_locLiveEndedBkgWithAlpha, false)
-        binding.locationLiveEndedBannerBackground.alpha = if (withAlpha) 0.75f else 1f
+        binding.locationLiveEndedBannerBackground.alpha = if (withAlpha) BACKGROUND_ALPHA else 1f
     }
 
     private fun setIconMarginStart(typedArray: TypedArray) {

From 0750e80f04918b9a0e4649193a69be805cd032c9 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 27 Jul 2022 11:04:14 +0200
Subject: [PATCH 12/12] Use context.obtainStyledAttributes instead of
 context.theme.obtainStyledAttributes

---
 .../java/im/vector/app/features/location/MapTilerMapView.kt     | 2 +-
 .../app/features/location/live/LocationLiveEndedBannerView.kt   | 2 +-
 .../app/features/location/option/LocationSharingOptionView.kt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
index cc41ff696f..491386ba64 100644
--- a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
@@ -61,7 +61,7 @@ class MapTilerMapView @JvmOverloads constructor(
     private var dimensionConverter: DimensionConverter? = null
 
     init {
-        context.theme.obtainStyledAttributes(
+        context.obtainStyledAttributes(
                 attrs,
                 R.styleable.MapTilerMapView,
                 0,
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
index 7a2671d800..82fa17a625 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
@@ -40,7 +40,7 @@ class LocationLiveEndedBannerView @JvmOverloads constructor(
     )
 
     init {
-        context.theme.obtainStyledAttributes(
+        context.obtainStyledAttributes(
                 attrs,
                 R.styleable.LocationLiveEndedBannerView,
                 0,
diff --git a/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt
index 63dd8c9744..a4bc694aaf 100644
--- a/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/option/LocationSharingOptionView.kt
@@ -46,7 +46,7 @@ class LocationSharingOptionView @JvmOverloads constructor(
     )
 
     init {
-        context.theme.obtainStyledAttributes(
+        context.obtainStyledAttributes(
                 attrs,
                 R.styleable.LocationSharingOptionView,
                 0,