From 2846318ecd2a49478e83db8ea12ec30e22b2d156 Mon Sep 17 00:00:00 2001 From: Nikita Chugaynov Date: Mon, 12 Dec 2022 19:00:22 +0300 Subject: [PATCH 1/4] Fix iPad crash --- Sources/FDTake/FDTakeController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/FDTake/FDTakeController.swift b/Sources/FDTake/FDTakeController.swift index 7017f9c..26b7d78 100644 --- a/Sources/FDTake/FDTakeController.swift +++ b/Sources/FDTake/FDTakeController.swift @@ -261,6 +261,7 @@ open class FDTakeController: NSObject { // On iPad use pop-overs. self.imagePicker.modalPresentationStyle = .popover self.imagePicker.popoverPresentationController?.sourceRect = popOverPresentRect + self.imagePicker.popoverPresentationController?.sourceView = self.presentingView topVC.present(self.imagePicker, animated: true, completion: nil) } } From 4b0a7feccdd3edfc9af910457969fd51adf7dc2d Mon Sep 17 00:00:00 2001 From: Nikita Chugaynov Date: Mon, 12 Dec 2022 19:14:47 +0300 Subject: [PATCH 2/4] Fix type of camera after selection --- Sources/FDTake/FDTakeController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/FDTake/FDTakeController.swift b/Sources/FDTake/FDTakeController.swift index 26b7d78..239033e 100644 --- a/Sources/FDTake/FDTakeController.swift +++ b/Sources/FDTake/FDTakeController.swift @@ -236,10 +236,10 @@ open class FDTakeController: NSObject { // set the media type: photo or video self.imagePicker.allowsEditing = self.allowsEditing var mediaTypes = [String]() - if self.allowsPhoto { + if self.allowsPhoto && title == .takePhoto { mediaTypes.append(String(kUTTypeImage)) } - if self.allowsVideo { + if self.allowsVideo && title == .takeVideo { mediaTypes.append(String(kUTTypeMovie)) } self.imagePicker.mediaTypes = mediaTypes From adb6707384dfa1e6a478c7f750c15058de9749f1 Mon Sep 17 00:00:00 2001 From: Nikita Chugaynov Date: Mon, 12 Dec 2022 19:21:37 +0300 Subject: [PATCH 3/4] Fix available buttons, fix open video / photo choice --- Sources/FDTake/FDTakeController.swift | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Sources/FDTake/FDTakeController.swift b/Sources/FDTake/FDTakeController.swift index 239033e..e022a0a 100644 --- a/Sources/FDTake/FDTakeController.swift +++ b/Sources/FDTake/FDTakeController.swift @@ -197,7 +197,7 @@ open class FDTakeController: NSObject { if self.allowsSelectFromLibrary { if UIImagePickerController.isSourceTypeAvailable(.photoLibrary) { titleToSource.append((buttonTitle: .chooseFromLibrary, source: .photoLibrary)) - titleToSource.append((buttonTitle: .lastTakenMedia, source: .photoLibrary)) + // titleToSource.append((buttonTitle: .lastTakenMedia, source: .photoLibrary)) } else if UIImagePickerController.isSourceTypeAvailable(.savedPhotosAlbum) { titleToSource.append((buttonTitle: .chooseFromPhotoRoll, source: .savedPhotosAlbum)) } @@ -237,11 +237,17 @@ open class FDTakeController: NSObject { self.imagePicker.allowsEditing = self.allowsEditing var mediaTypes = [String]() if self.allowsPhoto && title == .takePhoto { + // take photo choisen + mediaTypes.append(String(kUTTypeImage)) + } else if self.allowsVideo && title == .takeVideo { + // take video choisen + mediaTypes.append(String(kUTTypeMovie)) + } else if self.allowsTake { + // take from library mediaTypes.append(String(kUTTypeImage)) - } - if self.allowsVideo && title == .takeVideo { mediaTypes.append(String(kUTTypeMovie)) } + self.imagePicker.mediaTypes = mediaTypes if title == .lastTakenMedia { From 5e3945539e90e9744ed4893d2c946c67d3557d4b Mon Sep 17 00:00:00 2001 From: Nikita Chugaynov Date: Wed, 14 Dec 2022 11:34:38 +0300 Subject: [PATCH 4/4] version update --- FDTake.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FDTake.podspec b/FDTake.podspec index 3b2e112..4766982 100644 --- a/FDTake.podspec +++ b/FDTake.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "FDTake" - s.version = "3.0.0" + s.version = "3.0.1" s.summary = "Easily take a photo or video or choose from library" s.description = <<-DESC `FDTake` helps you quickly to have the user take or choose an existing photo or video.