From cda100e596f99dd4956c6eaf34cf90ad90561862 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 13 Jul 2022 16:21:12 +0200
Subject: [PATCH 1/2] Using same string key for stop + fix insets in button
 styles

---
 .../src/main/res/values/styles_location.xml       | 15 ++++++++++++---
 .../item_live_location_users_bottom_sheet.xml     |  3 +--
 .../layout/view_location_live_message_banner.xml  | 10 +++++-----
 .../main/res/layout/view_location_live_status.xml |  2 +-
 vector/src/main/res/values/strings.xml            |  3 ++-
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/library/ui-styles/src/main/res/values/styles_location.xml b/library/ui-styles/src/main/res/values/styles_location.xml
index 6777450a63..41ddbc73ca 100644
--- a/library/ui-styles/src/main/res/values/styles_location.xml
+++ b/library/ui-styles/src/main/res/values/styles_location.xml
@@ -5,8 +5,11 @@
         <item name="android:foreground">?selectableItemBackground</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:textSize">12sp</item>
-        <item name="android:padding">0dp</item>
         <item name="android:gravity">center</item>
+        <item name="android:padding">0dp</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:insetRight">8dp</item>
+        <item name="android:insetLeft">8dp</item>
     </style>
 
     <style name="Widget.Vector.Button.Text.LocationLive">
@@ -14,8 +17,11 @@
         <item name="android:background">@android:color/transparent</item>
         <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
         <item name="android:textColor">?colorError</item>
-        <item name="android:padding">0dp</item>
         <item name="android:gravity">center</item>
+        <item name="android:padding">0dp</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:insetRight">12dp</item>
+        <item name="android:insetLeft">12dp</item>
     </style>
 
     <style name="TextAppearance.Vector.Body.BottomSheetDisplayName">
@@ -36,8 +42,11 @@
         <item name="android:background">@android:color/transparent</item>
         <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
         <item name="android:textColor">?colorError</item>
-        <item name="android:padding">0dp</item>
         <item name="android:gravity">center</item>
+        <item name="android:padding">0dp</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:insetRight">16dp</item>
+        <item name="android:insetLeft">16dp</item>
     </style>
 
     <style name="Widget.Vector.TextView.Nano.Copyright">
diff --git a/vector/src/main/res/layout/item_live_location_users_bottom_sheet.xml b/vector/src/main/res/layout/item_live_location_users_bottom_sheet.xml
index 73023ceae5..7011cbd86b 100644
--- a/vector/src/main/res/layout/item_live_location_users_bottom_sheet.xml
+++ b/vector/src/main/res/layout/item_live_location_users_bottom_sheet.xml
@@ -52,8 +52,7 @@
         style="@style/Widget.Vector.Button.Text.BottomSheetStopSharing"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:text="@string/live_location_bottom_sheet_stop_sharing"
+        android:text="@string/location_share_live_stop"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
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
index 35924541d1..5c8f3a8970 100644
--- a/vector/src/main/res/layout/view_location_live_message_banner.xml
+++ b/vector/src/main/res/layout/view_location_live_message_banner.xml
@@ -37,12 +37,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="8dp"
-        tools:text="@string/location_share_live_enabled"
         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" />
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@string/location_share_live_enabled" />
 
     <TextView
         android:id="@+id/locationLiveMessageBannerSubTitle"
@@ -58,10 +58,10 @@
     <Button
         android:id="@+id/locationLiveMessageBannerStop"
         style="@style/Widget.Vector.Button.Text.LocationLive"
-        android:layout_width="45dp"
-        android:layout_height="30dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:text="@string/location_share_live_stop"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="@id/locationLiveMessageBannerBackground"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/locationLiveMessageBannerBackground" />
 </merge>
diff --git a/vector/src/main/res/layout/view_location_live_status.xml b/vector/src/main/res/layout/view_location_live_status.xml
index c125759d53..4274b6788a 100644
--- a/vector/src/main/res/layout/view_location_live_status.xml
+++ b/vector/src/main/res/layout/view_location_live_status.xml
@@ -40,7 +40,7 @@
     <Button
         android:id="@+id/locationLiveStatusStop"
         style="@style/Widget.Vector.Button.Text.OnPrimary.LocationLive"
-        android:layout_width="60dp"
+        android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:text="@string/location_share_live_stop"
         app:layout_constraintBottom_toBottomOf="@id/locationLiveStatusContainer"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index eed6269e65..a6a5dd58f5 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3047,7 +3047,8 @@
     <string name="live_location_sharing_notification_description">Location sharing is in progress</string>
     <string name="labs_enable_live_location">Enable Live Location Sharing</string>
     <string name="labs_enable_live_location_summary">Temporary implementation: locations persist in room history</string>
-    <string name="live_location_bottom_sheet_stop_sharing">Stop sharing</string>
+    <!-- TODO remove key -->
+    <string name="live_location_bottom_sheet_stop_sharing" tools:ignore="UnusedResources">Stop sharing</string>
     <string name="live_location_bottom_sheet_last_updated_at">Updated %1$s ago</string>
 
     <string name="message_bubbles">Show Message bubbles</string>

From cedeb8fa505bf74ae2534b8adc0a20dd3d5e660d Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 13 Jul 2022 16:31:26 +0200
Subject: [PATCH 2/2] Adding changelog entry

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

diff --git a/changelog.d/6541.misc b/changelog.d/6541.misc
new file mode 100644
index 0000000000..452079dc9f
--- /dev/null
+++ b/changelog.d/6541.misc
@@ -0,0 +1 @@
+[Location Share] - Standardise "Stop" texts for live