diff --git a/Assets/1.gif b/Assets/1.gif
old mode 100644
new mode 100755
diff --git a/Assets/header.png b/Assets/header.png
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/Popsicle.xcodeproj/project.pbxproj b/Popsicle.xcodeproj/project.pbxproj
old mode 100644
new mode 100755
index d918be2..05aca8e
--- a/Popsicle.xcodeproj/project.pbxproj
+++ b/Popsicle.xcodeproj/project.pbxproj
@@ -370,7 +370,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -412,7 +412,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/Popsicle.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Popsicle.xcodeproj/project.xcworkspace/contents.xcworkspacedata
old mode 100644
new mode 100755
diff --git a/Popsicle.xcodeproj/xcshareddata/xcschemes/Popsicle.xcscheme b/Popsicle.xcodeproj/xcshareddata/xcschemes/Popsicle.xcscheme
old mode 100644
new mode 100755
diff --git a/Popsicle/EasingFunction.swift b/Popsicle/EasingFunction.swift
old mode 100644
new mode 100755
diff --git a/Popsicle/Info.plist b/Popsicle/Info.plist
old mode 100644
new mode 100755
index 7e7479f..783e22e
--- a/Popsicle/Info.plist
+++ b/Popsicle/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 2.0.0
+ 2.0.1
CFBundleSignature
????
CFBundleVersion
diff --git a/Popsicle/Interpolable.swift b/Popsicle/Interpolable.swift
old mode 100644
new mode 100755
diff --git a/Popsicle/Interpolation.swift b/Popsicle/Interpolation.swift
old mode 100644
new mode 100755
diff --git a/Popsicle/Interpolator.swift b/Popsicle/Interpolator.swift
old mode 100644
new mode 100755
index b996c2c..af6f628
--- a/Popsicle/Interpolator.swift
+++ b/Popsicle/Interpolator.swift
@@ -22,6 +22,13 @@ public class Interpolator {
public var time: Time = 0 {
didSet {
for interpolation in self.interpolations {
+ if let interpolation = interpolation as? Interpolation {
+ if interpolation.keyPath == "constant" && (interpolation.object as? NSLayoutConstraint)?.firstAttribute == .Width {
+ print((interpolation.object as? NSLayoutConstraint))
+ print((interpolation.originalObject as? UIView)?.constraints)
+ //(interpolation.originalObject as? UIView)?.layoutIfNeeded()
+ }
+ }
interpolation.setTime(self.time)
}
}
diff --git a/Popsicle/KeyPath.swift b/Popsicle/KeyPath.swift
old mode 100644
new mode 100755
index 46ecbae..62806c0
--- a/Popsicle/KeyPath.swift
+++ b/Popsicle/KeyPath.swift
@@ -141,11 +141,15 @@ public let heightConstraint = KeyPath(keyPathable
extension NSObject {
static func filteredObjectAndKeyPath(withObject object: T, andKeyPath keyPath: KeyPath) -> (NSObject, String) {
if let view = object as? UIView, let superview = view.superview, let attribute = keyPath.keyPathable as? NSLayoutAttribute {
- for constraint in superview.constraints where
- (constraint.firstItem as? NSObject == view && constraint.firstAttribute == attribute) ||
- (constraint.secondItem as? NSObject == view && constraint.secondAttribute == attribute) {
- return (constraint, constant.keyPathable.stringify())
- }
+
+ let constrainedView = (attribute == .Width || attribute == .Height) ? view : superview
+
+ for constraint in constrainedView.constraints where
+ !constraint.isKindOfClass(NSClassFromString("NSContentSizeLayoutConstraint")!) &&
+ ((constraint.firstItem as? NSObject == view && constraint.firstAttribute == attribute) ||
+ (constraint.secondItem as? NSObject == view && constraint.secondAttribute == attribute)) {
+ return (constraint, constant.keyPathable.stringify())
+ }
}
return (object, keyPath.keyPathable.stringify())
diff --git a/Popsicle/Popsicle.h b/Popsicle/Popsicle.h
old mode 100644
new mode 100755
diff --git a/PopsicleDemo/AppDelegate.swift b/PopsicleDemo/AppDelegate.swift
old mode 100644
new mode 100755
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
old mode 100644
new mode 100755
index c719e43..97874f7
--- a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -3,19 +3,19 @@
{
"size" : "29x29",
"idiom" : "iphone",
- "filename" : "Icon-Small@2x.png",
+ "filename" : "Icon-29@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
- "filename" : "Icon-Small@3x.png",
+ "filename" : "Icon-29@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
- "filename" : "Icon-40@2x.png",
+ "filename" : "Icon-40@2x-1.png",
"scale" : "2x"
},
{
@@ -39,25 +39,25 @@
{
"size" : "29x29",
"idiom" : "ipad",
- "filename" : "Icon-Small~iPad.png",
+ "filename" : "Icon-29.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
- "filename" : "Icon-Small~iPad@2x.png",
+ "filename" : "Icon-29@2x-1.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
- "filename" : "Icon-40~iPad.png",
+ "filename" : "Icon-40.png",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
- "filename" : "Icon-40~iPad@2x.png",
+ "filename" : "Icon-40@2x.png",
"scale" : "2x"
},
{
@@ -71,6 +71,12 @@
"idiom" : "ipad",
"filename" : "Icon-76@2x.png",
"scale" : "2x"
+ },
+ {
+ "size" : "83.5x83.5",
+ "idiom" : "ipad",
+ "filename" : "Icon-83.5@2x.png",
+ "scale" : "2x"
}
],
"info" : {
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29.png
new file mode 100644
index 0000000..0450b19
Binary files /dev/null and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png
new file mode 100644
index 0000000..7363a9d
Binary files /dev/null and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png
new file mode 100644
index 0000000..7363a9d
Binary files /dev/null and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png
new file mode 100644
index 0000000..a889ee3
Binary files /dev/null and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40.png
new file mode 100644
index 0000000..8d11f6e
Binary files /dev/null and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png
new file mode 100644
index 0000000..da37d23
Binary files /dev/null and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png
index 9f3d9bd..da37d23 100644
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png
index dae5e68..1c49000 100644
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40~iPad.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40~iPad.png
deleted file mode 100644
index fc1e838..0000000
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40~iPad.png and /dev/null differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40~iPad@2x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40~iPad@2x.png
deleted file mode 100644
index 9f3d9bd..0000000
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-40~iPad@2x.png and /dev/null differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
index dae5e68..d19fb25 100644
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
index c426fbc..9cdc0d8 100644
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png
index 85da01f..c3af9cb 100644
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
index f9462b6..70bb530 100644
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
new file mode 100644
index 0000000..0f77b14
Binary files /dev/null and b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
deleted file mode 100644
index c5837fe..0000000
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png and /dev/null differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
deleted file mode 100644
index 78563ab..0000000
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png and /dev/null differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small~iPad.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small~iPad.png
deleted file mode 100644
index 248e128..0000000
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small~iPad.png and /dev/null differ
diff --git a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small~iPad@2x.png b/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small~iPad@2x.png
deleted file mode 100644
index c5837fe..0000000
Binary files a/PopsicleDemo/Assets.xcassets/AppIcon.appiconset/Icon-Small~iPad@2x.png and /dev/null differ
diff --git a/PopsicleDemo/Assets.xcassets/Contents.json b/PopsicleDemo/Assets.xcassets/Contents.json
old mode 100644
new mode 100755
diff --git a/PopsicleDemo/Assets.xcassets/logo.imageset/Contents.json b/PopsicleDemo/Assets.xcassets/logo.imageset/Contents.json
old mode 100644
new mode 100755
diff --git a/PopsicleDemo/Assets.xcassets/logo.imageset/logo.pdf b/PopsicleDemo/Assets.xcassets/logo.imageset/logo.pdf
old mode 100644
new mode 100755
diff --git a/PopsicleDemo/Base.lproj/LaunchScreen.storyboard b/PopsicleDemo/Base.lproj/LaunchScreen.storyboard
old mode 100644
new mode 100755
index 1447b3c..78686cd
--- a/PopsicleDemo/Base.lproj/LaunchScreen.storyboard
+++ b/PopsicleDemo/Base.lproj/LaunchScreen.storyboard
@@ -1,8 +1,8 @@
-
+
-
+
@@ -16,7 +16,6 @@
-
diff --git a/PopsicleDemo/Info.plist b/PopsicleDemo/Info.plist
old mode 100644
new mode 100755
index f93ec29..5f4192f
--- a/PopsicleDemo/Info.plist
+++ b/PopsicleDemo/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.0.0
+ 2.0.1
CFBundleSignature
????
CFBundleVersion
diff --git a/PopsicleDemo/PageScrollView.swift b/PopsicleDemo/PageScrollView.swift
old mode 100644
new mode 100755
diff --git a/PopsicleDemo/PageViews.xib b/PopsicleDemo/PageViews.xib
index 5ef952a..db6abd3 100755
--- a/PopsicleDemo/PageViews.xib
+++ b/PopsicleDemo/PageViews.xib
@@ -1,8 +1,8 @@
-
+
-
+
@@ -14,21 +14,18 @@
-
-
@@ -48,7 +45,6 @@
-
@@ -74,7 +69,6 @@ As you can see, Popsicle provides a great way to create transitions through valu
-
@@ -120,13 +112,11 @@ As you can see, Popsicle provides a great way to create transitions through valu
-
diff --git a/PopsicleDemo/PopsicleDemo-Bridging-Header.h b/PopsicleDemo/PopsicleDemo-Bridging-Header.h
old mode 100644
new mode 100755
diff --git a/PopsicleDemo/UIView+Utils.swift b/PopsicleDemo/UIView+Utils.swift
old mode 100644
new mode 100755
diff --git a/PopsicleDemo/ViewController.swift b/PopsicleDemo/ViewController.swift
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755