some rename on InviteUsers

element-hq · Apr 17, 2023 · a67b4aa · a67b4aa
1 parent 809b0ad
commit a67b4aa
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 12 deletions.
diff --git a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift
@@ -32,6 +32,7 @@ enum FormRowAccessory: View {
             ProgressView()
         case .selection(let isSelected):
             Image(systemName: isSelected ? "checkmark.circle.fill" : "circle")
+                .font(.element.body)
                 .foregroundColor(isSelected ? .element.primaryContent : .element.tertiaryContent)
         }
     }
@@ -128,6 +129,10 @@ struct FormButtonStyles_Previews: PreviewProvider {
                     Text("Hello world")
                 }
                 .buttonStyle(FormButtonStyle())
+                Button { } label: {
+                    Text("Selection")
+                }
+                .buttonStyle(FormButtonStyle(accessory: .selection(isSelected: false)))
             }
             .formSectionStyle()
 

diff --git a/ElementX/Sources/Screens/InviteUsers/InviteUsersCoordinator.swift b/ElementX/Sources/Screens/InviteUsers/InviteUsersCoordinator.swift
@@ -27,7 +27,7 @@ enum InviteUsersCoordinatorAction {
 
 final class InviteUsersCoordinator: CoordinatorProtocol {
     private let parameters: InviteUsersCoordinatorParameters
-    private var viewModel: InviteUsersViewModelProtocol
+    private let viewModel: InviteUsersViewModelProtocol
     private let actionsSubject: PassthroughSubject<InviteUsersCoordinatorAction, Never> = .init()
     private var cancellables: Set<AnyCancellable> = .init()
 

diff --git a/ElementX/Sources/Screens/InviteUsers/InviteUsersModels.swift b/ElementX/Sources/Screens/InviteUsers/InviteUsersModels.swift
@@ -23,7 +23,7 @@ enum InviteUsersViewModelAction {
 struct InviteUsersViewState: BindableState {
     var bindings = InviteUsersViewStateBindings()
 
-    var usersSection: SearchUsersSection = .init(type: .suggestions, users: [])
+    var usersSection: SearchUsersSection = .init(type: .empty, users: [])
     var selectedUsers: [UserProfile] = []
 
     var isSearching: Bool {
@@ -35,6 +35,10 @@ struct InviteUsersViewState: BindableState {
     }
 
     var scrollToLastID: String?
+
+    func isUserSelected(_ user: UserProfile) -> Bool {
+        selectedUsers.contains { $0.userID == user.userID }
+    }
 }
 
 struct InviteUsersViewStateBindings {

diff --git a/ElementX/Sources/Screens/InviteUsers/InviteUsersViewModel.swift b/ElementX/Sources/Screens/InviteUsers/InviteUsersViewModel.swift
@@ -43,7 +43,7 @@ class InviteUsersViewModel: InviteUsersViewModelType, InviteUsersViewModelProtoc
         case .proceed:
             break
         case .tapUser(let user):
-            if state.selectedUsers.contains(where: { $0.userID == user.userID }) {
+            if state.isUserSelected(user) {
                 deselect(user)
             } else {
                 select(user)

diff --git a/ElementX/Sources/Screens/InviteUsers/View/InviteUsersScreen.swift b/ElementX/Sources/Screens/InviteUsers/View/InviteUsersScreen.swift
@@ -41,6 +41,8 @@ struct InviteUsersScreen: View {
         .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 {
@@ -64,10 +66,10 @@ struct InviteUsersScreen: View {
         Section {
             ForEach(context.viewState.usersSection.users, id: \.userID) { user in
                 Button { context.send(viewAction: .tapUser(user)) } label: {
-                    SearchUsersCell(user: user,
+                    UserProfileCell(user: user,
                                     imageProvider: context.imageProvider)
                 }
-                .buttonStyle(FormButtonStyle(accessory: .selection(isSelected: context.viewState.selectedUsers.contains { $0.userID == user.userID })))
+                .buttonStyle(FormButtonStyle(accessory: .selection(isSelected: context.viewState.isUserSelected(user))))
             }
         } header: {
             if let title = context.viewState.usersSection.type.title {
@@ -114,7 +116,7 @@ struct InviteUsersScreen: View {
 
 // MARK: - Previews
 
-struct InviteUsers_Previews: PreviewProvider {
+struct InviteUsersScreen_Previews: PreviewProvider {
     static let viewModel = {
         let userSession = MockUserSession(clientProxy: MockClientProxy(userID: "@userid:example.com"),
                                           mediaProvider: MockMediaProvider())

diff --git a/ElementX/Sources/Screens/InviteUsers/View/InviteUsersSelectedItem.swift b/ElementX/Sources/Screens/InviteUsers/View/InviteUsersSelectedItem.swift
@@ -43,7 +43,7 @@ struct InviteUsersSelectedItem: View {
     }
 }
 
-struct SelectedInvitedUserItem_Previews: PreviewProvider {
+struct InviteUsersSelectedItem_Previews: PreviewProvider {
     static var previews: some View {
         InviteUsersSelectedItem(user: .mockAlice, imageProvider: MockMediaProvider(), dismissAction: { })
     }

diff --git a/.../SearchUsersSection/SearchUsersCell.swift → .../SearchUsersSection/UserProfileCell.swift b/.../SearchUsersSection/SearchUsersCell.swift → .../SearchUsersSection/UserProfileCell.swift
@@ -16,7 +16,7 @@
 
 import SwiftUI
 
-struct SearchUsersCell: View {
+struct UserProfileCell: View {
     let user: UserProfile
     let imageProvider: ImageProviderProtocol?
 

diff --git a/ElementX/Sources/Screens/StartChat/StartChatModels.swift b/ElementX/Sources/Screens/StartChat/StartChatModels.swift
@@ -24,7 +24,7 @@ enum StartChatViewModelAction {
 
 struct StartChatViewState: BindableState {
     var bindings = StartChatScreenViewStateBindings()
-    var usersSection: SearchUsersSection = .init(type: .suggestions, users: [])
+    var usersSection: SearchUsersSection = .init(type: .empty, users: [])
 
     var isSearching: Bool {
         !bindings.searchQuery.isEmpty

diff --git a/ElementX/Sources/Screens/StartChat/View/StartChatScreen.swift b/ElementX/Sources/Screens/StartChat/View/StartChatScreen.swift
@@ -87,7 +87,7 @@ struct StartChatScreen: View {
             Section {
                 ForEach(context.viewState.usersSection.users, id: \.userID) { user in
                     Button { context.send(viewAction: .selectUser(user)) } label: {
-                        SearchUsersCell(user: user, imageProvider: context.imageProvider)
+                        UserProfileCell(user: user, imageProvider: context.imageProvider)
                     }
                     .buttonStyle(FormButtonStyle())
                 }

diff --git a/UnitTests/Sources/StartChatViewModelTests.swift b/UnitTests/Sources/StartChatViewModelTests.swift
@@ -35,10 +35,10 @@ class StartChatScreenViewModelTests: XCTestCase {
 
     func testQueryShowingNoResults() async throws {
         await search(query: "A")
-        XCTAssertEqual(context.viewState.usersSection.type, .suggestions)
+        XCTAssertEqual(context.viewState.usersSection.type, .empty)
 
         await search(query: "AA")
-        XCTAssertEqual(context.viewState.usersSection.type, .suggestions)
+        XCTAssertEqual(context.viewState.usersSection.type, .empty)
 
         await search(query: "AAA")
         assertSearchResults(toBe: 0)