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

set gallery limit to 60 when the gallery ff is on

Browse Source
This commit is contained in:
Mauro Romito
2026-07-30 21:09:47 +02:00
committed by Mauro
parent 6d77a0a557
commit 5d47bb3c56
5 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/MediaPickerScreen/MediaPickerScreenCoordinator.swift
+14 -2
View File
@@ -20,9 +20,21 @@ enum MediaPickerScreenSource: Hashable {
case documents(types: [UTType] = [.data])
}
enum MediaPickerScreenSelectionType {
enum MediaPickerScreenSelectionType: Hashable {
case single
case multiple
/// Multiple items, up to the given limit.
case multiple(limit: Int)
/// The number of attachments a gallery may contain, as recommended by
/// [MSC4274](https://github.com/matrix-org/matrix-spec-proposals/pull/4274).
static let galleryLimit = 60
/// The number of items to allow when each is sent as an individual message.
static let individualUploadLimit = 10
/// Multiple items, capped for a gallery when they're sent as one, or for individual uploads when not.
static func multiple(galleryEnabled: Bool) -> Self {
.multiple(limit: galleryEnabled ? galleryLimit : individualUploadLimit)
}
}
enum MediaPickerScreenCoordinatorAction {
ElementX/Sources/Screens/MediaPickerScreen/PhotoLibraryPicker.swift
+2 -2
View File
@@ -39,8 +39,8 @@ struct PhotoLibraryPicker: UIViewControllerRepresentable {
configuration.selectionLimit = switch selectionType {
case .single:
1
case .multiple:
10
case .multiple(let limit):
limit
}
let pickerViewController = PHPickerViewController(configuration: configuration)
ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
+6 -3
View File
@@ -57,6 +57,7 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
private var roomViewModel: RoomScreenViewModelProtocol
private var timelineViewModel: TimelineViewModelProtocol
private var composerViewModel: ComposerToolbarViewModelProtocol
private let appSettings: AppSettings
private var cancellables = Set<AnyCancellable>()
@@ -66,6 +67,8 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
}
init(parameters: RoomScreenCoordinatorParameters) {
appSettings = parameters.appSettings
var selectedPinnedEventID: String?
if let focussedEvent = parameters.focussedEvent {
selectedPinnedEventID = focussedEvent.shouldSetPin ? focussedEvent.eventID : nil
@@ -122,13 +125,13 @@ final class RoomScreenCoordinator: CoordinatorProtocol {
case .displayReportContent(let itemID, let senderID):
actionsSubject.send(.presentReportContent(itemID: itemID, senderID: senderID))
case .displayCameraPicker:
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .camera, selectionType: .multiple),
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .camera, selectionType: .multiple(galleryEnabled: appSettings.galleryEnabled)),
caption: composerViewModel.context.plainComposerText))
case .displayMediaPicker:
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .photoLibrary, selectionType: .multiple),
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .photoLibrary, selectionType: .multiple(galleryEnabled: appSettings.galleryEnabled)),
caption: composerViewModel.context.plainComposerText))
case .displayDocumentPicker:
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .documents(), selectionType: .multiple),
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .documents(), selectionType: .multiple(galleryEnabled: appSettings.galleryEnabled)),
caption: composerViewModel.context.plainComposerText))
case .displayMediaPreview(let mediaPreviewViewModel):
roomViewModel.displayMediaPreview(mediaPreviewViewModel)
ElementX/Sources/Screens/ThreadTimelineScreen/ThreadTimelineScreenCoordinator.swift
+6 -3
View File
@@ -46,6 +46,7 @@ final class ThreadTimelineScreenCoordinator: CoordinatorProtocol {
private let viewModel: ThreadTimelineScreenViewModelProtocol
private let timelineViewModel: TimelineViewModelProtocol
private var composerViewModel: ComposerToolbarViewModelProtocol
private let appSettings: AppSettings
private var cancellables = Set<AnyCancellable>()
@@ -55,6 +56,8 @@ final class ThreadTimelineScreenCoordinator: CoordinatorProtocol {
}
init(parameters: ThreadTimelineScreenCoordinatorParameters) {
appSettings = parameters.appSettings
viewModel = ThreadTimelineScreenViewModel(roomProxy: parameters.roomProxy, userSession: parameters.userSession)
timelineViewModel = TimelineViewModel(roomProxy: parameters.roomProxy,
@@ -107,13 +110,13 @@ final class ThreadTimelineScreenCoordinator: CoordinatorProtocol {
case .displayReportContent(let itemID, let senderID):
actionsSubject.send(.presentReportContent(itemID: itemID, senderID: senderID))
case .displayCameraPicker:
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .camera, selectionType: .multiple),
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .camera, selectionType: .multiple(galleryEnabled: appSettings.galleryEnabled)),
caption: composerViewModel.context.plainComposerText))
case .displayMediaPicker:
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .photoLibrary, selectionType: .multiple),
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .photoLibrary, selectionType: .multiple(galleryEnabled: appSettings.galleryEnabled)),
caption: composerViewModel.context.plainComposerText))
case .displayDocumentPicker:
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .documents(), selectionType: .multiple),
actionsSubject.send(.presentMediaUploadPicker(mode: .init(source: .documents(), selectionType: .multiple(galleryEnabled: appSettings.galleryEnabled)),
caption: composerViewModel.context.plainComposerText))
case .displayMediaPreview(let mediaPreviewViewModel):
viewModel.displayMediaPreview(mediaPreviewViewModel)