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

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/FlowCoordinators/SpaceSettingsFlowCoordinator.swift
+1
View File
@@ -1,3 +1,4 @@
//
// Copyright 2025 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
ElementX/Sources/Other/SwiftUI/Views/ToolbarButton.swift
+49 -2
View File
@@ -12,6 +12,7 @@ struct ToolbarButton: View {
enum Role {
case cancel
case done
case save
var title: String {
switch self {
@@ -19,15 +20,29 @@ struct ToolbarButton: View {
L10n.actionCancel
case .done:
L10n.actionDone
case .save:
L10n.actionSave
}
}
var icon: CompoundIcon {
@ViewBuilder
var icon: some View {
switch self {
case .cancel:
CompoundIcon(\.close)
case .done:
.foregroundStyle(.compound.iconPrimary)
case .done, .save:
CompoundIcon(\.check)
.foregroundStyle(.compound.iconOnSolidPrimary)
}
}
var tint: Color {
switch self {
case .cancel:
.compound.bgCanvasDefault
case .done, .save:
.compound.bgAccentRest
}
}
}
@@ -41,8 +56,40 @@ struct ToolbarButton: View {
role.icon
.accessibilityLabel(role.title)
}
.tint(role.tint)
.buttonStyleGlassProminent()
} else {
Button(role.title, action: action)
}
}
}
@available(iOS 26, *)
private extension View {
@ViewBuilder
func buttonStyleGlassProminent() -> some View {
// `.glassProminent` breaks our preview tests so we need to disable it when running tests.
// https://github.com/pointfreeco/swift-snapshot-testing/issues/1029#issuecomment-3366942138
if ProcessInfo.isRunningTests {
self
} else {
buttonStyle(.glassProminent)
}
}
}
struct ToolbarButton_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
NavigationStack {
Color.clear
.toolbar {
ToolbarItem(placement: .confirmationAction) {
ToolbarButton(role: .done) { }
}
ToolbarItem(placement: .cancellationAction) {
ToolbarButton(role: .cancel) { }
}
}
}
}
}
ElementX/Sources/Other/TestablePreview/TestablePreviewsDictionary.swift
+1
View File
@@ -194,6 +194,7 @@ enum TestablePreviewsDictionary {
"TimelineThreadSummaryView_Previews" : TimelineThreadSummaryView_Previews.self,
"TimelineView_Previews" : TimelineView_Previews.self,
"TombstonedAvatarImage_Previews" : TombstonedAvatarImage_Previews.self,
"ToolbarButton_Previews" : ToolbarButton_Previews.self,
"TypingIndicatorView_Previews" : TypingIndicatorView_Previews.self,
"UnsupportedRoomTimelineView_Previews" : UnsupportedRoomTimelineView_Previews.self,
"UserDetailsEditScreen_Previews" : UserDetailsEditScreen_Previews.self,
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()))
ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift
+3 -2
View File
@@ -236,6 +236,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
private func handleSelectedSpaceMembersAccess() {
guard !state.bindings.desiredSettings.accessType.isSpaceUsers else {
// If the user is tapping the space members access again we do nothing
return
}
@@ -257,8 +258,8 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
let selectedIDs = Set(state.bindings.desiredSettings.accessType.spaceIDs)
let authorizedSpacesSelection = AuthorizedSpacesSelection(joinedParentSpaces: joinedParentSpaces,
unknownSpacesIDs: unknownSpaceIDs,
currentSelectedIDs: selectedIDs)
authorizedSpacesSelection.desiredSelectIDs
initialSelectedIDs: selectedIDs)
authorizedSpacesSelection.selectedIDs
.sink { [weak self] desiredSelectedIDs in
self?.state.bindings.desiredSettings.accessType = .spaceUsers(spaceIDs: desiredSelectedIDs.sorted())
}