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-06 04:18:31 +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,43 @@
+//
+// 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 RoomMemberDetailsScreenCoordinatorParameters {
+    let roomMemberProxy: RoomMemberProxyProtocol
+    let mediaProvider: MediaProviderProtocol
+}
+
+enum RoomMemberDetailsScreenCoordinatorAction { }
+
+final class RoomMemberDetailsScreenCoordinator: CoordinatorProtocol {
+    private let parameters: RoomMemberDetailsScreenCoordinatorParameters
+    private var viewModel: RoomMemberDetailsScreenViewModelProtocol
+
+    var callback: ((RoomMemberDetailsScreenCoordinatorAction) -> Void)?
+
+    init(parameters: RoomMemberDetailsScreenCoordinatorParameters) {
+        self.parameters = parameters
+
+        viewModel = RoomMemberDetailsScreenViewModel(roomMemberProxy: parameters.roomMemberProxy, mediaProvider: parameters.mediaProvider)
+    }
+
+    func start() { }
+
+    func toPresentable() -> AnyView {
+        AnyView(RoomMemberDetailsScreen(context: viewModel.context))
+    }
+}
@@ -0,0 +1,76 @@
+//
+// 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 RoomMemberDetailsScreenViewModelAction { }
+
+struct RoomMemberDetailsScreenViewState: BindableState {
+    var details: RoomMemberDetails
+    var isProcessingIgnoreRequest = false
+
+    var bindings: RoomMemberDetailsScreenViewStateBindings
+}
+
+struct RoomMemberDetailsScreenViewStateBindings {
+    struct IgnoreUserAlertItem: AlertItem, Equatable {
+        enum Action {
+            case ignore
+            case unignore
+        }
+
+        let action: Action
+        let cancelTitle = L10n.actionCancel
+
+        var title: String {
+            switch action {
+            case .ignore: return L10n.screenRoomMemberDetailsBlockUser
+            case .unignore: return L10n.screenRoomMemberDetailsUnblockUser
+            }
+        }
+
+        var confirmationTitle: String {
+            switch action {
+            case .ignore: return L10n.screenRoomMemberDetailsBlockAlertAction
+            case .unignore: return L10n.screenRoomMemberDetailsUnblockAlertAction
+            }
+        }
+
+        var description: String {
+            switch action {
+            case .ignore: return L10n.screenRoomMemberDetailsBlockAlertDescription
+            case .unignore: return L10n.screenRoomMemberDetailsUnblockAlertDescription
+            }
+        }
+
+        var viewAction: RoomMemberDetailsScreenViewAction {
+            switch action {
+            case .ignore: return .ignoreConfirmed
+            case .unignore: return .unignoreConfirmed
+            }
+        }
+    }
+    
+    var ignoreUserAlert: IgnoreUserAlertItem?
+    var errorAlert: ErrorAlertItem?
+}
+
+enum RoomMemberDetailsScreenViewAction {
+    case showUnignoreAlert
+    case showIgnoreAlert
+    case ignoreConfirmed
+    case unignoreConfirmed
+}
@@ -0,0 +1,75 @@
+//
+// 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
+
+typealias RoomMemberDetailsScreenViewModelType = StateStoreViewModel<RoomMemberDetailsScreenViewState, RoomMemberDetailsScreenViewAction>
+
+class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, RoomMemberDetailsScreenViewModelProtocol {
+    let roomMemberProxy: RoomMemberProxyProtocol
+    
+    var callback: ((RoomMemberDetailsScreenViewModelAction) -> Void)?
+    
+    init(roomMemberProxy: RoomMemberProxyProtocol, mediaProvider: MediaProviderProtocol) {
+        self.roomMemberProxy = roomMemberProxy
+        let initialViewState = RoomMemberDetailsScreenViewState(details: RoomMemberDetails(withProxy: roomMemberProxy),
+                                                                bindings: .init())
+        super.init(initialViewState: initialViewState, imageProvider: mediaProvider)
+    }
+    
+    // MARK: - Public
+    
+    override func process(viewAction: RoomMemberDetailsScreenViewAction) {
+        switch viewAction {
+        case .showUnignoreAlert:
+            state.bindings.ignoreUserAlert = .init(action: .unignore)
+        case .showIgnoreAlert:
+            state.bindings.ignoreUserAlert = .init(action: .ignore)
+        case .ignoreConfirmed:
+            Task { await ignoreUser() }
+        case .unignoreConfirmed:
+            Task { await unignoreUser() }
+        }
+    }
+
+    // MARK: - Private
+
+    @MainActor
+    private func ignoreUser() async {
+        state.isProcessingIgnoreRequest = true
+        let result = await roomMemberProxy.ignoreUser()
+        state.isProcessingIgnoreRequest = false
+        switch result {
+        case .success:
+            state.details.isIgnored = true
+        case .failure:
+            state.bindings.errorAlert = .init()
+        }
+    }
+
+    @MainActor
+    private func unignoreUser() async {
+        state.isProcessingIgnoreRequest = true
+        let result = await roomMemberProxy.unignoreUser()
+        state.isProcessingIgnoreRequest = false
+        switch result {
+        case .success:
+            state.details.isIgnored = false
+        case .failure:
+            state.bindings.errorAlert = .init()
+        }
+    }
+}
@@ -0,0 +1,23 @@
+//
+// 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
+
+@MainActor
+protocol RoomMemberDetailsScreenViewModelProtocol {
+    var callback: ((RoomMemberDetailsScreenViewModelAction) -> Void)? { get set }
+    var context: RoomMemberDetailsScreenViewModelType.Context { get }
+}
@@ -0,0 +1,124 @@
+//
+// 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 RoomMemberDetailsScreen: View {
+    @ObservedObject var context: RoomMemberDetailsScreenViewModel.Context
+    
+    var body: some View {
+        Form {
+            headerSection
+
+            if !context.viewState.details.isAccountOwner {
+                blockUserSection
+            }
+        }
+        .scrollContentBackground(.hidden)
+        .background(Color.element.formBackground.ignoresSafeArea())
+        .alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
+        .errorAlert(item: $context.errorAlert)
+    }
+    
+    // MARK: - Private
+
+    @ViewBuilder
+    private var headerSection: some View {
+        AvatarHeaderView(avatarUrl: context.viewState.details.avatarURL,
+                         name: context.viewState.details.name,
+                         id: context.viewState.details.id,
+                         avatarSize: .user(on: .memberDetails),
+                         imageProvider: context.imageProvider,
+                         subtitle: context.viewState.details.id) {
+            if let permalink = context.viewState.details.permalink {
+                HStack(spacing: 32) {
+                    ShareLink(item: permalink) {
+                        Image(systemName: "square.and.arrow.up")
+                    }
+                    .buttonStyle(FormActionButtonStyle(title: L10n.actionShare))
+                }
+                .padding(.top, 32)
+            }
+        }
+    }
+
+    private var blockUserSection: some View {
+        Section {
+            Button(role: context.viewState.details.isIgnored ? nil : .destructive) {
+                context.send(viewAction: blockUserButtonAction)
+            } label: {
+                Label(blockUserButtonTitle, systemImage: "slash.circle")
+            }
+            .accessibilityIdentifier(blockUserButtonAccessibilityIdentifier)
+            .buttonStyle(FormButtonStyle(accessory: context.viewState.isProcessingIgnoreRequest ? .progressView : nil))
+            .disabled(context.viewState.isProcessingIgnoreRequest)
+        }
+        .formSectionStyle()
+    }
+
+    private var blockUserButtonAction: RoomMemberDetailsScreenViewAction {
+        context.viewState.details.isIgnored ? .showUnignoreAlert : .showIgnoreAlert
+    }
+
+    private var blockUserButtonTitle: String {
+        context.viewState.details.isIgnored ? L10n.screenRoomMemberDetailsUnblockUser : L10n.screenRoomMemberDetailsBlockUser
+    }
+
+    private var blockUserButtonAccessibilityIdentifier: String {
+        context.viewState.details.isIgnored ? A11yIdentifiers.roomMemberDetailsScreen.unignore : A11yIdentifiers.roomMemberDetailsScreen.ignore
+    }
+
+    @ViewBuilder
+    private func blockUserAlertActions(_ item: RoomMemberDetailsScreenViewStateBindings.IgnoreUserAlertItem) -> some View {
+        Button(item.cancelTitle, role: .cancel) { }
+        Button(item.confirmationTitle,
+               role: item.action == .ignore ? .destructive : nil) {
+            context.send(viewAction: item.viewAction)
+        }
+    }
+
+    private func blockUserAlertMessage(_ item: RoomMemberDetailsScreenViewStateBindings.IgnoreUserAlertItem) -> some View {
+        Text(item.description)
+    }
+}
+
+// MARK: - Previews
+
+struct RoomMemberDetailsScreen_Previews: PreviewProvider {
+    static let otherUserViewModel = {
+        let member = RoomMemberProxyMock.mockDan
+        return RoomMemberDetailsScreenViewModel(roomMemberProxy: member, mediaProvider: MockMediaProvider())
+    }()
+
+    static let accountOwnerViewModel = {
+        let member = RoomMemberProxyMock.mockMe
+        return RoomMemberDetailsScreenViewModel(roomMemberProxy: member, mediaProvider: MockMediaProvider())
+    }()
+
+    static let ignoredUserViewModel = {
+        let member = RoomMemberProxyMock.mockIgnored
+        return RoomMemberDetailsScreenViewModel(roomMemberProxy: member, mediaProvider: MockMediaProvider())
+    }()
+    
+    static var previews: some View {
+        RoomMemberDetailsScreen(context: otherUserViewModel.context)
+            .previewDisplayName("Other User")
+        RoomMemberDetailsScreen(context: accountOwnerViewModel.context)
+            .previewDisplayName("Account Owner")
+        RoomMemberDetailsScreen(context: ignoredUserViewModel.context)
+            .previewDisplayName("Ignored User")
+    }
+}