Permalink
Browse files

Merge branch 'release/1.1.4'

  • Loading branch information...
2 parents 5a9bb1d + a6a3f57 commit f167a39c527351daa677120e962f6b55095471e2 @defagos committed May 27, 2012
Showing with 5,290 additions and 2,376 deletions.
  1. +1 −1 CoconutKit-demo/CoconutKit-demo-Info.plist
  2. +59 −89 CoconutKit-demo/CoconutKit-demo.xcodeproj/project.pbxproj
  3. BIN CoconutKit-demo/Resources/Images/img_apple1.jpg
  4. BIN CoconutKit-demo/Resources/Images/img_apple2.jpg
  5. BIN CoconutKit-demo/Resources/Images/img_apple3.jpg
  6. BIN CoconutKit-demo/Resources/Images/img_apple4.jpg
  7. BIN CoconutKit-demo/Resources/Images/img_coconut4.jpg
  8. +4 −1 ...it-demo/Sources/Demos/Animation/MultipleViewsAnimation/MultipleViewsAnimationDemoViewController.h
  9. +32 −10 ...it-demo/Sources/Demos/Animation/MultipleViewsAnimation/MultipleViewsAnimationDemoViewController.m
  10. +85 −23 ...-demo/Sources/Demos/Animation/MultipleViewsAnimation/MultipleViewsAnimationDemoViewController.xib
  11. +4 −1 CoconutKit-demo/Sources/Demos/Animation/SingleViewAnimation/SingleViewAnimationDemoViewController.h
  12. +41 −14 CoconutKit-demo/Sources/Demos/Animation/SingleViewAnimation/SingleViewAnimationDemoViewController.m
  13. +85 −36 ...nutKit-demo/Sources/Demos/Animation/SingleViewAnimation/SingleViewAnimationDemoViewController.xib
  14. +0 −19 CoconutKit-demo/Sources/Demos/View/KenBurnsSlideshow/KenBurnsSlideshowDemoViewController.h
  15. +0 −79 CoconutKit-demo/Sources/Demos/View/KenBurnsSlideshow/KenBurnsSlideshowDemoViewController.m
  16. +0 −286 CoconutKit-demo/Sources/Demos/View/KenBurnsSlideshow/KenBurnsSlideshowDemoViewController.xib
  17. +56 −0 CoconutKit-demo/Sources/Demos/View/Slideshow/SlideshowDemoViewController.h
  18. +293 −0 CoconutKit-demo/Sources/Demos/View/Slideshow/SlideshowDemoViewController.m
  19. +971 −0 CoconutKit-demo/Sources/Demos/View/Slideshow/SlideshowDemoViewController.xib
  20. +2 −2 CoconutKit-demo/Sources/Demos/View/WebView/WebViewDemoViewController.m
  21. +5 −0 CoconutKit-demo/Sources/Demos/ViewControllers/Placeholder/PlaceholderDemoViewController.m
  22. +5 −0 CoconutKit-demo/Sources/Demos/ViewControllers/RootStack/RootStackDemoViewController.m
  23. +5 −0 CoconutKit-demo/Sources/Demos/ViewControllers/Stack/StackDemoViewController.m
  24. +6 −6 CoconutKit-demo/Sources/DemosNavigator/DemosListViewController.m
  25. +33 −14 CoconutKit-demo/Sources/Models/Generated/_Person.h
  26. +23 −4 CoconutKit-demo/Sources/Models/Generated/_Person.m
  27. +6 −1 CoconutKit-demo/en.lproj/Localizable.strings
  28. +6 −1 CoconutKit-demo/fr.lproj/Localizable.strings
  29. +1 −1 CoconutKit-demo/main.m
  30. +1 −1 CoconutKit-dev/CoconutKit-dev-Info.plist
  31. +4 −2 CoconutKit-dev/CoconutKit-dev-Prefix.pch
  32. +293 −290 CoconutKit-dev/CoconutKit-dev.xcodeproj/project.pbxproj
  33. +1 −1 CoconutKit-dev/main.m
  34. +7 −0 CoconutKit-resources/.gitignore
  35. +26 −0 CoconutKit-resources/CoconutKit-resources-Info.plist
  36. +269 −0 CoconutKit-resources/CoconutKit-resources.xcodeproj/project.pbxproj
  37. +58 −0 ...Kit-resources/CoconutKit-resources.xcodeproj/xcshareddata/xcschemes/CoconutKit-resources.xcscheme
  38. BIN .../CoconutKit_ButtonBarArrowLeft.png → CoconutKit-resources/Resources/Images/ButtonBarArrowLeft.png
  39. BIN ...utKit_ButtonBarArrowLeft@2x.png → CoconutKit-resources/Resources/Images/ButtonBarArrowLeft@2x.png
  40. BIN ...oconutKit_ButtonBarArrowRight.png → CoconutKit-resources/Resources/Images/ButtonBarArrowRight.png
  41. BIN ...Kit_ButtonBarArrowRight@2x.png → CoconutKit-resources/Resources/Images/ButtonBarArrowRight@2x.png
  42. BIN ...ages/CoconutKit_ButtonBarRefresh.png → CoconutKit-resources/Resources/Images/ButtonBarRefresh.png
  43. BIN ...oconutKit_ButtonBarRefresh@2x.png → CoconutKit-resources/Resources/Images/ButtonBarRefresh@2x.png
  44. BIN ...utKit_cursor_default_pointer.png → CoconutKit-resources/Resources/Images/CursorDefaultPointer.png
  45. +19 −50 ...oconutKit_HLSWebViewController.xib → CoconutKit-resources/Resources/Nibs/HLSWebViewController.xib
  46. +1 −1 ...proj/CoconutKit_Localizable.strings → CoconutKit-resources/Resources/de.lproj/Localizable.strings
  47. +1 −1 ...proj/CoconutKit_Localizable.strings → CoconutKit-resources/Resources/en.lproj/Localizable.strings
  48. +1 −1 ...proj/CoconutKit_Localizable.strings → CoconutKit-resources/Resources/es.lproj/Localizable.strings
  49. +1 −1 ...proj/CoconutKit_Localizable.strings → CoconutKit-resources/Resources/fr.lproj/Localizable.strings
  50. +1 −1 ...proj/CoconutKit_Localizable.strings → CoconutKit-resources/Resources/it.lproj/Localizable.strings
  51. +1 −1 ...proj/CoconutKit_Localizable.strings → CoconutKit-resources/Resources/ja.lproj/Localizable.strings
  52. +1 −1 ...proj/CoconutKit_Localizable.strings → CoconutKit-resources/Resources/ko.lproj/Localizable.strings
  53. +1 −1 CoconutKit-test/CoconutKit-test-Info.plist
  54. +3 −1 CoconutKit-test/CoconutKit-test-Prefix.pch
  55. +110 −104 CoconutKit-test/CoconutKit-test.xcodeproj/project.pbxproj
  56. +11 −0 CoconutKit-test/Sources/Core/HLSZeroingWeakRefTestCase.h
  57. +39 −0 CoconutKit-test/Sources/Core/HLSZeroingWeakRefTestCase.m
  58. +14 −2 CoconutKit-test/Sources/Models/Generated/_AbstractClassA.h
  59. +12 −0 CoconutKit-test/Sources/Models/Generated/_AbstractClassA.m
  60. +15 −2 CoconutKit-test/Sources/Models/Generated/_BankAccount.h
  61. +13 −0 CoconutKit-test/Sources/Models/Generated/_BankAccount.m
  62. +20 −7 CoconutKit-test/Sources/Models/Generated/_ConcreteClassD.h
  63. +19 −4 CoconutKit-test/Sources/Models/Generated/_ConcreteClassD.m
  64. +39 −24 CoconutKit-test/Sources/Models/Generated/_ConcreteSubclassB.h
  65. +33 −16 CoconutKit-test/Sources/Models/Generated/_ConcreteSubclassB.m
  66. +21 −8 CoconutKit-test/Sources/Models/Generated/_ConcreteSubclassC.h
  67. +17 −4 CoconutKit-test/Sources/Models/Generated/_ConcreteSubclassC.m
  68. +13 −1 CoconutKit-test/Sources/Models/Generated/_House.h
  69. +14 −0 CoconutKit-test/Sources/Models/Generated/_House.m
  70. +16 −2 CoconutKit-test/Sources/Models/Generated/_Person.h
  71. +18 −0 CoconutKit-test/Sources/Models/Generated/_Person.m
  72. +1 −1 CoconutKit-test/main.m
  73. +3 −0 CoconutKit.xcworkspace/contents.xcworkspacedata
  74. +1 −0 CoconutKit/.gitignore
  75. +92 −67 CoconutKit/CoconutKit.xcodeproj/project.pbxproj
  76. +33 −12 CoconutKit/Sources/Animation/HLSAnimation.h
  77. +116 −30 CoconutKit/Sources/Animation/HLSAnimation.m
  78. +2 −1 CoconutKit/Sources/Animation/HLSAnimationStep.h
  79. +4 −3 CoconutKit/Sources/Core/HLSKeyboardInformation.h
  80. +4 −6 CoconutKit/Sources/Core/HLSRuntime.h
  81. +9 −12 CoconutKit/Sources/Core/HLSRuntime.m
  82. +58 −0 CoconutKit/Sources/Core/HLSZeroingWeakRef.h
  83. +161 −0 CoconutKit/Sources/Core/HLSZeroingWeakRef.m
  84. +5 −1 CoconutKit/Sources/Core/NSBundle+HLSExtensions.m
  85. +23 −17 CoconutKit/Sources/Core/NSDate+HLSExtensions.m
  86. +2 −1 CoconutKit/Sources/Core/NSObject+HLSExtensions.h
  87. +15 −29 CoconutKit/Sources/Core/UIControl+HLSExclusiveTouch.m
  88. +97 −91 CoconutKit/Sources/CoreData/NSManagedObject+HLSValidation.m
  89. +6 −5 CoconutKit/Sources/Task/HLSTask.m
  90. +6 −5 CoconutKit/Sources/Task/HLSTaskGroup.m
  91. +3 −1 CoconutKit/Sources/View/HLSCursor.m
  92. +0 −60 CoconutKit/Sources/View/HLSKenBurnsSlideshow.h
  93. +0 −331 CoconutKit/Sources/View/HLSKenBurnsSlideshow.m
  94. +139 −0 CoconutKit/Sources/View/HLSSlideshow.h
  95. +820 −0 CoconutKit/Sources/View/HLSSlideshow.m
  96. +1 −4 CoconutKit/Sources/View/HLSTextField.m
  97. +46 −41 CoconutKit/Sources/View/UIActionSheet+HLSExtensions.m
  98. +0 −3 CoconutKit/Sources/View/UIBarButtonItem+HLSActionSheet.h
  99. +36 −22 CoconutKit/Sources/View/UIBarButtonItem+HLSActionSheet.m
  100. +51 −42 CoconutKit/Sources/View/UILabel+HLSDynamicLocalization.m
  101. +27 −30 CoconutKit/Sources/View/UINavigationBar+HLSExtensions.m
  102. +0 −2 CoconutKit/Sources/View/UINavigationController+HLSActionSheet.h
  103. +14 −9 CoconutKit/Sources/View/UINavigationController+HLSActionSheet.m
  104. +12 −10 CoconutKit/Sources/View/UIScrollView+HLSExtensions.m
  105. +17 −26 CoconutKit/Sources/View/UITextField+HLSExtensions.m
  106. +54 −57 CoconutKit/Sources/View/UITextField+HLSValidation.m
  107. +16 −0 CoconutKit/Sources/View/UITextView+HLSExtensions.h
  108. +68 −0 CoconutKit/Sources/View/UITextView+HLSExtensions.m
  109. +2 −8 CoconutKit/Sources/View/UIWebView+HLSExtensions.h
  110. +31 −24 CoconutKit/Sources/View/UIWebView+HLSExtensions.m
  111. +239 −189 CoconutKit/Sources/ViewControllers/HLSContainerContent.m
  112. +8 −7 CoconutKit/Sources/ViewControllers/HLSTransitionStyle.h
  113. +8 −6 CoconutKit/Sources/ViewControllers/HLSWebViewController.m
  114. +1 −1 CoconutKit/Sources/ViewControllers/HLSWizardViewController.m
  115. +84 −57 CoconutKit/Sources/ViewControllers/UIViewController+HLSExtensions.m
  116. +2 −1 CoconutKit/bootstrap.txt
  117. +2 −1 CoconutKit/publicHeaders.txt
  118. +114 −48 README.markdown
  119. +21 −0 Tools/CocoaPods/CoconutKit.podspec
  120. 0 { → Tools}/Snippets/GHTestCase_subclass.m
  121. 0 { → Tools}/Snippets/HLSCursorDataSource_HLSCursorDelegate.m
  122. 0 { → Tools}/Snippets/HLSNibView_subclass.m
  123. 0 { → Tools}/Snippets/HLSTableView_subclass.m
  124. 0 { → Tools}/Snippets/HLSViewController_subclass.m
  125. 0 { → Tools}/Snippets/NSManagedObject_subclass.m
  126. 0 { → Tools}/Snippets/NSObject_subclass.m
  127. 0 { → Tools}/Snippets/UITableViewDataSource_UITableViewDelegate.m
  128. 0 { → Tools}/Snippets/description.m
  129. 0 { → Tools}/Snippets/enum.m
  130. 0 { → Tools}/Snippets/switch.m
@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.1.3</string>
+ <string>1.1.4</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>

Large diffs are not rendered by default.

Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -15,6 +15,7 @@
UIButton *m_playForwardButton;
UIButton *m_playBackwardButton;
UIButton *m_cancelButton;
+ UIButton *m_terminateButton;
UISwitch *m_animatedSwitch;
UISwitch *m_blockingSwitch;
UISwitch *m_resizingSwitch;
@@ -29,12 +30,14 @@
@property (nonatomic, retain) IBOutlet UIButton *playForwardButton;
@property (nonatomic, retain) IBOutlet UIButton *playBackwardButton;
@property (nonatomic, retain) IBOutlet UIButton *cancelButton;
+@property (nonatomic, retain) IBOutlet UIButton *terminateButton;
@property (nonatomic, retain) IBOutlet UISwitch *animatedSwitch;
@property (nonatomic, retain) IBOutlet UISwitch *blockingSwitch;
@property (nonatomic, retain) IBOutlet UISwitch *resizingSwitch;
- (IBAction)playForward:(id)sender;
- (IBAction)playBackward:(id)sender;
-- (IBAction)cancelButton:(id)sender;
+- (IBAction)cancel:(id)sender;
+- (IBAction)terminate:(id)sender;
@end
@@ -31,22 +31,19 @@ - (void)releaseViews
{
[super releaseViews];
- [self.animation cancel];
- self.animation = nil;
-
- [self.reverseAnimation cancel];
- self.reverseAnimation = nil;
-
self.rectangleView1 = nil;
self.rectangleView2 = nil;
self.rectangleView3 = nil;
self.rectangleView4 = nil;
self.playForwardButton = nil;
self.playBackwardButton = nil;
self.cancelButton = nil;
+ self.terminateButton = nil;
self.animatedSwitch = nil;
self.blockingSwitch = nil;
self.resizingSwitch = nil;
+ self.animation = nil;
+ self.reverseAnimation = nil;
}
#pragma mark View lifecycle
@@ -57,6 +54,7 @@ - (void)viewDidLoad
self.playBackwardButton.hidden = YES;
self.cancelButton.hidden = YES;
+ self.terminateButton.hidden = YES;
self.animatedSwitch.on = YES;
self.blockingSwitch.on = NO;
@@ -79,6 +77,8 @@ - (void)viewDidLoad
@synthesize cancelButton = m_cancelButton;
+@synthesize terminateButton = m_terminateButton;
+
@synthesize animatedSwitch = m_animatedSwitch;
@synthesize blockingSwitch = m_blockingSwitch;
@@ -106,8 +106,10 @@ - (IBAction)playForward:(id)sender
{
self.playForwardButton.hidden = YES;
self.cancelButton.hidden = NO;
+ self.terminateButton.hidden = NO;
HLSAnimationStep *animationStep1 = [HLSAnimationStep animationStep];
+ animationStep1.tag = @"step1";
animationStep1.duration = 2.;
HLSViewAnimationStep *viewAnimationStep11 = [HLSViewAnimationStep viewAnimationStep];
viewAnimationStep11.transform = CATransform3DMakeTranslation(50.f, 60.f, 0.f);
@@ -125,6 +127,7 @@ - (IBAction)playForward:(id)sender
// Can also apply the same view animation step to all views
HLSAnimationStep *animationStep2 = [HLSAnimationStep animationStep];
+ animationStep2.tag = @"step2";
animationStep2.duration = 1.;
HLSViewAnimationStep *viewAnimationStep2 = [HLSViewAnimationStep viewAnimationStep];
viewAnimationStep2.transform = CATransform3DMakeTranslation(80.f, 0.f, 0.f);
@@ -134,6 +137,7 @@ - (IBAction)playForward:(id)sender
[animationStep2 addViewAnimationStep:viewAnimationStep2 forView:self.rectangleView4];
HLSAnimationStep *animationStep3 = [HLSAnimationStep animationStep];
+ animationStep3.tag = @"step3";
animationStep3.duration = 0.5;
HLSViewAnimationStep *viewAnimationStep31 = [HLSViewAnimationStep viewAnimationStep];
viewAnimationStep31.transform = CATransform3DMakeScale(1.5f, 2.f, 1.f);
@@ -162,14 +166,15 @@ - (IBAction)playBackward:(id)sender
{
self.playBackwardButton.hidden = YES;
self.cancelButton.hidden = NO;
+ self.terminateButton.hidden = NO;
// Create the reverse animation
self.reverseAnimation = [self.animation reverseAnimation];
self.reverseAnimation.lockingUI = self.blockingSwitch.on;
[self.reverseAnimation playAnimated:self.animatedSwitch.on];
}
-- (IBAction)cancelButton:(id)sender
+- (IBAction)cancel:(id)sender
{
if (self.animation.running) {
self.playBackwardButton.hidden = NO;
@@ -181,23 +186,39 @@ - (IBAction)cancelButton:(id)sender
}
self.cancelButton.hidden = YES;
+ self.terminateButton.hidden = YES;
+}
+
+- (IBAction)terminate:(id)sender
+{
+ if (self.animation.running) {
+ self.playBackwardButton.hidden = NO;
+ [self.animation terminate];
+ }
+ if (self.reverseAnimation.running) {
+ self.playForwardButton.hidden = NO;
+ [self.reverseAnimation terminate];
+ }
+
+ self.cancelButton.hidden = YES;
+ self.terminateButton.hidden = YES;
}
#pragma mark HLSAnimationDelegate protocol implementation
- (void)animationWillStart:(HLSAnimation *)animation animated:(BOOL)animated
{
- HLSLoggerInfo(@"Animation %@, animated = %@", animation.tag, HLSStringFromBool(animated));
+ HLSLoggerInfo(@"Animation %@ will start, animated = %@", animation.tag, HLSStringFromBool(animated));
}
- (void)animationStepFinished:(HLSAnimationStep *)animationStep animated:(BOOL)animated
{
- HLSLoggerInfo(@"Animated = %@", HLSStringFromBool(animated));
+ HLSLoggerInfo(@"Step %@ finished, animated = %@", animationStep.tag, HLSStringFromBool(animated));
}
- (void)animationDidStop:(HLSAnimation *)animation animated:(BOOL)animated
{
- HLSLoggerInfo(@"Animation %@, animated = %@", animation.tag, HLSStringFromBool(animated));
+ HLSLoggerInfo(@"Animation %@ did stop, animated = %@", animation.tag, HLSStringFromBool(animated));
// Can find which animation ended using its tag
if ([animation.tag isEqualToString:@"multipleViewsAnimation"]) {
@@ -208,6 +229,7 @@ - (void)animationDidStop:(HLSAnimation *)animation animated:(BOOL)animated
}
self.cancelButton.hidden = YES;
+ self.terminateButton.hidden = YES;
}
#pragma mark Localization
Oops, something went wrong.

0 comments on commit f167a39

Please sign in to comment.