Repository navigation
Refine mobile attachment picking #3313
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
41db305
feat(mobile): refine attachment picking
klopez4212 19c957f
refactor(mobile): split composer layout
klopez4212 9229057
test(mobile): match photo picker morph state
klopez4212 38541c3
fix(mobile): harden native attachment handling
klopez4212 6686cab
fix(mobile): discard cancelled camera captures
klopez4212 797014b
fix(mobile): harden native attachment coordination
klopez4212 9b9b688
fix(mobile): contain photo picker errors
klopez4212 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,235 @@ | ||
| import Flutter | ||
| import PhotosUI | ||
| import UIKit | ||
| import UniformTypeIdentifiers | ||
|
|
||
| final class InlinePhotoPickerFactory: NSObject, FlutterPlatformViewFactory { | ||
| private let messenger: FlutterBinaryMessenger | ||
| private weak var parentViewController: UIViewController? | ||
|
|
||
| init( | ||
| messenger: FlutterBinaryMessenger, | ||
| parentViewController: UIViewController? | ||
| ) { | ||
| self.messenger = messenger | ||
| self.parentViewController = parentViewController | ||
| super.init() | ||
| } | ||
|
|
||
| func create( | ||
| withFrame frame: CGRect, | ||
| viewIdentifier viewId: Int64, | ||
| arguments args: Any? | ||
| ) -> FlutterPlatformView { | ||
| InlinePhotoPickerPlatformView( | ||
| frame: frame, | ||
| viewIdentifier: viewId, | ||
| messenger: messenger, | ||
| parentViewController: parentViewController | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| final class InlinePhotoPickerPlatformView: NSObject, FlutterPlatformView { | ||
| private let containerView: UIView | ||
| private let channel: FlutterMethodChannel | ||
| private weak var parentViewController: UIViewController? | ||
| private var pickerViewController: PHPickerViewController? | ||
| private var selectionGeneration = 0 | ||
| private var selectionTask: Task<Void, Never>? | ||
| private var selectedTemporaryPaths: [String] = [] | ||
|
|
||
| init( | ||
| frame: CGRect, | ||
| viewIdentifier viewId: Int64, | ||
| messenger: FlutterBinaryMessenger, | ||
| parentViewController: UIViewController? | ||
| ) { | ||
| containerView = UIView(frame: frame) | ||
| channel = FlutterMethodChannel( | ||
| name: "buzz/inline_photo_picker/\(viewId)", | ||
| binaryMessenger: messenger | ||
| ) | ||
| self.parentViewController = parentViewController | ||
| super.init() | ||
|
|
||
| channel.setMethodCallHandler { [weak self] call, result in | ||
| guard call.method == "claimSelection" else { | ||
| result(FlutterMethodNotImplemented) | ||
| return | ||
| } | ||
| let paths = call.arguments as? [String] ?? [] | ||
| guard let self, paths == self.selectedTemporaryPaths else { | ||
| result(false) | ||
| return | ||
| } | ||
| self.selectedTemporaryPaths = [] | ||
| result(true) | ||
| } | ||
|
|
||
| containerView.backgroundColor = .clear | ||
| if #available(iOS 17.0, *) { | ||
| installPicker() | ||
| } | ||
| } | ||
|
|
||
| deinit { | ||
| selectionTask?.cancel() | ||
| Self.removeTemporaryFiles(selectedTemporaryPaths) | ||
| channel.setMethodCallHandler(nil) | ||
| pickerViewController?.willMove(toParent: nil) | ||
| pickerViewController?.view.removeFromSuperview() | ||
| pickerViewController?.removeFromParent() | ||
| } | ||
|
|
||
| func view() -> UIView { | ||
| containerView | ||
| } | ||
|
|
||
| @available(iOS 17.0, *) | ||
| private func installPicker() { | ||
| var configuration = PHPickerConfiguration(photoLibrary: .shared()) | ||
| configuration.filter = .images | ||
| configuration.selectionLimit = 0 | ||
| configuration.selection = .continuousAndOrdered | ||
| configuration.preferredAssetRepresentationMode = .compatible | ||
| configuration.disabledCapabilities = [ | ||
| .search, | ||
| .stagingArea, | ||
| .collectionNavigation, | ||
| .selectionActions, | ||
| ] | ||
| configuration.edgesWithoutContentMargins = .all | ||
|
|
||
| let picker = PHPickerViewController(configuration: configuration) | ||
| picker.delegate = self | ||
| picker.view.backgroundColor = .clear | ||
| picker.view.translatesAutoresizingMaskIntoConstraints = false | ||
|
|
||
| if let parentViewController { | ||
| parentViewController.addChild(picker) | ||
| } | ||
| containerView.addSubview(picker.view) | ||
| NSLayoutConstraint.activate([ | ||
| picker.view.leadingAnchor.constraint(equalTo: containerView.leadingAnchor), | ||
| picker.view.trailingAnchor.constraint(equalTo: containerView.trailingAnchor), | ||
| picker.view.topAnchor.constraint(equalTo: containerView.topAnchor), | ||
| picker.view.bottomAnchor.constraint(equalTo: containerView.bottomAnchor), | ||
| ]) | ||
| if parentViewController != nil { | ||
| picker.didMove(toParent: parentViewController) | ||
| } | ||
| pickerViewController = picker | ||
| } | ||
|
|
||
| private func exportPickerResult(_ result: PHPickerResult) async throws -> String { | ||
| let provider = result.itemProvider | ||
| guard | ||
| let typeIdentifier = provider.registeredTypeIdentifiers.first(where: { | ||
| guard let type = UTType($0) else { return false } | ||
| return type.conforms(to: .image) | ||
| }) | ||
| else { | ||
| throw InlinePhotoPickerError.unsupportedImage | ||
| } | ||
|
|
||
| return try await withCheckedThrowingContinuation { continuation in | ||
| provider.loadFileRepresentation(forTypeIdentifier: typeIdentifier) { | ||
| sourceURL, | ||
| error in | ||
| if let error { | ||
| continuation.resume(throwing: error) | ||
| return | ||
| } | ||
| guard let sourceURL else { | ||
| continuation.resume(throwing: InlinePhotoPickerError.missingFile) | ||
| return | ||
| } | ||
|
|
||
| do { | ||
| let fileExtension = | ||
| sourceURL.pathExtension.isEmpty | ||
| ? (UTType(typeIdentifier)?.preferredFilenameExtension ?? "jpg") | ||
| : sourceURL.pathExtension | ||
| let destinationURL = FileManager.default.temporaryDirectory | ||
| .appendingPathComponent(UUID().uuidString) | ||
| .appendingPathExtension(fileExtension) | ||
| try FileManager.default.copyItem( | ||
| at: sourceURL, | ||
| to: destinationURL | ||
| ) | ||
| continuation.resume(returning: destinationURL.path) | ||
| } catch { | ||
| continuation.resume(throwing: error) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static func removeTemporaryFiles(_ paths: [String]) { | ||
| for path in paths where !path.isEmpty { | ||
| try? FileManager.default.removeItem(atPath: path) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension InlinePhotoPickerPlatformView: PHPickerViewControllerDelegate { | ||
| func picker( | ||
| _ picker: PHPickerViewController, | ||
| didFinishPicking results: [PHPickerResult] | ||
| ) { | ||
| selectionGeneration += 1 | ||
| let generation = selectionGeneration | ||
| selectionTask?.cancel() | ||
| selectionTask = nil | ||
| Self.removeTemporaryFiles(selectedTemporaryPaths) | ||
| selectedTemporaryPaths = [] | ||
| channel.invokeMethod( | ||
| "selectionCountChanged", | ||
| arguments: results.count | ||
| ) | ||
|
|
||
| guard !results.isEmpty else { | ||
| channel.invokeMethod("selectionDidChange", arguments: [String]()) | ||
| return | ||
| } | ||
|
|
||
| selectionTask = Task { [weak self] in | ||
| guard let self else { return } | ||
| var paths: [String] = [] | ||
| do { | ||
| for result in results { | ||
| try Task.checkCancellation() | ||
| paths.append(try await self.exportPickerResult(result)) | ||
| } | ||
| try Task.checkCancellation() | ||
| await MainActor.run { | ||
| guard generation == self.selectionGeneration else { | ||
| Self.removeTemporaryFiles(paths) | ||
| return | ||
| } | ||
| self.selectedTemporaryPaths = paths | ||
| self.selectionTask = nil | ||
| self.channel.invokeMethod("selectionDidChange", arguments: paths) | ||
| } | ||
| } catch is CancellationError { | ||
| Self.removeTemporaryFiles(paths) | ||
| } catch { | ||
| Self.removeTemporaryFiles(paths) | ||
| await MainActor.run { | ||
| guard generation == self.selectionGeneration else { return } | ||
| self.selectionTask = nil | ||
| self.channel.invokeMethod( | ||
| "didFail", | ||
| arguments: "Unable to prepare the selected photos." | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private enum InlinePhotoPickerError: Error { | ||
| case missingFile | ||
| case unsupportedImage | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.