oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Enable batch mode when popping to Media Library

Browse source
This commit is contained in:
Michael Kirk 2019-04-22 13:02:15 -07:00
parent 41977f7437
commit abf35decde
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Signal/src/ViewControllers/Photos/SendMediaNavigationController.swift
View file

@ -265,10 +265,20 @@ extension SendMediaNavigationController: UINavigationControllerDelegate {
}
}
if viewController is PhotoCaptureViewController && !isInBatchSelectMode {
// We're either showing the captureView for the first time or the user is navigating "back"
// indicating they want to "retake". We should discard any current image.
discardCameraDraft()
switch viewController {
case is PhotoCaptureViewController:
if attachmentDraftCollection.count == 1 && !isInBatchSelectMode {
// User is navigating "back" to the previous view, indicating
// they want to discard the previously captured item
discardDraft()
}
case is ImagePickerGridController:
if attachmentDraftCollection.count == 1 && !isInBatchSelectMode {
isInBatchSelectMode = true
self.mediaLibraryViewController.batchSelectModeDidChange()
}
default:
break
}
self.updateButtons(topViewController: viewController)
@ -318,12 +328,12 @@ extension SendMediaNavigationController: PhotoCaptureViewControllerDelegate {
didRequestExit(dontAbandonText: dontAbandonText)
}
func discardCameraDraft() {
assert(attachmentDraftCollection.cameraAttachments.count <= 1)
if let lastCameraAttachment = attachmentDraftCollection.cameraAttachments.last {
attachmentDraftCollection.remove(attachment: lastCameraAttachment)
func discardDraft() {
assert(attachmentDraftCollection.attachmentDrafts.count <= 1)
if let lastAttachmentDraft = attachmentDraftCollection.attachmentDrafts.last {
attachmentDraftCollection.remove(attachment: lastAttachmentDraft.attachment)
}
assert(attachmentDraftCollection.cameraAttachments.count == 0)
assert(attachmentDraftCollection.attachmentDrafts.count == 0)
}
}