Permalink
Browse files

some style fix

  • Loading branch information...
lkzhao committed Feb 5, 2017
1 parent d384417 commit 03e0e6bd67ebe6e7ea85b5927a720a7ed8e0e6ad
@@ -567,8 +567,8 @@ public class ElasticTransition: EdgePanTransition, UIGestureRecognizerDelegate{
frontView.layer.zPosition = 0
startingPoint = nil
if let scrollView = foregroundScrollView{
scrollView.bounces = true
foregroundScrollView = nil
scrollView.bounces = true
foregroundScrollView = nil
}
if presenting && finished{
pushedControllers.append(frontViewController)
@@ -604,9 +604,9 @@ public class ElasticTransition: EdgePanTransition, UIGestureRecognizerDelegate{
let finalPoint = self.finalPoint()
if !presenting{
if let delegate = pushedControllers.last as? ElasticMenuTransitionDelegate {
delegate.elasticTransitionWillDismiss?(self)
}
if let delegate = pushedControllers.last as? ElasticMenuTransitionDelegate {
delegate.elasticTransitionWillDismiss?(self)
}
}
lc.m_animate("center", to: finalPoint, stiffness: animationSideStiffness, damping: animationDamping, threshold: animationThreshold)
cc.m_animate("center", to: finalPoint, stiffness: animationCenterStiffness, damping: animationDamping, threshold: animationThreshold){
@@ -619,7 +619,7 @@ public class ElasticTransition: EdgePanTransition, UIGestureRecognizerDelegate{
override func endInteractiveTransition() -> Bool{
if !transitioning {
return false
return false
}
let finalPoint = self.finalPoint()
let initialPoint = self.finalPoint(!self.presenting)
@@ -161,7 +161,7 @@
TargetAttributes = {
B12BC0921C21FA470016D774 = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = G7UGV2H9R6;
DevelopmentTeam = 4VSEW78TKT;
LastSwiftMigration = 0800;
};
};
@@ -380,7 +380,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = G7UGV2H9R6;
DEVELOPMENT_TEAM = 4VSEW78TKT;
INFOPLIST_FILE = ElasticTransitionExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -396,7 +396,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = G7UGV2H9R6;
DEVELOPMENT_TEAM = 4VSEW78TKT;
INFOPLIST_FILE = ElasticTransitionExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
@@ -30,6 +40,16 @@
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
Oops, something went wrong.

0 comments on commit 03e0e6b

Please sign in to comment.