* Allow MediaPickerScreen users to select the media selection mode (single or multiple) * Fix cancellation * Add support for multiple media URLs on the MediaUploadPreviewScreen. * Support processing more URLs on the `MediaUploadingPreprocessor` and sending more on the `MediaUploadPreviewScreen` * Add feature flag for `multipleAttachmentUploadEnabled` * Add a label showing the current preview item index in the MediaUploadPreviewScreen * Add support for dragging and dropping or pasting multiple items at the same time. * Support sharing more than one file through the share extension. * Limit the number of items that can be shared in one go to 5. * Fix unit tests * Fix incorrect fatal error when dealing with single selection media pickers. * Document the `multipleAttachmentUploadEnabled` usage in the context of the MediaPicker. * Use a task group for processing selected media in the photo library picker. * Use a task group for processing multiple selected media in the MediaUploadingPreprocessor * Switch the maximum number of items that can be shared to 10. * Allow multiple items to be pasted at the same time.
142 lines
5.2 KiB
Swift
142 lines
5.2 KiB
Swift
//
|
|
// Copyright 2023, 2024 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 PhotosUI
|
|
import SwiftUI
|
|
|
|
enum PhotoLibraryPickerAction {
|
|
case selectedMediaAtURLs([URL])
|
|
case cancel
|
|
case error(PhotoLibraryPickerError)
|
|
}
|
|
|
|
enum PhotoLibraryPickerError: Error {
|
|
case failedLoadingFileRepresentation(Error?)
|
|
case failedCopyingFile
|
|
}
|
|
|
|
struct PhotoLibraryPicker: UIViewControllerRepresentable {
|
|
private let selectionType: MediaPickerScreenSelectionType
|
|
private let userIndicatorController: UserIndicatorControllerProtocol
|
|
private let callback: (PhotoLibraryPickerAction) -> Void
|
|
|
|
init(selectionType: MediaPickerScreenSelectionType,
|
|
userIndicatorController: UserIndicatorControllerProtocol,
|
|
callback: @escaping (PhotoLibraryPickerAction) -> Void) {
|
|
self.selectionType = selectionType
|
|
self.userIndicatorController = userIndicatorController
|
|
self.callback = callback
|
|
}
|
|
|
|
func makeUIViewController(context: Context) -> PHPickerViewController {
|
|
var configuration = PHPickerConfiguration(photoLibrary: .shared())
|
|
|
|
configuration.selectionLimit = switch selectionType {
|
|
case .single:
|
|
1
|
|
case .multiple:
|
|
10
|
|
}
|
|
|
|
let pickerViewController = PHPickerViewController(configuration: configuration)
|
|
pickerViewController.delegate = context.coordinator
|
|
|
|
return pickerViewController
|
|
}
|
|
|
|
func updateUIViewController(_ uiViewController: PHPickerViewController, context: Context) { }
|
|
|
|
func makeCoordinator() -> Coordinator {
|
|
Coordinator(self)
|
|
}
|
|
|
|
final class Coordinator: NSObject, PHPickerViewControllerDelegate {
|
|
private var photoLibraryPicker: PhotoLibraryPicker
|
|
|
|
init(_ photoLibraryPicker: PhotoLibraryPicker) {
|
|
self.photoLibraryPicker = photoLibraryPicker
|
|
}
|
|
|
|
// MARK: PHPickerViewControllerDelegate
|
|
|
|
private static let loadingIndicatorIdentifier = "\(PhotoLibraryPicker.self)-Loading"
|
|
|
|
func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
|
|
guard !results.isEmpty else {
|
|
photoLibraryPicker.callback(.cancel)
|
|
return
|
|
}
|
|
|
|
picker.delegate = nil
|
|
|
|
photoLibraryPicker.userIndicatorController.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier,
|
|
type: .modal,
|
|
title: L10n.commonLoading))
|
|
defer {
|
|
photoLibraryPicker.userIndicatorController.retractIndicatorWithId(Self.loadingIndicatorIdentifier)
|
|
}
|
|
|
|
Task {
|
|
let selectedURLs = await withTaskGroup { taskGroup in
|
|
for result in results {
|
|
taskGroup.addTask { await self.processResult(result) }
|
|
}
|
|
|
|
var selectedURLs = [URL]()
|
|
for await url in taskGroup {
|
|
if let url {
|
|
selectedURLs.append(url)
|
|
}
|
|
}
|
|
|
|
return selectedURLs
|
|
}
|
|
|
|
photoLibraryPicker.callback(.selectedMediaAtURLs(selectedURLs))
|
|
}
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
func processResult(_ result: PHPickerResult) async -> URL? {
|
|
let provider = result.itemProvider
|
|
|
|
guard let contentType = provider.preferredContentType else {
|
|
return nil
|
|
}
|
|
|
|
return await withCheckedContinuation { continuation in
|
|
provider.loadFileRepresentation(forTypeIdentifier: contentType.type.identifier) { [weak self] url, error in
|
|
guard let url else {
|
|
Task { @MainActor in
|
|
self?.photoLibraryPicker.callback(.error(.failedLoadingFileRepresentation(error)))
|
|
}
|
|
|
|
continuation.resume(returning: nil)
|
|
return
|
|
}
|
|
|
|
do {
|
|
_ = url.startAccessingSecurityScopedResource()
|
|
let newURL = try FileManager.default.copyFileToTemporaryDirectory(file: url)
|
|
url.stopAccessingSecurityScopedResource()
|
|
|
|
Task { @MainActor in
|
|
continuation.resume(returning: newURL)
|
|
}
|
|
} catch {
|
|
Task { @MainActor in
|
|
self?.photoLibraryPicker.callback(.error(.failedCopyingFile))
|
|
continuation.resume(returning: nil)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|