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

The space tweaks continue! (#4606)

Browse Source 
* Update a string on the space announcement sheet.

* Don't show space rooms after using the join button in the space room list.

* Allow the Deselect All button to Select (almost) All as well.

* Fix the cells in the leave space sheet when there are only admin rooms.
This commit is contained in:
Doug
2025-10-09 16:56:54 +01:00
committed by GitHub
parent 40367eeec9
commit b496955f6b
15 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Generated/Strings.swift
+5 -5
View File
@@ -178,6 +178,8 @@ internal enum L10n {
internal static var actionDeclineAndBlock: String { return L10n.tr("Localizable", "action_decline_and_block") }
/// Delete Poll
internal static var actionDeletePoll: String { return L10n.tr("Localizable", "action_delete_poll") }
/// Deselect all
internal static var actionDeselectAll: String { return L10n.tr("Localizable", "action_deselect_all") }
/// Disable
internal static var actionDisable: String { return L10n.tr("Localizable", "action_disable") }
/// Discard
@@ -302,6 +304,8 @@ internal enum L10n {
internal static var actionSave: String { return L10n.tr("Localizable", "action_save") }
/// Search
internal static var actionSearch: String { return L10n.tr("Localizable", "action_search") }
/// Select all
internal static var actionSelectAll: String { return L10n.tr("Localizable", "action_select_all") }
/// Send
internal static var actionSend: String { return L10n.tr("Localizable", "action_send") }
/// Send edited message
@@ -430,8 +434,6 @@ internal enum L10n {
internal static var commonDecryptionError: String { return L10n.tr("Localizable", "common_decryption_error") }
/// Description
internal static var commonDescription: String { return L10n.tr("Localizable", "common_description") }
/// Deselect all
internal static var commonDeselectAll: String { return L10n.tr("Localizable", "common_deselect_all") }
/// Developer options
internal static var commonDeveloperOptions: String { return L10n.tr("Localizable", "common_developer_options") }
/// Device ID
@@ -638,8 +640,6 @@ internal enum L10n {
internal static var commonSecurity: String { return L10n.tr("Localizable", "common_security") }
/// Seen by
internal static var commonSeenBy: String { return L10n.tr("Localizable", "common_seen_by") }
/// Select all
internal static var commonSelectAll: String { return L10n.tr("Localizable", "common_select_all") }
/// Send to
internal static var commonSendTo: String { return L10n.tr("Localizable", "common_send_to") }
/// Sending…
@@ -2938,7 +2938,7 @@ internal enum L10n {
internal static var screenSpaceAnnouncementItem4: String { return L10n.tr("Localizable", "screen_space_announcement_item4") }
/// Leave any spaces you’ve joined
internal static var screenSpaceAnnouncementItem5: String { return L10n.tr("Localizable", "screen_space_announcement_item5") }
/// Creating and managing spaces is coming soon.
/// Filtering, creating and managing spaces is coming soon.
internal static var screenSpaceAnnouncementNotice: String { return L10n.tr("Localizable", "screen_space_announcement_notice") }
/// Welcome to the beta version of Spaces! With this first version you can:
internal static var screenSpaceAnnouncementSubtitle: String { return L10n.tr("Localizable", "screen_space_announcement_subtitle") }
ElementX/Sources/Screens/Spaces/SpaceScreen/SpaceScreenModels.swift
+1 -2
View File
@@ -27,8 +27,6 @@ struct SpaceScreenViewState: BindableState {
var isSpaceManagementEnabled = false
var bindings = SpaceScreenViewStateBindings()
var spaceName: String { space.name ?? L10n.commonSpace }
}
struct SpaceScreenViewStateBindings {
@@ -39,6 +37,7 @@ enum SpaceScreenViewAction {
case spaceAction(SpaceRoomCell.Action)
case leaveSpace
case deselectAllLeaveRoomDetails
case selectAllLeaveRoomDetails
case toggleLeaveSpaceRoomDetails(id: String)
case confirmLeaveSpace
case spaceSettings
ElementX/Sources/Screens/Spaces/SpaceScreen/SpaceScreenViewModel.swift
+6 -8
View File
@@ -95,6 +95,11 @@ class SpaceScreenViewModel: SpaceScreenViewModelType, SpaceScreenViewModelProtoc
for room in leaveHandle.rooms {
room.isSelected = false
}
case .selectAllLeaveRoomDetails:
guard let leaveHandle = state.bindings.leaveHandle else { fatalError("The leave handle should be available.") }
for room in leaveHandle.rooms where !room.isLastAdmin {
room.isSelected = true
}
case .toggleLeaveSpaceRoomDetails(let spaceRoomID):
guard let room = state.bindings.leaveHandle?.rooms.first(where: { $0.spaceRoomProxy.id == spaceRoomID }) else {
fatalError("The space room to toggle is not in the list of rooms to leave.")
@@ -125,14 +130,7 @@ class SpaceScreenViewModel: SpaceScreenViewModelType, SpaceScreenViewModelProtoc
return
}
// If multiple join operations are running, then only show the last one.
guard state.joiningRoomIDs == [spaceRoomProxy.id] else { return }
if spaceRoomProxy.isSpace {
await selectSpace(spaceRoomProxy)
} else {
actionsSubject.send(.selectRoom(roomID: spaceRoomProxy.id))
}
// We don't want to show the space room after joining it this way 🤷‍♂️
}
private func selectSpace(_ spaceRoomProxy: SpaceRoomProxyProtocol) async {
ElementX/Sources/Screens/Spaces/SpaceScreen/View/LeaveSpaceRoomDetailsCell.swift
+18 -1
View File
@@ -12,6 +12,7 @@ struct LeaveSpaceRoomDetailsCell: View {
@Environment(\.dynamicTypeSize) private var dynamicTypeSize
let room: LeaveSpaceRoomDetails
var hideSelection = false
let mediaProvider: MediaProviderProtocol?
let action: () -> Void
@@ -53,7 +54,9 @@ struct LeaveSpaceRoomDetailsCell: View {
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 8)
ListRowAccessory.multiSelection(room.isSelected)
if !hideSelection {
ListRowAccessory.multiSelection(room.isSelected)
}
}
.padding(.horizontal, 16)
}
@@ -99,6 +102,13 @@ struct LeaveSpaceRoomDetailsCell_Previews: PreviewProvider, TestablePreview {
isLastAdmin: true,
isSelected: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceRoomProxy: SpaceRoomProxyMock(.init(id: "2",
name: "My Space",
isSpace: true)),
isLastAdmin: true,
isSelected: false),
hideSelection: true,
mediaProvider: MediaProviderMock(configuration: .init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceRoomProxy: SpaceRoomProxyMock(.init(id: "3",
name: "Room",
isSpace: false)),
@@ -111,6 +121,13 @@ struct LeaveSpaceRoomDetailsCell_Previews: PreviewProvider, TestablePreview {
isLastAdmin: true,
isSelected: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceRoomProxy: SpaceRoomProxyMock(.init(id: "4",
name: "My Room",
isSpace: false)),
isLastAdmin: true,
isSelected: false),
hideSelection: true,
mediaProvider: MediaProviderMock(configuration: .init())) { }
}
}
}
ElementX/Sources/Screens/Spaces/SpaceScreen/View/LeaveSpaceView.swift
+13 -9
View File
@@ -42,7 +42,7 @@ struct LeaveSpaceView: View {
BigIcon(icon: \.errorSolid, style: .alertSolid)
VStack(spacing: 8) {
Text(leaveHandle.title(spaceName: context.viewState.spaceName))
Text(leaveHandle.title(spaceName: context.viewState.space.name))
.font(.compound.headingMDBold)
.foregroundStyle(.compound.textPrimary)
.multilineTextAlignment(.center)
@@ -64,20 +64,24 @@ struct LeaveSpaceView: View {
LazyVStack(spacing: 0, pinnedViews: .sectionHeaders) {
Section {
ForEach(leaveHandle.rooms, id: \.spaceRoomProxy.id) { room in
LeaveSpaceRoomDetailsCell(room: room, mediaProvider: context.mediaProvider) {
LeaveSpaceRoomDetailsCell(room: room,
hideSelection: leaveHandle.mode == .onlyAdminRooms,
mediaProvider: context.mediaProvider) {
context.send(viewAction: .toggleLeaveSpaceRoomDetails(id: room.spaceRoomProxy.id))
}
.disabled(room.isLastAdmin)
}
} header: {
Button(L10n.commonDeselectAll) {
context.send(viewAction: .deselectAllLeaveRoomDetails)
if leaveHandle.mode == .manyRooms {
Button(leaveHandle.selectedCount > 0 ? L10n.actionDeselectAll : L10n.actionSelectAll) {
context.send(viewAction: leaveHandle.selectedCount > 0 ? .deselectAllLeaveRoomDetails : .selectAllLeaveRoomDetails)
}
.buttonStyle(.compound(.textLink, size: .small))
.frame(maxWidth: .infinity, alignment: .trailing)
.padding(.horizontal, 16)
.padding(.bottom, 8)
.background(Color.compound.bgCanvasDefault.ignoresSafeArea())
}
.buttonStyle(.compound(.textLink, size: .small))
.frame(maxWidth: .infinity, alignment: .trailing)
.padding(.horizontal, 16)
.padding(.bottom, 8)
.background(Color.compound.bgCanvasDefault.ignoresSafeArea())
}
}
}
ElementX/Sources/Screens/Spaces/SpaceScreen/View/SpaceScreen.swift
+2 -2
View File
@@ -20,7 +20,7 @@ struct SpaceScreen: View {
}
}
.background(Color.compound.bgCanvasDefault.ignoresSafeArea())
.navigationTitle(context.viewState.spaceName)
.navigationTitle(context.viewState.space.name)
.navigationBarTitleDisplayMode(.inline)
.toolbar { toolbar }
.sheet(item: $context.leaveHandle) { leaveHandle in
@@ -50,7 +50,7 @@ struct SpaceScreen: View {
// Use the same trick as the RoomScreen for a leading title view that
// also hides the navigation title.
ToolbarItem(placement: .principal) {
RoomHeaderView(roomName: context.viewState.spaceName,
RoomHeaderView(roomName: context.viewState.space.name,
roomAvatar: context.viewState.space.avatar,
mediaProvider: context.mediaProvider)
}