This repository has been archived by the owner on Oct 15, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 235
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove pop from Today extension. Trying to fix the archive problem -_-
- Loading branch information
1 parent
c9c107c
commit 9aca101
Showing
6 changed files
with
32 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| source 'https://rubygems.org' | ||
|
|
||
| gem 'cocoapods', '0.37' | ||
| gem 'cocoapods-keys' | ||
| gem 'cocoapods', '~> 0.37' | ||
| gem 'xcpretty' | ||
| gem 'plist' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,27 @@ | ||
| // | ||
| // TodayViewController+Animation.swift | ||
| // BigGulp | ||
| // | ||
| // Created by Andrea Mazzini on 21/03/15. | ||
| // Copyright (c) 2015 Fancy Pixel. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
| import pop | ||
|
|
||
| extension TodayViewController { | ||
| func showConfirmButtons() { | ||
| let scaleDownBig = POPBasicAnimation(propertyNamed: kPOPViewScaleXY) | ||
| scaleDownBig.fromValue = NSValue(CGPoint: CGPointMake(1, 1)) | ||
| scaleDownBig.toValue = NSValue(CGPoint: CGPointMake(0, 0)) | ||
| scaleDownBig.removedOnCompletion = true | ||
| scaleDownBig.duration = 0.2 | ||
| scaleDownBig.completionBlock = { (_, _) in | ||
| let scaleUpBig = POPBasicAnimation(propertyNamed: kPOPViewScaleXY) | ||
| scaleUpBig.fromValue = NSValue(CGPoint: CGPointMake(0, 0)) | ||
| scaleUpBig.toValue = NSValue(CGPoint: CGPointMake(1, 1)) | ||
| scaleUpBig.removedOnCompletion = true | ||
| scaleUpBig.duration = 0.2 | ||
| self.bigConfirmButton.pop_addAnimation(scaleUpBig, forKey: "scaleUpBig") | ||
| }; | ||
| self.bigGulpButton.pop_addAnimation(scaleDownBig, forKey: "scaleDownBig") | ||
|
|
||
| let scaleDownSmall = POPBasicAnimation(propertyNamed: kPOPViewScaleXY) | ||
| scaleDownSmall.fromValue = NSValue(CGPoint: CGPointMake(1, 1)) | ||
| scaleDownSmall.toValue = NSValue(CGPoint: CGPointMake(0, 0)) | ||
| scaleDownSmall.removedOnCompletion = true | ||
| scaleDownSmall.duration = 0.2 | ||
| scaleDownSmall.completionBlock = { (_, _) in | ||
| let scaleUpSmall = POPBasicAnimation(propertyNamed: kPOPViewScaleXY) | ||
| scaleUpSmall.fromValue = NSValue(CGPoint: CGPointMake(0, 0)) | ||
| scaleUpSmall.toValue = NSValue(CGPoint: CGPointMake(1, 1)) | ||
| scaleUpSmall.removedOnCompletion = true | ||
| scaleUpSmall.duration = 0.2 | ||
| self.smallConfirmButton.pop_addAnimation(scaleUpSmall, forKey: "scaleUpSmall") | ||
| }; | ||
| self.smallGulpButton.pop_addAnimation(scaleDownSmall, forKey: "scaleDownSmall") | ||
| UIView.animateWithDuration(0.2, animations: { () -> Void in | ||
| self.bigGulpButton.transform = CGAffineTransformMakeScale(0.001, 0.001) | ||
| self.smallGulpButton.transform = CGAffineTransformMakeScale(0.001, 0.001) | ||
| }) { (_) -> Void in | ||
| UIView.animateWithDuration(0.2) { | ||
| self.bigConfirmButton.transform = CGAffineTransformMakeScale(1, 1) | ||
| self.smallConfirmButton.transform = CGAffineTransformMakeScale(1, 1) | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| func hideConfirmButtons() { | ||
| let scaleDownBig = POPBasicAnimation(propertyNamed: kPOPViewScaleXY) | ||
| scaleDownBig.fromValue = NSValue(CGPoint: CGPointMake(1, 1)) | ||
| scaleDownBig.toValue = NSValue(CGPoint: CGPointMake(0, 0)) | ||
| scaleDownBig.removedOnCompletion = true | ||
| scaleDownBig.duration = 0.2 | ||
| scaleDownBig.completionBlock = { (_, _) in | ||
| let scaleUpBig = POPBasicAnimation(propertyNamed: kPOPViewScaleXY) | ||
| scaleUpBig.fromValue = NSValue(CGPoint: CGPointMake(0, 0)) | ||
| scaleUpBig.toValue = NSValue(CGPoint: CGPointMake(1, 1)) | ||
| scaleUpBig.removedOnCompletion = true | ||
| scaleUpBig.duration = 0.2 | ||
| self.bigGulpButton.pop_addAnimation(scaleUpBig, forKey: "scaleUpBig") | ||
| }; | ||
| self.bigConfirmButton.pop_addAnimation(scaleDownBig, forKey: "scaleDownBig") | ||
|
|
||
| let scaleDownSmall = POPBasicAnimation(propertyNamed: kPOPViewScaleXY) | ||
| scaleDownSmall.fromValue = NSValue(CGPoint: CGPointMake(1, 1)) | ||
| scaleDownSmall.toValue = NSValue(CGPoint: CGPointMake(0, 0)) | ||
| scaleDownSmall.removedOnCompletion = true | ||
| scaleDownSmall.duration = 0.2 | ||
| scaleDownSmall.completionBlock = { (_, _) in | ||
| let scaleUpSmall = POPBasicAnimation(propertyNamed: kPOPViewScaleXY) | ||
| scaleUpSmall.fromValue = NSValue(CGPoint: CGPointMake(0, 0)) | ||
| scaleUpSmall.toValue = NSValue(CGPoint: CGPointMake(1, 1)) | ||
| scaleUpSmall.removedOnCompletion = true | ||
| scaleUpSmall.duration = 0.2 | ||
| self.smallGulpButton.pop_addAnimation(scaleUpSmall, forKey: "scaleUpSmall") | ||
| }; | ||
| self.smallConfirmButton.pop_addAnimation(scaleDownSmall, forKey: "scaleDownSmall") | ||
| UIView.animateWithDuration(0.2, animations: { () -> Void in | ||
| self.bigConfirmButton.transform = CGAffineTransformMakeScale(0.001, 0.001) | ||
| self.smallConfirmButton.transform = CGAffineTransformMakeScale(0.001, 0.001) | ||
| }) { (_) -> Void in | ||
| UIView.animateWithDuration(0.2) { | ||
| self.bigGulpButton.transform = CGAffineTransformMakeScale(1, 1) | ||
| self.smallGulpButton.transform = CGAffineTransformMakeScale(1, 1) | ||
| }; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters