From 70c9c8a21de5dcaf9f16e16089811840cb178833 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL Date: Fri, 22 Jul 2022 11:43:38 +0200 Subject: [PATCH 1/3] Navigate to location live map when tapping the live status bar in timeline --- .../vector/app/features/home/room/detail/TimelineFragment.kt | 3 +++ .../app/features/location/live/LocationLiveStatusView.kt | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index 562f2d4aea..c32f2fe916 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -859,6 +859,9 @@ class TimelineFragment @Inject constructor( views.locationLiveStatusIndicator.stopButton.debouncedClicks { timelineViewModel.handle(RoomDetailAction.StopLiveLocationSharing) } + views.locationLiveStatusIndicator.root.debouncedClicks { + navigateToLocationLiveMap() + } } private fun joinJitsiRoom(jitsiWidget: Widget, enableVideo: Boolean) { diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt index a4c58c9e5b..ac7519918c 100644 --- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt +++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt @@ -19,6 +19,7 @@ package im.vector.app.features.location.live import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import android.view.View import android.widget.Button import androidx.constraintlayout.widget.ConstraintLayout import im.vector.app.databinding.ViewLocationLiveStatusBinding @@ -34,6 +35,9 @@ class LocationLiveStatusView @JvmOverloads constructor( this ) + val root: View + get() = binding.root + val stopButton: Button get() = binding.locationLiveStatusStop } From 03ebad14c444a804eb4b4ebbe3c7e3d716838b60 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL Date: Fri, 22 Jul 2022 11:50:23 +0200 Subject: [PATCH 2/3] Adding changelog entry --- changelog.d/6625.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6625.misc diff --git a/changelog.d/6625.misc b/changelog.d/6625.misc new file mode 100644 index 0000000000..68a58c38fa --- /dev/null +++ b/changelog.d/6625.misc @@ -0,0 +1 @@ +[Location sharing] - OnTap on the top live status bar, display the expanded map view From 989c2ee967a25860d74427ae4ab39ff73f3560d1 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL Date: Mon, 25 Jul 2022 15:37:11 +0200 Subject: [PATCH 3/3] Removing non necessary root binding --- .../vector/app/features/home/room/detail/TimelineFragment.kt | 2 +- .../app/features/location/live/LocationLiveStatusView.kt | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index c32f2fe916..4abc48feca 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -859,7 +859,7 @@ class TimelineFragment @Inject constructor( views.locationLiveStatusIndicator.stopButton.debouncedClicks { timelineViewModel.handle(RoomDetailAction.StopLiveLocationSharing) } - views.locationLiveStatusIndicator.root.debouncedClicks { + views.locationLiveStatusIndicator.debouncedClicks { navigateToLocationLiveMap() } } diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt index ac7519918c..a4c58c9e5b 100644 --- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt +++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt @@ -19,7 +19,6 @@ package im.vector.app.features.location.live import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater -import android.view.View import android.widget.Button import androidx.constraintlayout.widget.ConstraintLayout import im.vector.app.databinding.ViewLocationLiveStatusBinding @@ -35,9 +34,6 @@ class LocationLiveStatusView @JvmOverloads constructor( this ) - val root: View - get() = binding.root - val stopButton: Button get() = binding.locationLiveStatusStop }