Merge commit '80bda1906235b6007b98f18fb13681fff587f4a3' into feature/basis_update_192

# Conflicts: # Config/AppVersion.xcconfig # Config/BuildSettings.swift # DesignKit/Source/ColorsSwiftUI.swift # DesignKit/Source/FontsSwiftUI.swift # DesignKit/Source/ThemeV2.swift # DesignKit/Variants/Colors/Dark/DarkColors.swift # DesignKit/Variants/Colors/Light/LightColors.swift # Podfile.lock # Riot/Assets/de.lproj/InfoPlist.strings # Riot/Assets/de.lproj/Vector.strings # Riot/Assets/en.lproj/Vector.strings # Riot/Generated/Images.swift # Riot/Generated/Strings.swift # Riot/Managers/PushNotification/PushNotificationService.m # Riot/Managers/Settings/RiotSettings.swift # Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h # Riot/Modules/Common/Recents/RecentsViewController.m # Riot/Modules/Communities/Home/GroupHomeViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/SetPinCode/PinCodePreferences.swift # Riot/Modules/Settings/SettingsViewController.m # Riot/Modules/TabBar/MasterTabBarController.h # Riot/Modules/TabBar/MasterTabBarController.m # Riot/Modules/TabBar/TabBarCoordinator.swift # fastlane/Fastfile # project.yml
2026-04-29 04:36:58 +02:00 · 2022-09-19 14:42:25 +02:00
parent 668bd65af3 80bda19062
commit 09a0f6334c
508 changed files with 12777 additions and 9549 deletions
@@ -0,0 +1,97 @@
+// 
+// Copyright 2021 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.
+//
+
+import SwiftUI
+
+struct StaticLocationView: View {
+
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    @Environment(\.theme) private var theme
+    
+    // MARK: Public
+    
+    @ObservedObject var viewModel: StaticLocationViewingViewModel.Context
+    
+    // MARK: Views
+    
+    var body: some View {
+        NavigationView {
+            ZStack(alignment: .bottom) {
+                LocationSharingMapView(tileServerMapURL: viewModel.viewState.mapStyleURL,
+                                       annotations: [viewModel.viewState.sharedAnnotation],
+                                       highlightedAnnotation: viewModel.viewState.sharedAnnotation,
+                                       userAvatarData: viewModel.viewState.userAvatarData,
+                                       showsUserLocation: false,
+                                       userLocation: Binding.constant(nil),
+                                       mapCenterCoordinate: Binding.constant(nil),
+                                       errorSubject: viewModel.viewState.errorSubject)
+                MapCreditsView()
+            }
+            .ignoresSafeArea(.all, edges: [.bottom])
+            .toolbar {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    Button(VectorL10n.cancel, action: {
+                        viewModel.send(viewAction: .close)
+                    })
+                }
+                ToolbarItem(placement: .principal) {
+                    Text(VectorL10n.locationSharingTitle)
+                        .font(.headline)
+                        .foregroundColor(theme.colors.primaryContent)
+                }
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button {
+                        viewModel.send(viewAction: .share)
+                    } label: {
+                        Image(uiImage: Asset.Images.locationShareIcon.image)
+                    }
+                    .disabled(!viewModel.viewState.shareButtonEnabled)
+                    .accessibilityIdentifier("shareButton")
+                    .opacity(BwiBuildSettings.bwiLocationShareButtonVisible ? 1.0 : 0.0)
+                }
+            }
+            .navigationBarTitleDisplayMode(.inline)
+            .introspectNavigationController { navigationController in
+                ThemeService.shared().theme.applyStyle(onNavigationBar: navigationController.navigationBar)
+            }
+            .alert(item: $viewModel.alertInfo) { info in
+                info.alert
+            }
+        }
+        .accentColor(theme.colors.accent)
+        .activityIndicator(show: viewModel.viewState.showLoadingIndicator)
+        .navigationViewStyle(StackNavigationViewStyle())
+    }
+    
+    @ViewBuilder
+    private var activityIndicator: some View {
+        if viewModel.viewState.showLoadingIndicator {
+            ActivityIndicator()
+        }
+    }
+}
+
+// MARK: - Previews
+
+struct StaticLocationSharingViewer_Previews: PreviewProvider {
+    static let stateRenderer = MockStaticLocationViewingScreenState.stateRenderer
+    static var previews: some View {
+        stateRenderer.screenGroup()
+    }
+}