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,59 @@
+//
+// 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 InviteUsersScreenCoordinatorParameters {
+    let userSession: UserSessionProtocol
+    let userDiscoveryService: UserDiscoveryServiceProtocol
+}
+
+enum InviteUsersScreenCoordinatorAction {
+    case close
+}
+
+final class InviteUsersScreenCoordinator: CoordinatorProtocol {
+    private let parameters: InviteUsersScreenCoordinatorParameters
+    private let viewModel: InviteUsersScreenViewModelProtocol
+    private let actionsSubject: PassthroughSubject<InviteUsersScreenCoordinatorAction, Never> = .init()
+    private var cancellables: Set<AnyCancellable> = .init()
+    
+    var actions: AnyPublisher<InviteUsersScreenCoordinatorAction, Never> {
+        actionsSubject.eraseToAnyPublisher()
+    }
+    
+    init(parameters: InviteUsersScreenCoordinatorParameters) {
+        self.parameters = parameters
+        
+        viewModel = InviteUsersScreenViewModel(userSession: parameters.userSession, userDiscoveryService: parameters.userDiscoveryService)
+    }
+    
+    func start() {
+        viewModel.actions.sink { [weak self] action in
+            guard let self else { return }
+            switch action {
+            case .close:
+                self.actionsSubject.send(.close)
+            }
+        }
+        .store(in: &cancellables)
+    }
+        
+    func toPresentable() -> AnyView {
+        AnyView(InviteUsersScreen(context: viewModel.context))
+    }
+}
@@ -0,0 +1,60 @@
+//
+// 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 InviteUsersScreenErrorType: Error {
+    case unknown
+}
+
+enum InviteUsersScreenViewModelAction {
+    case close
+}
+
+struct InviteUsersScreenViewState: BindableState {
+    var bindings = InviteUsersScreenViewStateBindings()
+    
+    var usersSection: UserDiscoverySection = .init(type: .suggestions, users: [])
+    var selectedUsers: [UserProfile] = []
+    
+    var isSearching: Bool {
+        !bindings.searchQuery.isEmpty
+    }
+    
+    var hasEmptySearchResults: Bool {
+        isSearching && usersSection.type == .searchResult && usersSection.users.isEmpty
+    }
+    
+    var scrollToLastID: String?
+    
+    func isUserSelected(_ user: UserProfile) -> Bool {
+        selectedUsers.contains { $0.userID == user.userID }
+    }
+}
+
+struct InviteUsersScreenViewStateBindings {
+    var searchQuery = ""
+    
+    /// Information describing the currently displayed alert.
+    var alertInfo: AlertInfo<InviteUsersScreenErrorType>?
+}
+
+enum InviteUsersScreenViewAction {
+    case close
+    case proceed
+    case tapUser(UserProfile)
+    case deselectUser(UserProfile)
+}
@@ -0,0 +1,119 @@
+//
+// 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 InviteUsersScreenViewModelType = StateStoreViewModel<InviteUsersScreenViewState, InviteUsersScreenViewAction>
+
+class InviteUsersScreenViewModel: InviteUsersScreenViewModelType, InviteUsersScreenViewModelProtocol {
+    private let userSession: UserSessionProtocol
+    private let userDiscoveryService: UserDiscoveryServiceProtocol
+    private let actionsSubject: PassthroughSubject<InviteUsersScreenViewModelAction, Never> = .init()
+    
+    var actions: AnyPublisher<InviteUsersScreenViewModelAction, Never> {
+        actionsSubject.eraseToAnyPublisher()
+    }
+    
+    init(userSession: UserSessionProtocol, userDiscoveryService: UserDiscoveryServiceProtocol) {
+        self.userSession = userSession
+        self.userDiscoveryService = userDiscoveryService
+        super.init(initialViewState: InviteUsersScreenViewState(), imageProvider: userSession.mediaProvider)
+        
+        setupSubscriptions()
+    }
+    
+    // MARK: - Public
+    
+    override func process(viewAction: InviteUsersScreenViewAction) {
+        switch viewAction {
+        case .close:
+            actionsSubject.send(.close)
+        case .proceed:
+            break
+        case .tapUser(let user):
+            if state.isUserSelected(user) {
+                deselect(user)
+            } else {
+                select(user)
+            }
+        case .deselectUser(let user):
+            deselect(user)
+        }
+    }
+    
+    private func select(_ user: UserProfile) {
+        state.selectedUsers.append(user)
+        state.scrollToLastID = user.userID
+    }
+    
+    private func deselect(_ user: UserProfile) {
+        state.selectedUsers.removeAll(where: { $0.userID == user.userID })
+        state.scrollToLastID = nil
+    }
+
+    // MARK: - Private
+    
+    private func setupSubscriptions() {
+        context.$viewState
+            .map(\.bindings.searchQuery)
+            .debounceAndRemoveDuplicates()
+            .sink { [weak self] _ in
+                self?.fetchUsers()
+            }
+            .store(in: &cancellables)
+    }
+    
+    @CancellableTask
+    private var fetchUsersTask: Task<Void, Never>?
+    
+    private func fetchUsers() {
+        guard searchQuery.count >= 3 else {
+            fetchSuggestions()
+            return
+        }
+        fetchUsersTask = Task {
+            let result = await userDiscoveryService.searchProfiles(with: searchQuery)
+            guard !Task.isCancelled else { return }
+            handleResult(for: .searchResult, result: result)
+        }
+    }
+    
+    private func fetchSuggestions() {
+        guard ServiceLocator.shared.settings.startChatUserSuggestionsEnabled else {
+            state.usersSection = .init(type: .suggestions, users: [])
+            return
+        }
+        fetchUsersTask = Task {
+            let result = await userDiscoveryService.fetchSuggestions()
+            guard !Task.isCancelled else { return }
+            handleResult(for: .suggestions, result: result)
+        }
+    }
+    
+    private func handleResult(for sectionType: UserDiscoverySectionType, result: Result<[UserProfile], UserDiscoveryErrorType>) {
+        switch result {
+        case .success(let users):
+            state.usersSection = .init(type: sectionType, users: users)
+        case .failure:
+            break
+        }
+    }
+    
+    private var searchQuery: String {
+        context.searchQuery
+    }
+}
@@ -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 Combine
+
+@MainActor
+protocol InviteUsersScreenViewModelProtocol {
+    var actions: AnyPublisher<InviteUsersScreenViewModelAction, Never> { get }
+    var context: InviteUsersScreenViewModelType.Context { get }
+}
@@ -0,0 +1,135 @@
+//
+// 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 InviteUsersScreen: View {
+    @ObservedObject var context: InviteUsersScreenViewModel.Context
+    
+    var body: some View {
+        VStack {
+            if !context.viewState.selectedUsers.isEmpty {
+                selectedUsersSection
+            }
+            searchContent
+        }
+        .scrollContentBackground(.hidden)
+        .background(Color.element.formBackground.ignoresSafeArea())
+        .navigationTitle(L10n.screenCreateRoomActionInvitePeople)
+        .navigationBarTitleDisplayMode(.inline)
+        .toolbar {
+            ToolbarItem(placement: .confirmationAction) {
+                nextButton
+            }
+        }
+        .searchable(text: $context.searchQuery, placement: .navigationBarDrawer(displayMode: .always), prompt: L10n.commonSearchForSomeone)
+        .alert(item: $context.alertInfo) { $0.alert }
+    }
+    
+    // MARK: - Private
+    
+    /// The content shown in the form when a search query has been entered.
+    @ViewBuilder
+    private var searchContent: some View {
+        Form {
+            if context.viewState.hasEmptySearchResults {
+                noResultsContent
+            } else {
+                usersSection
+            }
+        }
+    }
+    
+    private var noResultsContent: some View {
+        Text(L10n.commonNoResults)
+            .font(.element.body)
+            .foregroundColor(.element.tertiaryContent)
+            .frame(maxWidth: .infinity)
+            .listRowBackground(Color.clear)
+            .accessibilityIdentifier(A11yIdentifiers.startChatScreen.searchNoResults)
+    }
+    
+    private var usersSection: some View {
+        Section {
+            ForEach(context.viewState.usersSection.users, id: \.userID) { user in
+                Button { context.send(viewAction: .tapUser(user)) } label: {
+                    UserProfileCell(user: user,
+                                    imageProvider: context.imageProvider)
+                }
+                .buttonStyle(FormButtonStyle(accessory: .selection(isSelected: context.viewState.isUserSelected(user))))
+            }
+        } header: {
+            if let title = context.viewState.usersSection.title {
+                Text(title)
+            }
+        }
+        .listRowSeparator(.automatic)
+        .formSectionStyle()
+    }
+    
+    @ScaledMetric private var cellWidth: CGFloat = 64
+    private var selectedUsersSection: some View {
+        ScrollView(.horizontal, showsIndicators: false) {
+            ScrollViewReader { scrollView in
+                HStack(spacing: 28) {
+                    ForEach(context.viewState.selectedUsers, id: \.userID) { user in
+                        InviteUsersScreenSelectedItem(user: user, imageProvider: context.imageProvider) {
+                            deselect(user)
+                        }
+                        .frame(width: cellWidth)
+                    }
+                }
+                .onChange(of: context.viewState.scrollToLastID) { lastAddedID in
+                    guard let id = lastAddedID else { return }
+                    withAnimation(.easeInOut) {
+                        scrollView.scrollTo(id)
+                    }
+                }
+                .padding(.horizontal, 18)
+            }
+        }
+    }
+    
+    private var nextButton: some View {
+        Button { context.send(viewAction: .proceed) } label: {
+            Text(context.viewState.selectedUsers.isEmpty ? L10n.actionSkip : L10n.actionNext)
+        }
+    }
+    
+    private func deselect(_ user: UserProfile) {
+        context.send(viewAction: .deselectUser(user))
+    }
+}
+
+// MARK: - Previews
+
+struct InviteUsersScreen_Previews: PreviewProvider {
+    static let viewModel = {
+        let userSession = MockUserSession(clientProxy: MockClientProxy(userID: "@userid:example.com"),
+                                          mediaProvider: MockMediaProvider())
+        let userDiscoveryService = UserDiscoveryServiceMock()
+        userDiscoveryService.fetchSuggestionsReturnValue = .success([.mockAlice])
+        userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
+        return InviteUsersScreenViewModel(userSession: userSession, userDiscoveryService: userDiscoveryService)
+    }()
+    
+    static var previews: some View {
+        NavigationView {
+            InviteUsersScreen(context: viewModel.context)
+                .tint(.element.accent)
+        }
+    }
+}
@@ -0,0 +1,50 @@
+//
+// Copyright 2023 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 InviteUsersScreenSelectedItem: View {
+    let user: UserProfile
+    let imageProvider: ImageProviderProtocol?
+    let dismissAction: () -> Void
+    
+    var body: some View {
+        VStack(spacing: 4) {
+            LoadableAvatarImage(url: user.avatarURL,
+                                name: user.displayName,
+                                contentID: user.userID,
+                                avatarSize: .user(on: .inviteUsers),
+                                imageProvider: imageProvider)
+            Text(user.displayName ?? user.userID)
+                .font(.element.title3)
+                .foregroundColor(.element.primaryContent)
+                .lineLimit(1)
+        }
+        .overlay(alignment: .topTrailing) {
+            Button(action: dismissAction) {
+                Image(systemName: "xmark.circle.fill")
+                    .symbolRenderingMode(.palette)
+                    .foregroundStyle(Color.element.systemPrimaryBackground, Color.element.primaryContent)
+            }
+        }
+    }
+}
+
+struct InviteUsersScreenSelectedItem_Previews: PreviewProvider {
+    static var previews: some View {
+        InviteUsersScreenSelectedItem(user: .mockAlice, imageProvider: MockMediaProvider(), dismissAction: { })
+    }
+}