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

Space Settings UI tweaks (#4678)

Browse Source 
* design tweaks for the space settings flow

* pr suggestions

* update proj
This commit is contained in:
Mauro
2025-10-31 12:52:56 +01:00
committed by GitHub
parent 010500a083
commit dc9ab56972
37 changed files with 187 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Spaces/SpaceSettingsScreen/SpaceSettingsScreenModels.swift
+1
View File
@@ -15,6 +15,7 @@ struct SpaceSettingsScreenViewState: BindableState {
var joinedMembersCount: Int
var hasMemberIdentityVerificationStateViolations = false
var canEditBaseInfo = false
var canEditRolesOrPermissions = false
}
ElementX/Sources/Screens/Spaces/SpaceSettingsScreen/SpaceSettingsScreenViewModel.swift
+1
View File
@@ -57,6 +57,7 @@ class SpaceSettingsScreenViewModel: SpaceSettingsScreenViewModelType, SpaceSetti
if let powerLevels = roomInfo.powerLevels {
state.canEditRolesOrPermissions = powerLevels.canOwnUserEditRolesAndPermissions()
state.canEditBaseInfo = powerLevels.canOwnUserEditBaseInfo()
}
}
ElementX/Sources/Screens/Spaces/SpaceSettingsScreen/View/SpaceSettingsScreen.swift
+38 -16
View File
@@ -26,17 +26,24 @@ struct SpaceSettingsScreen: View {
private var editSection: some View {
Section {
ListRow(kind: .custom {
Button {
context.send(viewAction: .processTapEdit)
} label: {
editSectionContent
}
})
ListRow(kind: .custom { editRow })
}
}
private var editSectionContent: some View {
@ViewBuilder
private var editRow: some View {
if context.viewState.canEditBaseInfo {
Button {
context.send(viewAction: .processTapEdit)
} label: {
editRowContent
}
} else {
editRowContent
}
}
private var editRowContent: some View {
HStack(spacing: 12) {
RoomAvatarImage(avatar: context.viewState.details.avatar,
avatarSize: .room(on: .spaceSettings),
@@ -57,7 +64,9 @@ struct SpaceSettingsScreen: View {
}
.frame(maxWidth: .infinity, alignment: .leading)
ListRowAccessory.navigationLink
if context.viewState.canEditBaseInfo {
ListRowAccessory.navigationLink
}
}
.padding(.horizontal, ListRowPadding.horizontal)
.padding(.vertical, 16)
@@ -108,16 +117,29 @@ struct SpaceSettingsScreen: View {
// MARK: - Previews
struct SpaceSettingsScreen_Previews: PreviewProvider, TestablePreview {
static let viewModel = SpaceSettingsScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(name: "Space",
avatarURL: .mockMXCAvatar,
isSpace: true,
canonicalAlias: "#space:matrix.org",
members: .allMembersAsCreator)),
userSession: UserSessionMock(.init()))
static let ownerViewModel = SpaceSettingsScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(name: "Space",
avatarURL: .mockMXCAvatar,
isSpace: true,
canonicalAlias: "#space:matrix.org",
members: .allMembersAsCreator)),
userSession: UserSessionMock(.init()))
static let userViewModel = SpaceSettingsScreenViewModel(roomProxy: JoinedRoomProxyMock(.init(name: "Space",
avatarURL: .mockMXCAvatar,
isSpace: true,
canonicalAlias: "#space:matrix.org",
members: .allMembers)),
userSession: UserSessionMock(.init()))
static var previews: some View {
NavigationStack {
SpaceSettingsScreen(context: viewModel.context)
SpaceSettingsScreen(context: ownerViewModel.context)
}
.previewDisplayName("Owner")
NavigationStack {
SpaceSettingsScreen(context: userViewModel.context)
}
.previewDisplayName("User")
}
}