From 3489426bfa2bcf7e4a52e96cfd5299f691b63215 Mon Sep 17 00:00:00 2001 From: Arthur Guillaume Date: Thu, 21 Sep 2017 12:04:05 +0200 Subject: [PATCH] Added missing cancel action in image picker --- iOSFormUtils.podspec | 2 +- iOSFormUtils.xcodeproj/project.pbxproj | 14 ++++++++++---- iOSFormUtils/ImagePicker.swift | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/iOSFormUtils.podspec b/iOSFormUtils.podspec index 4100b00..50335aa 100644 --- a/iOSFormUtils.podspec +++ b/iOSFormUtils.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "iOSFormUtils" - s.version = "0.4.3" + s.version = "0.4.4" s.summary = "iOSFormUtils helps you developping validated forms in iOS apps." # This description is used to generate tags and improve search results. diff --git a/iOSFormUtils.xcodeproj/project.pbxproj b/iOSFormUtils.xcodeproj/project.pbxproj index d177f8d..8ae5933 100644 --- a/iOSFormUtils.xcodeproj/project.pbxproj +++ b/iOSFormUtils.xcodeproj/project.pbxproj @@ -7,9 +7,12 @@ objects = { /* Begin PBXFileReference section */ + 8EDBB0601F73C36A00520A7B /* DateDropDown.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DateDropDown.swift; path = iOSFormUtils/DateDropDown.swift; sourceTree = ""; }; + 8EDBB0611F73C36A00520A7B /* DropDown.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = DropDown.swift; path = iOSFormUtils/DropDown.swift; sourceTree = ""; }; + 8EDBB0621F73C36A00520A7B /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ImagePicker.swift; path = iOSFormUtils/ImagePicker.swift; sourceTree = ""; }; + 8EDBB0631F73C36A00520A7B /* TextInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TextInput.swift; path = iOSFormUtils/TextInput.swift; sourceTree = ""; }; + 8EDBB0641F73C36A00520A7B /* ValidatedTextInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ValidatedTextInput.swift; path = iOSFormUtils/ValidatedTextInput.swift; sourceTree = ""; }; C8CF38E81DC9DC20002D11DF /* Form.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Form.swift; path = iOSFormUtils/Form.swift; sourceTree = ""; }; - C8CF38E91DC9DC20002D11DF /* FormInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FormInput.swift; path = iOSFormUtils/FormInput.swift; sourceTree = ""; }; - C8CF38EA1DC9DC20002D11DF /* ValidatedFormInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ValidatedFormInput.swift; path = iOSFormUtils/ValidatedFormInput.swift; sourceTree = ""; }; C8CF38EB1DC9DC94002D11DF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C8F50C0F1CEF0A26006D8C51 /* ValidatedForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ValidatedForm.swift; path = iOSFormUtils/ValidatedForm.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -25,10 +28,13 @@ C8C6A7FB1CEDBDED00B9B9D8 /* iOSFormUtils */ = { isa = PBXGroup; children = ( + 8EDBB0601F73C36A00520A7B /* DateDropDown.swift */, + 8EDBB0611F73C36A00520A7B /* DropDown.swift */, + 8EDBB0621F73C36A00520A7B /* ImagePicker.swift */, + 8EDBB0631F73C36A00520A7B /* TextInput.swift */, + 8EDBB0641F73C36A00520A7B /* ValidatedTextInput.swift */, C8CF38EB1DC9DC94002D11DF /* Info.plist */, C8CF38E81DC9DC20002D11DF /* Form.swift */, - C8CF38E91DC9DC20002D11DF /* FormInput.swift */, - C8CF38EA1DC9DC20002D11DF /* ValidatedFormInput.swift */, C8F50C0F1CEF0A26006D8C51 /* ValidatedForm.swift */, ); name = iOSFormUtils; diff --git a/iOSFormUtils/ImagePicker.swift b/iOSFormUtils/ImagePicker.swift index e4c81cb..ee2f627 100644 --- a/iOSFormUtils/ImagePicker.swift +++ b/iOSFormUtils/ImagePicker.swift @@ -102,6 +102,7 @@ extension ImagePicker: UIImagePickerControllerDelegate, UINavigationControllerDe } public func imagePickerControllerDidCancel(_ picker: UIImagePickerController) { + self.imagePicker.dismiss(animated: true, completion: nil) } }