Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZLSwipeableViewDirection static 'constructors' are public now. #9

Closed
wants to merge 2 commits into from
Closed

ZLSwipeableViewDirection static 'constructors' are public now. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c838d7f
ZLSwipeableViewDirection static 'constructors' are public now.
Jul 29, 2015
b29a68c
Merge branch 'master' into feature/Publish_ZLSwipeableViewDirection_c…
Feb 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ZLSwipeableViewSwift/ZLSwipeableView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ extension ZLSwipeableView {
default:
directionVector = CGVector(dx: 0, dy: 0)
}

return (location, directionVector)
}
}
Expand Down Expand Up @@ -431,7 +431,7 @@ extension ZLSwipeableView {
minVelocityInPointPerSecond = newValue
}
}

}

// MARK: - Internal classes
Expand Down Expand Up @@ -620,15 +620,15 @@ internal class ViewManager : NSObject {
guard let pushBehavior = pushBehavior else { return }
removeBehavior(pushBehavior)
}

private func addBehavior(behavior: UIDynamicBehavior) {
animator.addBehavior(behavior)
}

private func removeBehavior(behavior: UIDynamicBehavior) {
animator.removeBehavior(behavior)
}

}

internal class Scheduler : NSObject {
Expand Down
8 changes: 4 additions & 4 deletions ZLSwipeableViewSwift/ZLSwipeableViewSwift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
objects = {

/* Begin PBXBuildFile section */
460B725D1B76D42600BB5ED8 /* ZLSwipeableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 460B725C1B76D42600BB5ED8 /* ZLSwipeableView.swift */; };
98D01DAB1C687EEB00A8A1BF /* ZLSwipeableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98D01DAA1C687EEB00A8A1BF /* ZLSwipeableView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
460B72511B76D3E600BB5ED8 /* ZLSwipeableViewSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ZLSwipeableViewSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
460B72561B76D3E600BB5ED8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
460B725C1B76D42600BB5ED8 /* ZLSwipeableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLSwipeableView.swift; sourceTree = "<group>"; };
98D01DAA1C687EEB00A8A1BF /* ZLSwipeableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLSwipeableView.swift; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -46,7 +46,7 @@
460B72531B76D3E600BB5ED8 /* ZLSwipeableViewSwift */ = {
isa = PBXGroup;
children = (
460B725C1B76D42600BB5ED8 /* ZLSwipeableView.swift */,
98D01DAA1C687EEB00A8A1BF /* ZLSwipeableView.swift */,
460B72561B76D3E600BB5ED8 /* Info.plist */,
);
path = ZLSwipeableViewSwift;
Expand Down Expand Up @@ -130,7 +130,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
460B725D1B76D42600BB5ED8 /* ZLSwipeableView.swift in Sources */,
98D01DAB1C687EEB00A8A1BF /* ZLSwipeableView.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
6 changes: 3 additions & 3 deletions ZLSwipeableViewSwiftDemo/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- Cartography (0.6.0)
- performSelector-swift (0.1.0)
- ReactiveUI (0.0.2)
- ReactiveUI (0.0.3)
- UIColor+FlatColors (0.0.2)

DEPENDENCIES:
Expand All @@ -13,7 +13,7 @@ DEPENDENCIES:
SPEC CHECKSUMS:
Cartography: 70af183a248547694a8cfaa6b989cb7e04589985
performSelector-swift: 676d3dab420ed7e1505a7cdaf35e5741509cdd3c
ReactiveUI: 597b21e143dfc5fe438afc1b7a73c5c7e256175b
ReactiveUI: 05d1f5d884e5a2496a2cd2ac6c0ed35ab0218c02
UIColor+FlatColors: 6c699df7a575281794c688c64cee6c44fd1f93b4

COCOAPODS: 0.38.2
COCOAPODS: 0.39.0
6 changes: 3 additions & 3 deletions ZLSwipeableViewSwiftDemo/Pods/Manifest.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,010 changes: 502 additions & 508 deletions ZLSwipeableViewSwiftDemo/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ZLSwipeableViewSwiftDemo/Pods/ReactiveUI/ReactiveUI/ReactiveUI/UIControl.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ZLSwipeableViewSwiftDemo/Pods/ReactiveUI/ReactiveUI/ReactiveUI/UIGestureRecognizer.swift
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions ZLSwipeableViewSwiftDemo/Pods/Target Support Files/Cartography/Cartography-Private.xcconfig
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions ZLSwipeableViewSwiftDemo/Pods/Target Support Files/Cartography/Cartography.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 51 additions & 19 deletions ZLSwipeableViewSwiftDemo/Pods/Target Support Files/Pods/Pods-frameworks.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ZLSwipeableViewSwiftDemo/Pods/Target Support Files/Pods/Pods-resources.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ZLSwipeableViewSwiftDemo/Pods/Target Support Files/Pods/Pods.debug.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ZLSwipeableViewSwiftDemo/Pods/Target Support Files/Pods/Pods.release.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ZLSwipeableViewSwiftDemo/Pods/Target Support Files/ReactiveUI/Info.plist
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions ZLSwipeableViewSwiftDemo/Pods/Target Support Files/ReactiveUI/ReactiveUI-Private.xcconfig
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion ZLSwipeableViewSwiftDemo/Pods/Target Support Files/ReactiveUI/ReactiveUI.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions ...wiftDemo/Pods/Target Support Files/UIColor+FlatColors/UIColor+FlatColors-Private.xcconfig
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ...bleViewSwiftDemo/Pods/Target Support Files/UIColor+FlatColors/UIColor+FlatColors.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions ...mo/Pods/Target Support Files/performSelector-swift/performSelector-swift-Private.xcconfig
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ...wSwiftDemo/Pods/Target Support Files/performSelector-swift/performSelector-swift.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions ZLSwipeableViewSwiftDemo/ZLSwipeableViewSwiftDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
098070AF1B13E4EC00C90479 /* CustomAnimationDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 098070AE1B13E4EC00C90479 /* CustomAnimationDemoViewController.swift */; };
098070B11B13E9B900C90479 /* CustomSwipeDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 098070B01B13E9B900C90479 /* CustomSwipeDemoViewController.swift */; };
098070B31B13EDB800C90479 /* CustomDirectionDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 098070B21B13EDB800C90479 /* CustomDirectionDemoViewController.swift */; };
099CF6411BDABF8600D05FAA /* PreviousViewDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099CF6401BDABF8600D05FAA /* PreviousViewDemoViewController.swift */; settings = {ASSET_TAGS = (); }; };
099CF6411BDABF8600D05FAA /* PreviousViewDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099CF6401BDABF8600D05FAA /* PreviousViewDemoViewController.swift */; };
09B2F5291B32018000ECD8B1 /* ShouldSwipeDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B2F5281B32018000ECD8B1 /* ShouldSwipeDemoViewController.swift */; };
09E79D171BDA002F00A609A1 /* DirectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09E79D161BDA002F00A609A1 /* DirectionTests.swift */; settings = {ASSET_TAGS = (); }; };
09E79D191BDA058000A609A1 /* ViewManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09E79D181BDA058000A609A1 /* ViewManagerTests.swift */; settings = {ASSET_TAGS = (); }; };
09E79D1B1BDAA5BD00A609A1 /* AlwaysSwipeDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09E79D1A1BDAA5BD00A609A1 /* AlwaysSwipeDemoViewController.swift */; settings = {ASSET_TAGS = (); }; };
179604C29FFE95576E597034 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BEB7EDF499F2D90A9D123AB /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
78FA118955F2E3CFC6B2C8A5 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BEB7EDF499F2D90A9D123AB /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
09E79D171BDA002F00A609A1 /* DirectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09E79D161BDA002F00A609A1 /* DirectionTests.swift */; };
09E79D191BDA058000A609A1 /* ViewManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09E79D181BDA058000A609A1 /* ViewManagerTests.swift */; };
09E79D1B1BDAA5BD00A609A1 /* AlwaysSwipeDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09E79D1A1BDAA5BD00A609A1 /* AlwaysSwipeDemoViewController.swift */; };
179604C29FFE95576E597034 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BEB7EDF499F2D90A9D123AB /* Pods.framework */; };
78FA118955F2E3CFC6B2C8A5 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BEB7EDF499F2D90A9D123AB /* Pods.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down