ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

implemented a way to update the desired setting after pressing done, and added tests

Browse Source
This commit is contained in:
Mauro Romito
2025-12-02 00:10:22 +01:00
committed by Mauro
parent 0782faeadd
commit d77700b72a
5 changed files with 129 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/ManageAuthorizedSpacesScreen/ManageAuthorizedSpacesScreenModels.swift
+5 -3
View File
@@ -5,6 +5,7 @@
// Please see LICENSE files in the repository root for full details.
//
import Combine
import Foundation
enum ManageAuthorizedSpacesScreenViewModelAction {
@@ -16,7 +17,7 @@ struct ManageAuthorizedSpacesScreenViewState: BindableState {
var desiredSelectedIDs: Set<String>
var hasChanges: Bool {
authorizedSpacesSelection.selectedIDs != desiredSelectedIDs
authorizedSpacesSelection.currentSelectedIDs != desiredSelectedIDs
}
var isDoneButtonDisabled: Bool {
@@ -25,7 +26,7 @@ struct ManageAuthorizedSpacesScreenViewState: BindableState {
init(authorizedSpacesSelection: AuthorizedSpacesSelection) {
self.authorizedSpacesSelection = authorizedSpacesSelection
desiredSelectedIDs = authorizedSpacesSelection.selectedIDs
desiredSelectedIDs = authorizedSpacesSelection.currentSelectedIDs
}
}
@@ -38,5 +39,6 @@ enum ManageAuthorizedSpacesScreenViewAction {
struct AuthorizedSpacesSelection {
let joinedParentSpaces: [SpaceRoomProxyProtocol]
let unknownSpacesIDs: [String]
let selectedIDs: Set<String>
let currentSelectedIDs: Set<String>
let desiredSelectIDs: PassthroughSubject<Set<String>, Never> = .init()
}
ElementX/Sources/Screens/ManageAuthorizedSpacesScreen/ManageAuthorizedSpacesScreenViewModel.swift
+2 -2
View File
@@ -30,8 +30,8 @@ class ManageAuthorizedSpacesScreenViewModel: ManageAuthorizedSpacesScreenViewMod
case .cancel:
actionsSubject.send(.dismiss)
case .done:
// TODO: Implement
break
state.authorizedSpacesSelection.desiredSelectIDs.send(state.desiredSelectedIDs)
actionsSubject.send(.dismiss)
case .toggle(let spaceID):
if state.desiredSelectedIDs.contains(spaceID) {
state.desiredSelectedIDs.remove(spaceID)
ElementX/Sources/Screens/ManageAuthorizedSpacesScreen/View/ManageAuthorizedSpacesScreen.swift
+3 -3
View File
@@ -104,9 +104,9 @@ struct ManageAuthorizedSpacesScreen_Previews: PreviewProvider, TestablePreview {
unknownSpacesIDs: ["!unknown-space-id-1",
"!unknown-space-id-2",
"!unknown-space-id-3"],
selectedIDs: ["space1",
"space3",
"!unknown-space-id-2"]),
currentSelectedIDs: ["space1",
"space3",
"!unknown-space-id-2"]),
mediaProvider: MediaProviderMock(configuration: .init()))
static var previews: some View {
ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift
+11 -4
View File
@@ -252,12 +252,19 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
private func displayManageAuthorizedSpacesScreen() {
let joinedParentSpaces = state.joinedParentSpaces
let unknownSpaceIDs = state.currentSettings.accessType.spaceIDs.filter { id in
!joinedParentSpaces.contains(where: { $0.id == id })
!joinedParentSpaces.contains { $0.id == id }
}
let selectedIDs = Set(state.bindings.desiredSettings.accessType.spaceIDs)
actionsSubject.send(.displayManageAuthorizedSpacesScreen(.init(joinedParentSpaces: joinedParentSpaces,
unknownSpacesIDs: unknownSpaceIDs,
selectedIDs: selectedIDs)))
let authorizedSpacesSelection = AuthorizedSpacesSelection(joinedParentSpaces: joinedParentSpaces,
unknownSpacesIDs: unknownSpaceIDs,
currentSelectedIDs: selectedIDs)
authorizedSpacesSelection.desiredSelectIDs
.sink { [weak self] desiredSelectedIDs in
self?.state.bindings.desiredSettings.accessType = .spaceUsers(spaceIDs: desiredSelectedIDs.sorted())
}
.store(in: &cancellables)
actionsSubject.send(.displayManageAuthorizedSpacesScreen(authorizedSpacesSelection))
}
private static let loadingIndicatorIdentifier = "\(EditRoomAddressScreenViewModel.self)-Loading"