5982: Apply PR comments

2026-04-25 19:10:49 +02:00 · 2022-04-12 11:35:17 +02:00
parent 9b859eac41
commit ec0fcd70cc
10 changed files with 70 additions and 76 deletions
@@ -19,23 +19,22 @@ import UIKit
 import SwiftUI
 import MatrixSDK

-struct StaticLocationSharingViewerCoordinatorParameters {
-    let roomDataSource: MXKRoomDataSource
+struct StaticLocationViewingCoordinatorParameters {
    let mediaManager: MXMediaManager
    let avatarData: AvatarInputProtocol
    let location: CLLocationCoordinate2D
    let coordinateType: LocationSharingCoordinateType
 }

-final class StaticLocationSharingViewerCoordinator: Coordinator, Presentable {
+final class StaticLocationViewingCoordinator: Coordinator, Presentable {
    
    // MARK: - Properties
    
    // MARK: Private
    
-    private let parameters: StaticLocationSharingViewerCoordinatorParameters
-    private let staticLocationSharingViewerHostingController: UIViewController
-    private var staticLocationSharingViewerViewModel: StaticLocationSharingViewerViewModelProtocol
+    private let parameters: StaticLocationViewingCoordinatorParameters
+    private let staticLocationViewingHostingController: UIViewController
+    private var staticLocationViewingViewModel: StaticLocationViewingViewModelProtocol
    
    private let shareLocationActivityControllerBuilder = ShareLocationActivityControllerBuilder()
    
@@ -48,22 +47,23 @@ final class StaticLocationSharingViewerCoordinator: Coordinator, Presentable {
    // MARK: - Setup
    
    @available(iOS 14.0, *)
-    init(parameters: StaticLocationSharingViewerCoordinatorParameters) {
+    init(parameters: StaticLocationViewingCoordinatorParameters) {
        self.parameters = parameters
        
-        let viewModel = StaticLocationSharingViewerViewModel(mapStyleURL: BuildSettings.tileServerMapStyleURL,
+        let viewModel = StaticLocationViewingViewModel(mapStyleURL: BuildSettings.tileServerMapStyleURL,
                                                             avatarData: parameters.avatarData,
                                                             location: parameters.location,
                                                             coordinateType: parameters.coordinateType)
-        let view = StaticLocationSharingViewer(viewModel: viewModel.context)
-        staticLocationSharingViewerViewModel = viewModel
-        staticLocationSharingViewerHostingController = VectorHostingController(rootView: view)
+        let view = StaticLocationView(viewModel: viewModel.context)
+            .addDependency(AvatarService.instantiate(mediaManager: parameters.mediaManager))
+        staticLocationViewingViewModel = viewModel
+        staticLocationViewingHostingController = VectorHostingController(rootView: view)
    }
    
    // MARK: - Public
    func start() {
        MXLog.debug("[StaticLocationSharingViewerCoordinator] did start.")
-        staticLocationSharingViewerViewModel.completion = { [weak self] result in
+        staticLocationViewingViewModel.completion = { [weak self] result in
            guard let self = self else { return }
            MXLog.debug("[StaticLocationSharingViewerCoordinator] StaticLocationSharingViewerViewModel did complete with result: \(result).")
            switch result {
@@ -76,13 +76,13 @@ final class StaticLocationSharingViewerCoordinator: Coordinator, Presentable {
    }
    
    func toPresentable() -> UIViewController {
-        return self.staticLocationSharingViewerHostingController
+        return self.staticLocationViewingHostingController
    }
    
    func presentLocationActivityController(with coordinate: CLLocationCoordinate2D) {
        
        let shareActivityController = shareLocationActivityControllerBuilder.build(with: coordinate)
        
-        self.staticLocationSharingViewerHostingController.present(shareActivityController, animated: true)
+        self.staticLocationViewingHostingController.present(shareActivityController, animated: true)
    }
 }
@@ -21,7 +21,7 @@ import CoreLocation
 /// Using an enum for the screen allows you define the different state cases with
 /// the relevant associated data for each case.
@available(iOS 14.0, *)
-enum MockStaticLocationSharingViewerScreenState: MockScreenState, CaseIterable {
+enum MockStaticLocationViewingScreenState: MockScreenState, CaseIterable {
    // A case for each state you want to represent
    // with specific, minimal associated data that will allow you
    // mock that screen.
@@ -30,11 +30,11 @@ enum MockStaticLocationSharingViewerScreenState: MockScreenState, CaseIterable {
    
    /// The associated screen
    var screenType: Any.Type {
-        StaticLocationSharingViewer.self
+        StaticLocationView.self
    }
    
    /// A list of screen state definitions
-    static var allCases: [MockStaticLocationSharingViewerScreenState] {
+    static var allCases: [MockStaticLocationViewingScreenState] {
        return [.showUserLocation, .showPinLocation]
    }
    
@@ -44,13 +44,13 @@ enum MockStaticLocationSharingViewerScreenState: MockScreenState, CaseIterable {
        let coordinateType: LocationSharingCoordinateType = self == .showUserLocation ? .user : .pin
        
        let mapStyleURL = URL(string: "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx")!
-        let viewModel = StaticLocationSharingViewerViewModel(mapStyleURL: mapStyleURL,
-                                                             avatarData: AvatarInput(mxContentUri: "", matrixItemId: "alice:matrix.org", displayName: "Alice"),
-                                                             location: location,
-                                                             coordinateType: coordinateType)
+        let viewModel = StaticLocationViewingViewModel(mapStyleURL: mapStyleURL,
+                                                       avatarData: AvatarInput(mxContentUri: "", matrixItemId: "alice:matrix.org", displayName: "Alice"),
+                                                       location: location,
+                                                       coordinateType: coordinateType)
        
        return ([viewModel],
-                AnyView(StaticLocationSharingViewer(viewModel: viewModel.context)
+                AnyView(StaticLocationView(viewModel: viewModel.context)
                            .addDependency(MockAvatarService.example))
        )
    }
@@ -20,12 +20,12 @@ import CoreLocation

 // MARK: View model

-enum StaticLocationSharingViewerViewAction {
+enum StaticLocationViewingViewAction {
    case cancel
    case share
 }

-enum StaticLocationSharingViewerViewModelResult {
+enum StaticLocationViewingViewModelResult {
    case cancel
    case share(_ coordinate: CLLocationCoordinate2D)
 }
@@ -33,7 +33,7 @@ enum StaticLocationSharingViewerViewModelResult {
 // MARK: View

@available(iOS 14, *)
-struct StaticLocationSharingViewerViewState: BindableState {
+struct StaticLocationViewingViewState: BindableState {
    
    /// Map style URL
    let mapStyleURL: URL
@@ -52,9 +52,9 @@ struct StaticLocationSharingViewerViewState: BindableState {

    let errorSubject = PassthroughSubject<LocationSharingViewError, Never>()
    
-    var bindings = StaticLocationSharingViewerViewBindings()
+    var bindings = StaticLocationViewingViewBindings()
 }

-struct StaticLocationSharingViewerViewBindings {
+struct StaticLocationViewingViewBindings {
    var alertInfo: AlertInfo<LocationSharingAlertType>?
 }
@@ -18,11 +18,11 @@ import SwiftUI
 import CoreLocation

@available(iOS 14, *)
-typealias StaticLocationSharingViewerViewModelType = StateStoreViewModel<StaticLocationSharingViewerViewState,
+typealias StaticLocationViewingViewModelType = StateStoreViewModel<StaticLocationViewingViewState,
                                                                  Never,
-                                                                  StaticLocationSharingViewerViewAction>
+                                                                   StaticLocationViewingViewAction>
@available(iOS 14, *)
-class StaticLocationSharingViewerViewModel: StaticLocationSharingViewerViewModelType, StaticLocationSharingViewerViewModelProtocol {
+class StaticLocationViewingViewModel: StaticLocationViewingViewModelType, StaticLocationViewingViewModelProtocol {

    // MARK: - Properties

@@ -31,11 +31,11 @@ class StaticLocationSharingViewerViewModel: StaticLocationSharingViewerViewModel
    private var mapViewErrorAlertInfoBuilder: MapViewErrorAlertInfoBuilder

    // MARK: Public
-
-    var completion: ((StaticLocationSharingViewerViewModelResult) -> Void)?
-
+    
+    var completion: ((StaticLocationViewingViewModelResult) -> Void)?
+    
    // MARK: - Setup
-
+    
    init(mapStyleURL: URL, avatarData: AvatarInputProtocol, location: CLLocationCoordinate2D, coordinateType: LocationSharingCoordinateType) {
        let sharedAnnotation: LocationAnnotation
        switch coordinateType {
@@ -45,9 +45,9 @@ class StaticLocationSharingViewerViewModel: StaticLocationSharingViewerViewModel
            sharedAnnotation = PinLocationAnnotation(coordinate: location)
        }
        
-        let viewState = StaticLocationSharingViewerViewState(mapStyleURL: mapStyleURL,
-                                                             userAvatarData: avatarData,
-                                                             sharedAnnotation: sharedAnnotation)
+        let viewState = StaticLocationViewingViewState(mapStyleURL: mapStyleURL,
+                                                       userAvatarData: avatarData,
+                                                       sharedAnnotation: sharedAnnotation)
        
        mapViewErrorAlertInfoBuilder = MapViewErrorAlertInfoBuilder()
        
@@ -61,7 +61,7 @@ class StaticLocationSharingViewerViewModel: StaticLocationSharingViewerViewModel

    // MARK: - Public

-    override func process(viewAction: StaticLocationSharingViewerViewAction) {
+    override func process(viewAction: StaticLocationViewingViewAction) {
        switch viewAction {
        case .cancel:
            completion?(.cancel)
@@ -78,17 +78,7 @@ class StaticLocationSharingViewerViewModel: StaticLocationSharingViewerViewModel
        }
        
        let alertInfo = mapViewErrorAlertInfoBuilder.build(with: error) { [weak self] in
-         
-            switch error {
-            case .invalidLocationAuthorization:
-                if let applicationSettingsURL = URL(string:UIApplication.openSettingsURLString) {
-                    UIApplication.shared.open(applicationSettingsURL)
-                } else {
-                    self?.completion?(.cancel)
-                }
-            default:
-                self?.completion?(.cancel)
-            }
+            self?.completion?(.cancel)
        }
        
        state.bindings.alertInfo = alertInfo
@@ -16,9 +16,9 @@

 import Foundation

-protocol StaticLocationSharingViewerViewModelProtocol {
+protocol StaticLocationViewingViewModelProtocol {
    
-    var completion: ((StaticLocationSharingViewerViewModelResult) -> Void)? { get set }
+    var completion: ((StaticLocationViewingViewModelResult) -> Void)? { get set }
    @available(iOS 14, *)
-    var context: StaticLocationSharingViewerViewModelType.Context { get }
+    var context: StaticLocationViewingViewModelType.Context { get }
 }
@@ -18,7 +18,7 @@ import XCTest
 import RiotSwiftUI

@available(iOS 14.0, *)
-class StaticLocationSharingViewerUITests: MockScreenTest {
+class StaticLocationViewingUITests: MockScreenTest {

    private var app: XCUIApplication!
    
@@ -30,10 +30,10 @@ class StaticLocationSharingViewerUITests: MockScreenTest {
    }
    
    func testInitialExistingLocation() {
-        goToScreenWithIdentifier(MockStaticLocationSharingViewerScreenState.showUserLocation.title)
+        goToScreenWithIdentifier(MockStaticLocationViewingScreenState.showUserLocation.title)
        
        XCTAssertTrue(app.buttons["Cancel"].exists)
-        XCTAssertTrue(app.buttons["LocationSharingView.shareButton"].exists)
+        XCTAssertTrue(app.buttons["StaticLocationView.shareButton"].exists)
        XCTAssertTrue(app.otherElements["Map"].exists)
    }
 }
@@ -21,7 +21,7 @@ import CoreLocation
@testable import RiotSwiftUI

@available(iOS 14.0, *)
-class StaticLocationSharingViewerViewModelTests: XCTestCase {
+class StaticLocationViewingViewModelTests: XCTestCase {

    var cancellables = Set<AnyCancellable>()
    
@@ -81,10 +81,10 @@ class StaticLocationSharingViewerViewModelTests: XCTestCase {
        waitForExpectations(timeout: 3)
    }
    
-    private func buildViewModel() -> StaticLocationSharingViewerViewModel {
-        StaticLocationSharingViewerViewModel(mapStyleURL: URL(string: "http://empty.com")!,
-                                             avatarData: AvatarInput(mxContentUri: "", matrixItemId: "", displayName: ""),
-                                             location: CLLocationCoordinate2D(latitude: 51.4932641, longitude: -0.257096),
-                                             coordinateType: .user)
+    private func buildViewModel() -> StaticLocationViewingViewModel {
+        StaticLocationViewingViewModel(mapStyleURL: URL(string: "http://empty.com")!,
+                                       avatarData: AvatarInput(mxContentUri: "", matrixItemId: "", displayName: ""),
+                                       location: CLLocationCoordinate2D(latitude: 51.4932641, longitude: -0.257096),
+                                       coordinateType: .user)
    }
 }
@@ -17,7 +17,7 @@
 import SwiftUI

@available(iOS 14.0, *)
-struct StaticLocationSharingViewer: View {
+struct StaticLocationView: View {

    // MARK: - Properties
    
@@ -27,7 +27,7 @@ struct StaticLocationSharingViewer: View {
    
    // MARK: Public
    
-    @ObservedObject var viewModel: StaticLocationSharingViewerViewModel.Context
+    @ObservedObject var viewModel: StaticLocationViewingViewModel.Context
    
    // MARK: Views
    
@@ -44,6 +44,7 @@ struct StaticLocationSharingViewer: View {
                                       errorSubject: viewModel.viewState.errorSubject)
                MapCreditsView()
            }
+            .ignoresSafeArea(.all, edges: [.bottom])
            .toolbar {
                ToolbarItem(placement: .navigationBarLeading) {
                    Button(VectorL10n.cancel, action: {
@@ -90,7 +91,7 @@ struct StaticLocationSharingViewer: View {

@available(iOS 14.0, *)
 struct StaticLocationSharingViewer_Previews: PreviewProvider {
-    static let stateRenderer = MockStaticLocationSharingViewerScreenState.stateRenderer
+    static let stateRenderer = MockStaticLocationViewingScreenState.stateRenderer
    static var previews: some View {
        stateRenderer.screenGroup()
    }