merge master

.gitignore

@@ -17,6 +17,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 .DS_Store
+.swiftpm
 
 # CocoaPods
 #

Package.swift

@@ -0,0 +1,23 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "ZLSwipeableViewSwift",
+    platforms: [.iOS(.v13)],
+    products: [
+        .library(
+            name: "ZLSwipeableViewSwift",
+            targets: ["ZLSwipeableViewSwift"]),
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "ZLSwipeableViewSwift",
+            dependencies: [],
+            path: "ZLSwipeableViewSwift",
+            exclude: ["Info.plist"]
+        ),
+    ]
+)

README.md

@@ -28,6 +28,16 @@ Carthage
 ---
 You can install `ZLSwipeableViewSwift` through Carthage by adding  `github "zhxnlai/ZLSwipeableViewSwift"` to your Cartfile
 
+Swift Package Manager
+---
+You can install `ZLSwipeableViewSwift` through Swift Package Manager by adding it to the `dependencies` value of your `Package.swift`.
+
+```swift
+dependencies: [
+    .package(url: "https://github.com/zhxnlai/ZLSwipeableViewSwift", .branchItem("master"))
+]
+```
+
 Usage
 ---
 Check out the [demo app](https://github.com/zhxnlai/ZLSwipeableViewSwift/archive/master.zip) for an example. It contains the following demos: Default, Custom Animation, Custom Swipe, Allowed Direction, History, Previous View, Should Swipe and Always Swipe.
@@ -136,6 +146,7 @@ Here is a list of customizable behaviors:
 public var animateView = ZLSwipeableView.defaultAnimateViewHandler()
 public var interpretDirection = ZLSwipeableView.defaultInterpretDirectionHandler()
 public var shouldSwipeView = ZLSwipeableView.defaultShouldSwipeViewHandler()
+public var angle = CGFloat(1.0)
 public var minTranslationInPercent = CGFloat(0.25)
 public var minVelocityInPointPerSecond = CGFloat(750)
 public var allowedDirection = Direction.Horizontal
@@ -157,6 +168,10 @@ swipeableView.allowedDirection = .Left | .Up
 swipeableView.allowedDirection = .All
 ~~~
 
+### angle
+
+You can change the rotation of the swipe views with the 'angle' property
+
 ### Misc
 
 ~~~swift

ZLSwipeableViewSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ZLSwipeableViewSwift"
-  s.version      = "0.0.8"
+  s.version      = "0.0.9"
   s.summary      = "A simple view for building card like interface like Tinder and Potluck."
   s.description  = <<-DESC
                   ZLSwipeableViewSwift is a simple view for building card like interface like Tinder and Potluck.
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
 
   s.platform     = :ios, "8.0"
 
-  s.source       = { :git => "https://github.com/zhxnlai/ZLSwipeableViewSwift.git", :tag => "0.0.8" }
+  s.source       = { :git => "https://github.com/zhxnlai/ZLSwipeableViewSwift.git", :tag => "0.0.9" }
   s.source_files  = "ZLSwipeableViewSwift/*.swift"
 
   s.framework  = "UIKit"

ZLSwipeableViewSwift/ViewManager.swift

@@ -143,7 +143,14 @@ class ViewManager : NSObject {
     }
 
     func addTapRecognizer() {
-        guard !(view.gestureRecognizers ?? []).contains(where: { $0 is ZLTapGestureRecognizer }) else { return }
+        for gesture in view.gestureRecognizers ?? [] {
+            if let tapGesture = gesture as? ZLTapGestureRecognizer {
+
+                // Remove previous tap gesture
+                view.removeGestureRecognizer(tapGesture)
+
+            }
+        }
 
         view.addGestureRecognizer(ZLTapGestureRecognizer(target: self, action: #selector(ViewManager.handleTap(_:))))
     }
@@ -166,6 +173,13 @@ class ViewManager : NSObject {
         removeBehavior(snapBehavior)
     }
 
+    func resnapView() {
+        if case .snapping(_) = state {
+            unsnapView()
+            state = snappingStateAtContainerCenter()
+        }
+    }
+
     fileprivate func attachView(toPoint point: CGPoint) {
         anchorView.center = point
         anchorView.backgroundColor = UIColor.blue

ZLSwipeableViewSwift/ZLSwipeableView.swift

@@ -51,6 +51,7 @@ open class ZLSwipeableView: UIView {
     open var animateView = ZLSwipeableView.defaultAnimateViewHandler()
     open var interpretDirection = ZLSwipeableView.defaultInterpretDirectionHandler()
     open var shouldSwipeView = ZLSwipeableView.defaultShouldSwipeViewHandler()
+    open var angle = CGFloat(1.0)
     open var minTranslationInPercent = CGFloat(0.25)
     open var minVelocityInPointPerSecond = CGFloat(750)
     open var allowedDirection = Direction.Horizontal
@@ -117,6 +118,9 @@ open class ZLSwipeableView: UIView {
     override open func layoutSubviews() {
         super.layoutSubviews()
         containerView.frame = bounds
+        for viewManager in viewManagers.values {
+            viewManager.resnapView()
+        }
     }
 
     // MARK: Public APIs
@@ -262,7 +266,7 @@ extension ZLSwipeableView {
 
     static func defaultAnimateViewHandler() -> AnimateViewHandler {
         func toRadian(_ degree: CGFloat) -> CGFloat {
-            return degree * CGFloat(M_PI / 180)
+            return degree * CGFloat(Double.pi / 180)
         }
 
         func rotateView(_ view: UIView, forDegree degree: CGFloat, duration: TimeInterval, offsetFromCenter offset: CGPoint, swipeableView: ZLSwipeableView,  completion: ((Bool) -> Void)? = nil) {
@@ -277,7 +281,7 @@ extension ZLSwipeableView {
         }
 
         return { (view: UIView, index: Int, views: [UIView], swipeableView: ZLSwipeableView) in
-            let degree = CGFloat(1)
+            let degree = swipeableView.angle
             let duration = 0.4
             let offset = CGPoint(x: 0, y: swipeableView.bounds.height * 0.3)
             switch index {
@@ -347,51 +351,6 @@ extension ZLSwipeableView {
 
 }
 
-// MARK: - Deprecated APIs
-extension ZLSwipeableView {
-
-    @available(*, deprecated: 1, message: "Use numberOfActiveView")
-    public var numPrefetchedViews: UInt {
-        get {
-            return numberOfActiveView
-        }
-        set(newValue){
-            numberOfActiveView = newValue
-        }
-    }
-
-    @available(*, deprecated: 1, message: "Use allowedDirection")
-    public var direction: Direction {
-        get {
-            return allowedDirection
-        }
-        set(newValue){
-            allowedDirection = newValue
-        }
-    }
-
-    @available(*, deprecated: 1, message: "Use minTranslationInPercent")
-    public var translationThreshold: CGFloat {
-        get {
-            return minTranslationInPercent
-        }
-        set(newValue){
-            minTranslationInPercent = newValue
-        }
-    }
-
-    @available(*, deprecated: 1, message: "Use minVelocityInPointPerSecond")
-    public var velocityThreshold: CGFloat {
-        get {
-            return minVelocityInPointPerSecond
-        }
-        set(newValue){
-            minVelocityInPointPerSecond = newValue
-        }
-    }
-
-}
-
 // MARK: - Helper extensions
 public func *(lhs: CGPoint, rhs: CGFloat) -> CGPoint {
     return CGPoint(x: lhs.x * rhs, y: lhs.y * rhs)

ZLSwipeableViewSwiftDemo/ZLSwipeableViewSwiftDemo.xcodeproj/project.pbxproj

@@ -251,12 +251,11 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 1100;
 				ORGANIZATIONNAME = "Zhixuan Lai";
 				TargetAttributes = {
 					09673A7D1AEF5B2E008C7240 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = NAV5A3CB56;
 						LastSwiftMigration = 0900;
 					};
 					09673A921AEF5B2E008C7240 = {
@@ -271,6 +270,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -457,17 +457,28 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -502,17 +513,28 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -531,6 +553,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -539,37 +562,41 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4BA34855EB4A4C2074C86E94 /* Pods-ZLSwipeableViewSwiftDemo.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = NAV5A3CB56;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = ZLSwipeableViewSwiftDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.axcel.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		09673A9F1AEF5B2E008C7240 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 4AEF23DC622C3A7E809F3742 /* Pods-ZLSwipeableViewSwiftDemo.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = NAV5A3CB56;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = ZLSwipeableViewSwiftDemo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.axcel.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
 		09673AA11AEF5B2E008C7240 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = E98741382FDFBC754EDA0B1E /* Pods-ZLSwipeableViewSwiftDemoTests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -583,7 +610,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.axcel.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ZLSwipeableViewSwiftDemo.app/ZLSwipeableViewSwiftDemo";
 			};
 			name = Debug;
@@ -592,7 +619,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C998BF9C49543ECF772E8671 /* Pods-ZLSwipeableViewSwiftDemoTests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO;
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -602,7 +631,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.axcel.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ZLSwipeableViewSwiftDemo.app/ZLSwipeableViewSwiftDemo";
 			};
 			name = Release;

ZLSwipeableViewSwiftDemo/ZLSwipeableViewSwiftDemo/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         window = UIWindow(frame: UIScreen.main.bounds)
         if let window = window {
             let menuViewController = MenuTableViewController(style: .grouped)