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

Stop reserving space for the non-existant icon background in ListRowLabel on iOS 26. (#5822)

Browse Source 
* Stop reserving space for the non-existant icon background in ListRowLabel on iOS 26.

* Use the .avatar label style for NotificationSettingsEditScreenRoomCell.
This commit is contained in:
Doug
2026-07-01 12:58:33 +01:00
committed by GitHub
parent 123661537a
commit 036c9ce248
208 changed files with 427 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Avatars.swift
+1 -3
View File
@@ -146,9 +146,7 @@ enum RoomAvatarSizeOnScreen {
var value: CGFloat {
switch self {
case .notificationSettings:
30
case .timeline, .leaveSpace, .roomDirectorySearch,
case .timeline, .leaveSpace, .notificationSettings, .roomDirectorySearch,
.completionSuggestions, .authorizedSpaces, .createRoomSelectSpace,
.spaceFilters, .globalSearch:
32
ElementX/Sources/Screens/Settings/NotificationSettingsEditScreen/View/NotificationSettingsEditScreenRoomCell.swift
+14 -7
View File
@@ -16,7 +16,7 @@ struct NotificationSettingsEditScreenRoomCell: View {
let context: NotificationSettingsEditScreenViewModel.Context
var body: some View {
ListRow(label: .action(title: room.name,
ListRow(label: .avatar(title: room.name,
icon: avatar),
details: roomDetailsLabel,
kind: .navigationLink {
@@ -47,7 +47,18 @@ struct NotificationSettingsEditScreenRoomCell: View {
}
struct NotificationSettingsEditScreenRoomCell_Previews: PreviewProvider, TestablePreview {
static let (rooms, viewModel) = makeRooms()
static var previews: some View {
Form {
ForEach(rooms) { room in
NotificationSettingsEditScreenRoomCell(room: room, context: viewModel.context)
}
}
.compoundList()
}
private static func makeRooms() -> ([NotificationSettingsEditScreenRoom], NotificationSettingsEditScreenViewModel) {
let summaryProvider = RoomSummaryProviderMock(.init(state: .loaded(.mockRooms)))
let notificationSettingsProxy = NotificationSettingsProxyMock(with: .init())
@@ -59,17 +70,13 @@ struct NotificationSettingsEditScreenRoomCell_Previews: PreviewProvider, Testabl
let viewModel = NotificationSettingsEditScreenViewModel(chatType: .groupChat,
userSession: userSession)
let rooms: [NotificationSettingsEditScreenRoom] = summaryProvider.roomListPublisher.value.compactMap { summary -> NotificationSettingsEditScreenRoom? in
let rooms = summaryProvider.roomListPublisher.value.map { summary in
NotificationSettingsEditScreenRoom(id: UUID().uuidString,
roomId: summary.id,
name: summary.name,
avatar: summary.avatar)
}
return VStack(spacing: 0) {
ForEach(rooms) { room in
NotificationSettingsEditScreenRoomCell(room: room, context: viewModel.context)
}
}
return (rooms, viewModel)
}
}