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

Minor space tweaks (#4577)

Browse Source 
* Hide the space ShareLink on iOS 26 for now.

* Don't allow the last admin to leave a space.
This commit is contained in:
Doug
2025-10-07 08:16:48 +01:00
committed by GitHub
parent 93f712779d
commit 0f38f303ab
23 changed files with 262 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Generated/Strings.swift
+2
View File
@@ -206,6 +206,8 @@ internal enum L10n {
internal static var actionForward: String { return L10n.tr("Localizable", "action_forward") }
/// Go back
internal static var actionGoBack: String { return L10n.tr("Localizable", "action_go_back") }
/// Go to settings
internal static var actionGoToSettings: String { return L10n.tr("Localizable", "action_go_to_settings") }
/// Ignore
internal static var actionIgnore: String { return L10n.tr("Localizable", "action_ignore") }
/// Invite
ElementX/Sources/Mocks/SDK/LeaveSpaceHandleSDKMock.swift
+10
View File
@@ -21,6 +21,16 @@ extension LeaveSpaceHandleSDKMock {
}
extension [LeaveSpaceRoom] {
static func mockLastSpaceAdmin(spaceRoomProxy: SpaceRoomProxyProtocol) -> [LeaveSpaceRoom] {
mockRooms + [LeaveSpaceRoom(spaceRoom: SpaceRoom(id: spaceRoomProxy.id,
name: spaceRoomProxy.computedName,
avatarURL: spaceRoomProxy.avatarURL,
isSpace: true,
memberCount: UInt64(spaceRoomProxy.joinedMembersCount),
joinRule: spaceRoomProxy.joinRule),
isLastAdmin: true)]
}
static var mockAdminRooms: [LeaveSpaceRoom] {
mockRooms.filter(\.isLastAdmin)
}
ElementX/Sources/Other/TestablePreview/TestablePreviewsDictionary.swift
+1
View File
@@ -70,6 +70,7 @@ enum TestablePreviewsDictionary {
"KnockRequestsListEmptyStateView_Previews" : KnockRequestsListEmptyStateView_Previews.self,
"KnockRequestsListScreen_Previews" : KnockRequestsListScreen_Previews.self,
"LabsScreen_Previews" : LabsScreen_Previews.self,
"LeaveSpaceRoomDetailsCell_Previews" : LeaveSpaceRoomDetailsCell_Previews.self,
"LeaveSpaceView_Previews" : LeaveSpaceView_Previews.self,
"LegalInformationScreen_Previews" : LegalInformationScreen_Previews.self,
"LoadableImage_Previews" : LoadableImage_Previews.self,
ElementX/Sources/Screens/Spaces/SpaceScreen/SpaceScreenModels.swift
+3
View File
@@ -24,6 +24,8 @@ struct SpaceScreenViewState: BindableState {
var selectedSpaceRoomID: String?
var joiningRoomIDs: Set<String> = []
var isSpaceManagementEnabled = false
var bindings = SpaceScreenViewStateBindings()
var spaceName: String { space.name ?? L10n.commonSpace }
@@ -39,4 +41,5 @@ enum SpaceScreenViewAction {
case deselectAllLeaveRoomDetails
case toggleLeaveSpaceRoomDetails(id: String)
case confirmLeaveSpace
case spaceSettings
}
ElementX/Sources/Screens/Spaces/SpaceScreen/SpaceScreenViewModel.swift
+2
View File
@@ -104,6 +104,8 @@ class SpaceScreenViewModel: SpaceScreenViewModelType, SpaceScreenViewModelProtoc
}
case .confirmLeaveSpace:
Task { await confirmLeaveSpace() }
case .spaceSettings:
break // Not implemented.
}
}
ElementX/Sources/Screens/Spaces/SpaceScreen/View/LeaveSpaceRoomDetailsCell.swift
+116
View File
@@ -0,0 +1,116 @@
//
// Copyright 2025 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//
import Compound
import SwiftUI
struct LeaveSpaceRoomDetailsCell: View {
@Environment(\.dynamicTypeSize) private var dynamicTypeSize
let room: LeaveSpaceRoomDetails
let mediaProvider: MediaProviderProtocol?
let action: () -> Void
private var subtitle: String? {
guard !room.spaceRoomProxy.isSpace else { return nil }
let memberCount = L10n.commonMemberCount(room.spaceRoomProxy.joinedMembersCount)
return room.isLastAdmin ? L10n.screenLeaveSpaceLastAdminInfo(memberCount) : memberCount
}
var visibilityIcon: KeyPath<CompoundIcons, Image>? {
switch room.spaceRoomProxy.visibility {
case .public: \.public
case .private: \.lockSolid
case .restricted: nil
case .none: \.lockSolid
}
}
var body: some View {
Button(action: action) {
HStack(spacing: 16) {
if dynamicTypeSize < .accessibility3 {
RoomAvatarImage(avatar: room.spaceRoomProxy.avatar,
avatarSize: .room(on: .leaveSpace),
mediaProvider: mediaProvider)
}
VStack(alignment: .leading, spacing: 0) {
Text(room.spaceRoomProxy.computedName)
.font(.compound.bodyLGSemibold)
.foregroundStyle(.compound.textPrimary)
.lineLimit(1)
.padding(.vertical, 1)
.padding(.vertical, subtitle == nil ? 10 : 0)
subtitleLabel
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 8)
ListRowAccessory.multiSelection(room.isSelected)
}
.padding(.horizontal, 16)
}
.buttonStyle(SpaceRoomCellButtonStyle(isSelected: false))
}
@ViewBuilder
private var subtitleLabel: some View {
if let subtitle {
Label {
Text(subtitle)
.font(.compound.bodyMD)
.foregroundStyle(.compound.textSecondary)
.lineLimit(1)
.padding(.vertical, 1)
} icon: {
if let visibilityIcon {
CompoundIcon(visibilityIcon,
size: .xSmall,
relativeTo: .compound.bodyMD)
.foregroundStyle(.compound.iconTertiary)
}
}
.labelStyle(.custom(spacing: 4))
}
}
}
// MARK: - Previews
struct LeaveSpaceRoomDetailsCell_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
VStack(spacing: 0) {
LeaveSpaceRoomDetailsCell(room: .init(spaceRoomProxy: SpaceRoomProxyMock(.init(id: "1",
name: "Space",
isSpace: true)),
isLastAdmin: false,
isSelected: true),
mediaProvider: MediaProviderMock(configuration: .init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceRoomProxy: SpaceRoomProxyMock(.init(id: "2",
name: "My Space",
isSpace: true)),
isLastAdmin: true,
isSelected: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceRoomProxy: SpaceRoomProxyMock(.init(id: "3",
name: "Room",
isSpace: false)),
isLastAdmin: false,
isSelected: true),
mediaProvider: MediaProviderMock(configuration: .init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceRoomProxy: SpaceRoomProxyMock(.init(id: "4",
name: "My Room",
isSpace: false)),
isLastAdmin: true,
isSelected: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
}
}
}
ElementX/Sources/Screens/Spaces/SpaceScreen/View/LeaveSpaceView.swift
+68 -114
View File
@@ -9,7 +9,10 @@ import Compound
import SwiftUI
struct LeaveSpaceView: View {
@Environment(\.dismiss) private var dismiss
let context: SpaceScreenViewModel.Context
let leaveHandle: LeaveSpaceHandleProxy
@State private var scrollViewHeight: CGFloat = .zero
@State private var buttonsHeight: CGFloat = .zero
@@ -39,24 +42,16 @@ struct LeaveSpaceView: View {
BigIcon(icon: \.errorSolid, style: .alertSolid)
VStack(spacing: 8) {
Text(L10n.screenLeaveSpaceTitle(context.viewState.spaceName))
Text(leaveHandle.title(spaceName: context.viewState.spaceName))
.font(.compound.headingMDBold)
.foregroundStyle(.compound.textPrimary)
.multilineTextAlignment(.center)
switch context.leaveHandle?.mode {
case .manyRooms:
Text(L10n.screenLeaveSpaceSubtitle)
if let subtitle = leaveHandle.subtitle {
Text(subtitle)
.font(.compound.bodyMD)
.foregroundStyle(.compound.textSecondary)
.multilineTextAlignment(.center)
case .onlyAdminRooms:
Text(L10n.screenLeaveSpaceSubtitleOnlyLastAdmin)
.font(.compound.bodyMD)
.foregroundStyle(.compound.textSecondary)
.multilineTextAlignment(.center)
case .noRooms, nil:
EmptyView()
}
}
}
@@ -65,10 +60,10 @@ struct LeaveSpaceView: View {
@ViewBuilder
var rooms: some View {
if let leaveRooms = context.leaveHandle?.rooms, !leaveRooms.isEmpty {
if !leaveHandle.rooms.isEmpty, leaveHandle.canLeave {
LazyVStack(spacing: 0, pinnedViews: .sectionHeaders) {
Section {
ForEach(leaveRooms, id: \.spaceRoomProxy.id) { room in
ForEach(leaveHandle.rooms, id: \.spaceRoomProxy.id) { room in
LeaveSpaceRoomDetailsCell(room: room, mediaProvider: context.mediaProvider) {
context.send(viewAction: .toggleLeaveSpaceRoomDetails(id: room.spaceRoomProxy.id))
}
@@ -90,94 +85,50 @@ struct LeaveSpaceView: View {
var buttons: some View {
VStack(spacing: 16) {
Button(role: .destructive) {
context.send(viewAction: .confirmLeaveSpace)
} label: {
Label(context.leaveHandle?.confirmationTitle ?? L10n.actionLeaveSpace, icon: \.leave)
if leaveHandle.canLeave {
Button(role: .destructive) {
context.send(viewAction: .confirmLeaveSpace)
} label: {
Label(leaveHandle.confirmationTitle, icon: \.leave)
}
.buttonStyle(.compound(.primary))
} else if context.viewState.isSpaceManagementEnabled {
Button {
context.send(viewAction: .spaceSettings)
} label: {
Label(L10n.actionGoToSettings, icon: \.settings)
}
.buttonStyle(.compound(.primary))
}
.buttonStyle(.compound(.primary))
Button(L10n.actionCancel) {
context.leaveHandle = nil
}
.buttonStyle(.compound(.tertiary))
Button(L10n.actionCancel, action: dismiss.callAsFunction)
.buttonStyle(.compound(.tertiary))
}
.padding(.horizontal, 16)
.padding(.top, 16)
}
}
struct LeaveSpaceRoomDetailsCell: View {
@Environment(\.dynamicTypeSize) private var dynamicTypeSize
let room: LeaveSpaceRoomDetails
let mediaProvider: MediaProviderProtocol?
let action: () -> Void
private var subtitle: String? {
guard !room.spaceRoomProxy.isSpace else { return nil }
let memberCount = L10n.commonMemberCount(room.spaceRoomProxy.joinedMembersCount)
return room.isLastAdmin ? L10n.screenLeaveSpaceLastAdminInfo(memberCount) : memberCount
}
var visibilityIcon: KeyPath<CompoundIcons, Image>? {
switch room.spaceRoomProxy.visibility {
case .public: \.public
case .private: \.lockSolid
case .restricted: nil
case .none: \.lockSolid
private extension LeaveSpaceHandleProxy {
func title(spaceName: String) -> String {
switch mode {
case .lastSpaceAdmin: L10n.screenLeaveSpaceTitleLastAdmin(spaceName)
default: L10n.screenLeaveSpaceTitle(spaceName)
}
}
var body: some View {
Button(action: action) {
HStack(spacing: 16) {
if dynamicTypeSize < .accessibility3 {
RoomAvatarImage(avatar: room.spaceRoomProxy.avatar,
avatarSize: .room(on: .leaveSpace),
mediaProvider: mediaProvider)
}
VStack(alignment: .leading, spacing: 0) {
Text(room.spaceRoomProxy.computedName)
.font(.compound.bodyLGSemibold)
.foregroundStyle(.compound.textPrimary)
.lineLimit(1)
.padding(.vertical, 1)
.padding(.vertical, subtitle == nil ? 10 : 0)
subtitleLabel
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 8)
ListRowAccessory.multiSelection(room.isSelected)
}
.padding(.horizontal, 16)
var subtitle: String? {
switch mode {
case .manyRooms: L10n.screenLeaveSpaceSubtitle
case .onlyAdminRooms: L10n.screenLeaveSpaceSubtitleOnlyLastAdmin
case .noRooms: nil
case .lastSpaceAdmin: L10n.screenLeaveSpaceSubtitleLastAdmin
}
.buttonStyle(SpaceRoomCellButtonStyle(isSelected: false))
}
@ViewBuilder
private var subtitleLabel: some View {
if let subtitle {
Label {
Text(subtitle)
.font(.compound.bodyMD)
.foregroundStyle(.compound.textSecondary)
.lineLimit(1)
.padding(.vertical, 1)
} icon: {
if let visibilityIcon {
CompoundIcon(visibilityIcon,
size: .xSmall,
relativeTo: .compound.bodyMD)
.foregroundStyle(.compound.iconTertiary)
}
}
.labelStyle(.custom(spacing: 4))
}
var confirmationTitle: String {
let selectedCount = selectedCount
return selectedCount > 0 ? L10n.screenLeaveSpaceSubmit(selectedCount) : L10n.actionLeaveSpace
}
}
@@ -186,48 +137,51 @@ struct LeaveSpaceRoomDetailsCell: View {
import MatrixRustSDK
struct LeaveSpaceView_Previews: PreviewProvider, TestablePreview {
static let viewModel = makeViewModel(mode: .manyRooms)
static let onlyAdminRoomsViewModel = makeViewModel(mode: .onlyAdminRooms)
static let noRoomsViewModel = makeViewModel(mode: .noRooms)
static let viewModel = makeViewModel()
static var previews: some View {
LeaveSpaceView(context: viewModel.context)
LeaveSpaceView(context: viewModel.context, leaveHandle: makeLeaveHandle(mode: .manyRooms))
.previewDisplayName("Many Rooms")
.snapshotPreferences(expect: viewModel.context.observe(\.leaveHandle).map { $0 != nil }.eraseToStream())
LeaveSpaceView(context: onlyAdminRoomsViewModel.context)
LeaveSpaceView(context: viewModel.context, leaveHandle: makeLeaveHandle(mode: .onlyAdminRooms))
.previewDisplayName("Only Admin Rooms")
.snapshotPreferences(expect: viewModel.context.observe(\.leaveHandle).map { $0 != nil }.eraseToStream())
LeaveSpaceView(context: noRoomsViewModel.context)
LeaveSpaceView(context: viewModel.context, leaveHandle: makeLeaveHandle(mode: .noRooms))
.previewDisplayName("No Rooms")
.snapshotPreferences(expect: viewModel.context.observe(\.leaveHandle).map { $0 != nil }.eraseToStream())
LeaveSpaceView(context: viewModel.context, leaveHandle: makeLeaveHandle(mode: .lastSpaceAdmin))
.previewDisplayName("Last Space Admin")
}
static func makeViewModel(mode: LeaveSpaceHandleProxy.Mode) -> SpaceScreenViewModel {
let spaceRoomProxy = SpaceRoomProxyMock(.init(id: "!eng-space:matrix.org",
name: "Engineering Team",
isSpace: true,
parent: SpaceRoomProxyMock(.init(name: "MegaGroup", isSpace: true)),
childrenCount: 30,
joinedMembersCount: 76,
heroes: [.mockDan, .mockBob, .mockCharlie, .mockVerbose],
topic: "Description of the space goes right here. Lorem ipsum dolor sit amet consectetur. Leo viverra morbi habitant in.",
joinRule: .knockRestricted(rules: [.roomMembership(roomId: "")])))
static let spaceRoomProxy = SpaceRoomProxyMock(.init(id: "!eng-space:matrix.org",
name: "Engineering Team",
isSpace: true,
parent: SpaceRoomProxyMock(.init(name: "MegaGroup", isSpace: true)),
childrenCount: 30,
joinedMembersCount: 76,
heroes: [.mockDan, .mockBob, .mockCharlie, .mockVerbose],
topic: "Description of the space goes right here. Lorem ipsum dolor sit amet consectetur. Leo viverra morbi habitant in.",
joinRule: .knockRestricted(rules: [.roomMembership(roomId: "")])))
static func makeViewModel() -> SpaceScreenViewModel {
let spaceRoomListProxy = SpaceRoomListProxyMock(.init(spaceRoomProxy: spaceRoomProxy,
initialSpaceRooms: .mockSpaceList))
let rooms: [LeaveSpaceRoom] = switch mode {
case .manyRooms: .mockRooms
case .onlyAdminRooms: .mockAdminRooms
case .noRooms: []
}
let spaceServiceProxy = SpaceServiceProxyMock(.init(leaveSpaceRooms: rooms))
let spaceServiceProxy = SpaceServiceProxyMock(.init())
let viewModel = SpaceScreenViewModel(spaceRoomListProxy: spaceRoomListProxy,
spaceServiceProxy: spaceServiceProxy,
selectedSpaceRoomPublisher: .init(nil),
userSession: UserSessionMock(.init()),
userIndicatorController: UserIndicatorControllerMock())
viewModel.context.send(viewAction: .leaveSpace)
return viewModel
}
static func makeLeaveHandle(mode: LeaveSpaceHandleProxy.Mode) -> LeaveSpaceHandleProxy {
let rooms: [LeaveSpaceRoom] = switch mode {
case .manyRooms: .mockRooms
case .onlyAdminRooms: .mockAdminRooms
case .noRooms: []
case .lastSpaceAdmin: .mockLastSpaceAdmin(spaceRoomProxy: spaceRoomProxy)
}
return LeaveSpaceHandleProxy(spaceID: spaceRoomProxy.id,
leaveHandle: LeaveSpaceHandleSDKMock(.init(rooms: rooms)))
}
}
ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift
+4 -3
View File
@@ -23,8 +23,8 @@ struct SpaceScreen: View {
.navigationTitle(context.viewState.spaceName)
.navigationBarTitleDisplayMode(.inline)
.toolbar { toolbar }
.sheet(item: $context.leaveHandle) { _ in
LeaveSpaceView(context: context)
.sheet(item: $context.leaveHandle) { leaveHandle in
LeaveSpaceView(context: context, leaveHandle: leaveHandle)
}
}
@@ -56,7 +56,8 @@ struct SpaceScreen: View {
}
ToolbarItemGroup(placement: .secondaryAction) {
if let permalink = context.viewState.permalink {
// FIXME: The ShareLink crashes on iOS 26 due to the share sheet failing to morph out of the button 🤦‍♂️
if let permalink = context.viewState.permalink, #unavailable(iOS 26.0) {
Section {
ShareLink(item: permalink) {
Label(L10n.actionShare, icon: \.shareIos)
ElementX/Sources/Services/Spaces/LeaveSpaceHandleProxy.swift
+13 -11
View File
@@ -10,17 +10,24 @@ import MatrixRustSDK
class LeaveSpaceHandleProxy: Identifiable {
let id: String
let leaveHandle: LeaveSpaceHandleProtocol
var rooms: [LeaveSpaceRoomDetails]
enum Mode { case manyRooms, onlyAdminRooms, noRooms }
enum Mode { case manyRooms, onlyAdminRooms, noRooms, lastSpaceAdmin }
let mode: Mode
private let leaveHandle: LeaveSpaceHandleProtocol
var canLeave: Bool { mode != .lastSpaceAdmin }
var selectedCount: Int { rooms.count { $0.isSelected } }
init(spaceID: String, leaveHandle: LeaveSpaceHandleProtocol) {
id = spaceID
self.leaveHandle = leaveHandle
rooms = leaveHandle.rooms()
let rooms = leaveHandle.rooms()
let space = rooms.first { $0.spaceRoom.roomId == spaceID }
self.rooms = rooms
.compactMap { room in
guard room.spaceRoom.state == .joined, // The SDK is going to do this but not yet.
room.spaceRoom.isDirect != true,
@@ -32,7 +39,9 @@ class LeaveSpaceHandleProxy: Identifiable {
isSelected: !room.isLastAdmin)
}
mode = if rooms.isEmpty {
mode = if space?.isLastAdmin == true {
.lastSpaceAdmin
} else if rooms.isEmpty {
.noRooms
} else if rooms.count(where: { !$0.isLastAdmin }) == 0 {
.onlyAdminRooms
@@ -54,13 +63,6 @@ class LeaveSpaceHandleProxy: Identifiable {
return .failure(.sdkError(error))
}
}
var selectedCount: Int { rooms.count { $0.isSelected } }
var confirmationTitle: String {
let selectedCount = selectedCount
return selectedCount > 0 ? L10n.screenLeaveSpaceSubmit(selectedCount) : L10n.actionLeaveSpace
}
}
@Observable class LeaveSpaceRoomDetails {