Merge pull request #55 from Inspirato/develop

New Version (3.1.3)
justinvallely · Aug 4, 2017 · 351d093 · 351d093
2 parents b682a4d + c70d31f
commit 351d093
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## Master
 
+## 3.1.3 (2017-08-04)
+
+##### Bug Fixes
+
+* cancels swipe to close when dismissing with custom presentation style
+
+
 ## 3.1.2 (2017-08-04)
 
 ##### Enhancements

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Nimble (5.0.0)
-  - SwiftPhotoGallery (3.1.1)
+  - SwiftPhotoGallery (3.1.2)
 
 DEPENDENCIES:
   - Nimble (~> 5.0.0)
@@ -12,7 +12,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Nimble: 56fc9f5020effa2206de22c3dd910f4fb011b92f
-  SwiftPhotoGallery: 9c5a97cd312753e388a774fe53a7afd2ee7d78e5
+  SwiftPhotoGallery: 04fb0fa512ba64deb8fbe4ad3f0d1c289b81c29c
 
 PODFILE CHECKSUM: 74627899640086e825cae05dd62d9b91ec68d132
 

diff --git a/Example/Pods/Local Podspecs/SwiftPhotoGallery.podspec.json b/Example/Pods/Local Podspecs/SwiftPhotoGallery.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Target Support Files/SwiftPhotoGallery/Info.plist b/Example/Pods/Target Support Files/SwiftPhotoGallery/Info.plist
diff --git a/Example/SwiftPhotoGallery/Info.plist b/Example/SwiftPhotoGallery/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.2</string>
+	<string>3.1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Example/Tests/Info.plist b/Example/Tests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.2</string>
+	<string>3.1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Pod/Classes/SwiftPhotoGallery.swift b/Pod/Classes/SwiftPhotoGallery.swift
@@ -256,13 +256,19 @@ public class SwiftPhotoGallery: UIViewController {
             }
 
             if animateImageAway {
+                if self.modalPresentationStyle == .custom {
+                    self.delegate?.galleryDidTapToClose(gallery: self)
+                    return
+                }
+
                 UIView.animate(withDuration: 0.35, animations: {
                     self.view.alpha = 0
                     image.center = CGPoint(x: self.view.bounds.midX, y: swipeDistance)
                 }, completion: { (complete) in
                     self.delegate?.galleryDidTapToClose(gallery: self)
                 })
             }
+
         }
     }
     #endif

diff --git a/SwiftPhotoGallery.podspec b/SwiftPhotoGallery.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SwiftPhotoGallery"
-  s.version          = "3.1.2"
+  s.version          = "3.1.3"
   s.summary          = "Photo gallery for iOS and tvOS written in Swift"
   s.description      = <<-DESC
                         "Photo gallery for iOS and tvOS written in Swift. Photos can be panned and zoomed (iOS). Includes a customizable page indicator, support for any orientation (iOS), and supports images of varying sizes. Includes unit tests."