merged element-ios 1.10.5 into 4409_basis_update_1_10_5

2026-04-22 09:32:52 +02:00 · 2023-03-16 12:19:26 +01:00
parent a3c2375aa8 e9c58d1573
commit e5d97ed154
168 changed files with 2451 additions and 850 deletions
@@ -31,6 +31,17 @@ struct StaticLocationView: View {
    
    // MARK: Views
    
+    var mapView: LocationSharingMapView {
+        LocationSharingMapView(tileServerMapURL: viewModel.viewState.mapStyleURL,
+                               annotations: [viewModel.viewState.sharedAnnotation],
+                               highlightedAnnotation: viewModel.viewState.sharedAnnotation,
+                               userAvatarData: nil,
+                               showsUserLocationMode: viewModel.viewState.showsUserLocationMode,
+                               userLocation: Binding.constant(nil),
+                               mapCenterCoordinate: Binding.constant(nil),
+                               errorSubject: viewModel.viewState.errorSubject)
+    }
+    
    var body: some View {
        NavigationView {
            ZStack(alignment: .bottom) {
@@ -52,6 +63,9 @@ struct StaticLocationView: View {
                    }).sheet
                }
            }
+            .overlay(CenterToUserLocationButton(action: {
+                viewModel.send(viewAction: .showUserLocation)
+            }).offset(x: -11.0, y: 52), alignment: .topTrailing)
            .ignoresSafeArea(.all, edges: [.bottom])
            .toolbar {
                ToolbarItem(placement: .navigationBarLeading) {