Add option to find own location in map views

RiotSwiftUI/Modules/LocationSharing/LiveLocationSharingViewer/LiveLocationSharingViewerModels.swift

@@ -44,6 +44,8 @@ struct LiveLocationSharingViewerViewState: BindableState {
 
     var showLoadingIndicator = false
 
+    var isSharingOwnLocation: Bool
+
     var shareButtonEnabled: Bool {
         !showLoadingIndicator
     }

RiotSwiftUI/Modules/LocationSharing/LiveLocationSharingViewer/LiveLocationSharingViewerViewModel.swift

@@ -42,7 +42,7 @@ class LiveLocationSharingViewerViewModel: LiveLocationSharingViewerViewModelType
     // MARK: - Setup
 
     init(mapStyleURL: URL, service: LiveLocationSharingViewerServiceProtocol) {
-        let viewState = LiveLocationSharingViewerViewState(mapStyleURL: mapStyleURL, annotations: [], highlightedAnnotation: nil, listItemsViewData: [])
+        let viewState = LiveLocationSharingViewerViewState(mapStyleURL: mapStyleURL, annotations: [], highlightedAnnotation: nil, listItemsViewData: [], isSharingOwnLocation: false)
 
         liveLocationSharingViewerService = service
         mapViewErrorAlertInfoBuilder = MapViewErrorAlertInfoBuilder()
@@ -198,6 +198,7 @@ class LiveLocationSharingViewerViewModel: LiveLocationSharingViewerViewModelType
         state.annotations = annotations
         state.highlightedAnnotation = highlightedAnnotation
         state.listItemsViewData = listViewItems
+        state.isSharingOwnLocation = annotations.first { liveLocationSharingViewerService.isCurrentUserId($0.userId) } != nil
     }
 
     private func highlighAnnotation(with userId: String) {

RiotSwiftUI/Modules/LocationSharing/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift

@@ -27,6 +27,7 @@ struct LiveLocationSharingViewer: View {
     @Environment(\.openURL) var openURL
 
     @State private var isBottomSheetExpanded = false
+    @State private var showsUserLocation = false
 
     var bottomSheetCollapsedHeight: CGFloat = 150.0
 
@@ -41,7 +42,7 @@ struct LiveLocationSharingViewer: View {
                                        annotations: viewModel.viewState.annotations,
                                        highlightedAnnotation: viewModel.viewState.highlightedAnnotation,
                                        userAvatarData: nil,
-                                       showsUserLocation: false,
+                                       showsUserLocation: showsUserLocation,
                                        userAnnotationCanShowCallout: true,
                                        userLocation: Binding.constant(nil),
                                        mapCenterCoordinate: Binding.constant(nil),
@@ -105,6 +106,16 @@ struct LiveLocationSharingViewer: View {
                     viewModel.send(viewAction: .done)
                 }
             }
+            ToolbarItemGroup(placement: .navigationBarTrailing) {
+                if !viewModel.viewState.isSharingOwnLocation {
+                    Button {
+                        showsUserLocation = true
+                    } label: {
+                        // TODO: Replace icon
+                        Image(uiImage: Asset.Images.locationPinIcon.image)
+                    }
+                }
+            }
         }
         .accentColor(theme.colors.accent)
         .background(theme.colors.system.ignoresSafeArea())

RiotSwiftUI/Modules/LocationSharing/StaticLocationSharingViewer/View/StaticLocationView.swift

@@ -27,6 +27,8 @@ struct StaticLocationView: View {
 
     @ObservedObject var viewModel: StaticLocationViewingViewModel.Context
 
+    @State private var showsUserLocation = false
+
     // MARK: Views
 
     var body: some View {
@@ -36,7 +38,7 @@ struct StaticLocationView: View {
                                        annotations: [viewModel.viewState.sharedAnnotation],
                                        highlightedAnnotation: viewModel.viewState.sharedAnnotation,
                                        userAvatarData: viewModel.viewState.userAvatarData,
-                                       showsUserLocation: false,
+                                       showsUserLocation: showsUserLocation,
                                        userLocation: Binding.constant(nil),
                                        mapCenterCoordinate: Binding.constant(nil),
                                        errorSubject: viewModel.viewState.errorSubject)
@@ -54,6 +56,14 @@ struct StaticLocationView: View {
                         .font(.headline)
                         .foregroundColor(theme.colors.primaryContent)
                 }
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button {
+                        showsUserLocation = true
+                    } label: {
+                        // TODO: Replace icon
+                        Image(uiImage: Asset.Images.locationPinIcon.image)
+                    }
+                }
                 ToolbarItem(placement: .navigationBarTrailing) {
                     Button {
                         viewModel.send(viewAction: .share)

changelog.d/pr-7337.change

@@ -0,0 +1 @@
+Add option to find own location in map views