ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

pr suggestions and updated tests

Browse Source
This commit is contained in:
Mauro Romito
2025-12-02 17:11:53 +01:00
committed by Mauro
parent b6754a8594
commit cf673173a8
16 changed files with 106 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/ManageAuthorizedSpacesScreen/ManageAuthorizedSpacesScreenModels.swift
+6 -6
View File
@@ -14,19 +14,19 @@ enum ManageAuthorizedSpacesScreenViewModelAction {
struct ManageAuthorizedSpacesScreenViewState: BindableState {
let authorizedSpacesSelection: AuthorizedSpacesSelection
var desiredSelectedIDs: Set<String>
var selectedIDs: Set<String>
var hasChanges: Bool {
authorizedSpacesSelection.currentSelectedIDs != desiredSelectedIDs
authorizedSpacesSelection.initialSelectedIDs != selectedIDs
}
var isDoneButtonDisabled: Bool {
desiredSelectedIDs.isEmpty || !hasChanges
selectedIDs.isEmpty || !hasChanges
}
init(authorizedSpacesSelection: AuthorizedSpacesSelection) {
self.authorizedSpacesSelection = authorizedSpacesSelection
desiredSelectedIDs = authorizedSpacesSelection.currentSelectedIDs
selectedIDs = authorizedSpacesSelection.initialSelectedIDs
}
}
@@ -39,6 +39,6 @@ enum ManageAuthorizedSpacesScreenViewAction {
struct AuthorizedSpacesSelection {
let joinedParentSpaces: [SpaceRoomProxyProtocol]
let unknownSpacesIDs: [String]
let currentSelectedIDs: Set<String>
let desiredSelectIDs: PassthroughSubject<Set<String>, Never> = .init()
let initialSelectedIDs: Set<String>
let selectedIDs: PassthroughSubject<Set<String>, Never> = .init()
}
ElementX/Sources/Screens/ManageAuthorizedSpacesScreen/ManageAuthorizedSpacesScreenViewModel.swift
+4 -4
View File
@@ -30,13 +30,13 @@ class ManageAuthorizedSpacesScreenViewModel: ManageAuthorizedSpacesScreenViewMod
case .cancel:
actionsSubject.send(.dismiss)
case .done:
state.authorizedSpacesSelection.desiredSelectIDs.send(state.desiredSelectedIDs)
state.authorizedSpacesSelection.selectedIDs.send(state.selectedIDs)
actionsSubject.send(.dismiss)
case .toggle(let spaceID):
if state.desiredSelectedIDs.contains(spaceID) {
state.desiredSelectedIDs.remove(spaceID)
if state.selectedIDs.contains(spaceID) {
state.selectedIDs.remove(spaceID)
} else {
state.desiredSelectedIDs.insert(spaceID)
state.selectedIDs.insert(spaceID)
}
}
}
ElementX/Sources/Screens/ManageAuthorizedSpacesScreen/View/ManageAuthorizedSpacesScreen.swift
+7 -5
View File
@@ -14,11 +14,13 @@ struct ManageAuthorizedSpacesScreen: View {
var body: some View {
Form {
header
if !context.viewState.authorizedSpacesSelection.joinedParentSpaces.isEmpty {
joinedParentsSection
}
if !context.viewState.authorizedSpacesSelection.unknownSpacesIDs.isEmpty {
unkwnownSpacesSection
unknownSpacesSection
}
}
.compoundList()
@@ -50,7 +52,7 @@ struct ManageAuthorizedSpacesScreen: View {
ListRow(label: .avatar(title: space.name,
description: space.canonicalAlias,
icon: avatar(space: space)),
kind: .multiSelection(isSelected: context.viewState.desiredSelectedIDs.contains(space.id)) {
kind: .multiSelection(isSelected: context.viewState.selectedIDs.contains(space.id)) {
context.send(viewAction: .toggle(spaceID: space.id))
})
}
@@ -60,12 +62,12 @@ struct ManageAuthorizedSpacesScreen: View {
}
}
private var unkwnownSpacesSection: some View {
private var unknownSpacesSection: some View {
Section {
ForEach(context.viewState.authorizedSpacesSelection.unknownSpacesIDs, id: \.self) { id in
ListRow(label: .plain(title: L10n.screenManageAuthorizedSpacesUnknownSpace,
description: id),
kind: .multiSelection(isSelected: context.viewState.desiredSelectedIDs.contains(id)) {
kind: .multiSelection(isSelected: context.viewState.selectedIDs.contains(id)) {
context.send(viewAction: .toggle(spaceID: id))
})
}
@@ -104,7 +106,7 @@ struct ManageAuthorizedSpacesScreen_Previews: PreviewProvider, TestablePreview {
unknownSpacesIDs: ["!unknown-space-id-1",
"!unknown-space-id-2",
"!unknown-space-id-3"],
currentSelectedIDs: ["space1",
initialSelectedIDs: ["space1",
"space3",
"!unknown-space-id-2"]),
mediaProvider: MediaProviderMock(configuration: .init()))