Rename screens (#826)

* Rename: AnalyticsPrompt -> AnalyticsPromptScreen * Rename: AnalyticsSettings -> AnalyticsSettingsScreen * Rename: Settings -> SettingsScreen * Rename: SessionVerification -> SessionVerificationScreen * Rename: BugReport -> BugReportScreen * Rename: FilePreview -> FilePreviewScreen * Rename: AnalyticsPrompt -> AnalyticsPromptScreen * Rename: Invites -> InvitesScreen * Rename: InviteUsers -> InviteUsersScreen * Rename: MediaPicker -> MediaPickerScreen * Delete unused UIActivityViewControllerWrapper * Rename: ReportContent -> ReportContentScreen * Rename: RoomDetails -> RoomDetailsScreen * Rename: RoomMemberDetails -> RoomMemberDetailsScreen * Rename: RoomMemberList -> RoomMemberListScreen * Rename: Cleanup * Renaming missed items * Low effort attempt at fixing the flakey unit tests
2026-11-03 06:55:59 +00:00 · 2023-04-24 18:48:07 +03:00
parent 9911ad2b9b
commit 24572c6582
88 changed files with 492 additions and 520 deletions
@@ -0,0 +1,95 @@
+//
+// Copyright 2022 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 Combine
+import SwiftUI
+
+struct ReportContentScreenCoordinatorParameters {
+    let itemID: String
+    let senderID: String
+    let roomProxy: RoomProxyProtocol
+    weak var userIndicatorController: UserIndicatorControllerProtocol?
+}
+
+enum ReportContentScreenCoordinatorAction {
+    case cancel
+    case finish
+}
+
+final class ReportContentScreenCoordinator: CoordinatorProtocol {
+    private let parameters: ReportContentScreenCoordinatorParameters
+    private var viewModel: ReportContentScreenViewModelProtocol
+    private var cancellables: Set<AnyCancellable> = .init()
+    
+    var callback: ((ReportContentScreenCoordinatorAction) -> Void)?
+    
+    init(parameters: ReportContentScreenCoordinatorParameters) {
+        self.parameters = parameters
+        
+        viewModel = ReportContentScreenViewModel(itemID: parameters.itemID, senderID: parameters.senderID, roomProxy: parameters.roomProxy)
+    }
+
+    // MARK: - Public
+    
+    func start() {
+        viewModel.actions
+            .sink { [weak self] action in
+                guard let self else { return }
+                switch action {
+                case .submitStarted:
+                    self.startLoading()
+                case let .submitFailed(error):
+                    self.stopLoading()
+                    self.showError(description: error.localizedDescription)
+                case .submitFinished:
+                    self.stopLoading()
+                    self.callback?(.finish)
+                case .cancel:
+                    self.callback?(.cancel)
+                }
+            }
+            .store(in: &cancellables)
+    }
+
+    func stop() {
+        stopLoading()
+    }
+        
+    func toPresentable() -> AnyView {
+        AnyView(ReportContentScreen(context: viewModel.context))
+    }
+
+    // MARK: - Private
+
+    private static let loadingIndicatorIdentifier = "ReportContentLoading"
+
+    private func startLoading() {
+        parameters.userIndicatorController?.submitIndicator(
+            UserIndicator(id: Self.loadingIndicatorIdentifier,
+                          type: .modal,
+                          title: L10n.commonSending,
+                          persistent: true)
+        )
+    }
+
+    private func stopLoading() {
+        parameters.userIndicatorController?.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
+    }
+
+    private func showError(description: String) {
+        parameters.userIndicatorController?.submitIndicator(UserIndicator(title: description))
+    }
+}
@@ -0,0 +1,38 @@
+//
+// Copyright 2022 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 Foundation
+
+enum ReportContentScreenViewModelAction {
+    case cancel
+    case submitStarted
+    case submitFinished
+    case submitFailed(error: Error)
+}
+
+struct ReportContentScreenViewState: BindableState {
+    var bindings: ReportContentScreenViewStateBindings
+}
+
+struct ReportContentScreenViewStateBindings {
+    var reasonText: String
+    var ignoreUser: Bool
+}
+
+enum ReportContentScreenViewAction {
+    case cancel
+    case submit
+}
@@ -0,0 +1,72 @@
+//
+// Copyright 2022 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 Combine
+import SwiftUI
+
+typealias ReportContentScreenViewModelType = StateStoreViewModel<ReportContentScreenViewState, ReportContentScreenViewAction>
+
+class ReportContentScreenViewModel: ReportContentScreenViewModelType, ReportContentScreenViewModelProtocol {
+    private let itemID: String
+    private let senderID: String
+    private let roomProxy: RoomProxyProtocol
+    private let actionsSubject: PassthroughSubject<ReportContentScreenViewModelAction, Never> = .init()
+    
+    var actions: AnyPublisher<ReportContentScreenViewModelAction, Never> {
+        actionsSubject.eraseToAnyPublisher()
+    }
+
+    init(itemID: String, senderID: String, roomProxy: RoomProxyProtocol) {
+        self.itemID = itemID
+        self.senderID = senderID
+        self.roomProxy = roomProxy
+        
+        super.init(initialViewState: ReportContentScreenViewState(bindings: ReportContentScreenViewStateBindings(reasonText: "", ignoreUser: false)))
+    }
+
+    // MARK: - Public
+    
+    override func process(viewAction: ReportContentScreenViewAction) {
+        switch viewAction {
+        case .cancel:
+            actionsSubject.send(.cancel)
+        case .submit:
+            Task { await submitReport() }
+        }
+    }
+
+    // MARK: Private
+
+    private func submitReport() async {
+        actionsSubject.send(.submitStarted)
+        
+        if case let .failure(error) = await roomProxy.reportContent(itemID, reason: state.bindings.reasonText) {
+            MXLog.error("Submit Report Content failed: \(error)")
+            actionsSubject.send(.submitFailed(error: error))
+            return
+        }
+        
+        // Ignore the sender if the user wants to.
+        if state.bindings.ignoreUser, case let .failure(error) = await roomProxy.ignoreUser(senderID) {
+            MXLog.error("Ignore user failed: \(error)")
+            actionsSubject.send(.submitFailed(error: error))
+            return
+        }
+        
+        MXLog.info("Submit Report Content succeeded")
+        actionsSubject.send(.submitFinished)
+    }
+}
@@ -0,0 +1,24 @@
+//
+// Copyright 2022 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 Combine
+import Foundation
+
+@MainActor
+protocol ReportContentScreenViewModelProtocol {
+    var actions: AnyPublisher<ReportContentScreenViewModelAction, Never> { get }
+    var context: ReportContentScreenViewModelType.Context { get }
+}
@@ -0,0 +1,96 @@
+//
+// Copyright 2022 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 ReportContentScreen: View {
+    @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+    
+    @ObservedObject var context: ReportContentScreenViewModel.Context
+    
+    private var horizontalPadding: CGFloat {
+        horizontalSizeClass == .regular ? 50 : 16
+    }
+
+    var body: some View {
+        Form {
+            reasonSection
+            
+            ignoreUserSection
+        }
+        .scrollDismissesKeyboard(.immediately)
+        .compoundForm()
+        .navigationTitle(L10n.actionReportContent)
+        .navigationBarTitleDisplayMode(.inline)
+        .toolbar { toolbar }
+        .interactiveDismissDisabled()
+    }
+
+    private var reasonSection: some View {
+        Section {
+            TextField(L10n.reportContentHint,
+                      text: $context.reasonText,
+                      prompt: Text(L10n.reportContentHint).compoundFormTextFieldPlaceholder(),
+                      axis: .vertical)
+                .lineLimit(4, reservesSpace: true)
+                .textFieldStyle(.compoundForm)
+        } footer: {
+            Text(L10n.reportContentExplanation)
+                .compoundFormSectionFooter()
+        }
+        .compoundFormSection()
+    }
+    
+    private var ignoreUserSection: some View {
+        Section {
+            Toggle(L10n.screenReportContentBlockUser, isOn: $context.ignoreUser)
+                .toggleStyle(.compoundForm)
+                .accessibilityIdentifier(A11yIdentifiers.reportContent.ignoreUser)
+        } footer: {
+            Text(L10n.screenReportContentBlockUserHint)
+                .compoundFormSectionFooter()
+        }
+    }
+
+    @ToolbarContentBuilder
+    private var toolbar: some ToolbarContent {
+        ToolbarItem(placement: .cancellationAction) {
+            Button(L10n.actionCancel) {
+                context.send(viewAction: .cancel)
+            }
+        }
+
+        ToolbarItem(placement: .confirmationAction) {
+            Button(L10n.actionSend) {
+                context.send(viewAction: .submit)
+            }
+        }
+    }
+}
+
+// MARK: - Previews
+
+struct ReportContentScreen_Previews: PreviewProvider {
+    static let viewModel = ReportContentScreenViewModel(itemID: "",
+                                                        senderID: "",
+                                                        roomProxy: RoomProxyMock(with: .init(displayName: nil)))
+    
+    static var previews: some View {
+        NavigationStack {
+            ReportContentScreen(context: viewModel.context)
+        }
+    }
+}