From cf4223983cc9acfd713d2bdeaf9c2ff9c8250af4 Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 8 Jun 2017 11:35:06 +0300 Subject: [PATCH 1/2] added new animation --- Demo/SpinKit.xcodeproj/project.pbxproj | 6 ++ Demo/SpinKit/RTTestViewController.m | 5 ++ ...RTSpinKitFadingCircleSixBubblesAnimation.h | 30 ++++++++ ...RTSpinKitFadingCircleSixBubblesAnimation.m | 71 +++++++++++++++++++ SpinKit/RTSpinKitUtils.m | 4 ++ SpinKit/RTSpinKitView.h | 1 + 6 files changed, 117 insertions(+) create mode 100644 SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.h create mode 100644 SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.m diff --git a/Demo/SpinKit.xcodeproj/project.pbxproj b/Demo/SpinKit.xcodeproj/project.pbxproj index 0f58321..d8843b3 100644 --- a/Demo/SpinKit.xcodeproj/project.pbxproj +++ b/Demo/SpinKit.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 028F586B19C75CBE0070546A /* RTSpinKitArcAltAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 028F586A19C75CBD0070546A /* RTSpinKitArcAltAnimation.m */; }; 02EE552619C22DA600D58D49 /* RTSpinKitArcAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 02EE552519C22DA600D58D49 /* RTSpinKitArcAnimation.m */; }; + 31821ACCFAD266B0BDB4D176 /* RTSpinKitFadingCircleSixBubblesAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 3182115475443FC40D47C5DF /* RTSpinKitFadingCircleSixBubblesAnimation.m */; }; F646194B1874E9FB00ED6B1B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F646194A1874E9FB00ED6B1B /* Foundation.framework */; }; F646194D1874E9FB00ED6B1B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F646194C1874E9FB00ED6B1B /* CoreGraphics.framework */; }; F646194F1874E9FB00ED6B1B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F646194E1874E9FB00ED6B1B /* UIKit.framework */; }; @@ -54,6 +55,8 @@ 028F586A19C75CBD0070546A /* RTSpinKitArcAltAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTSpinKitArcAltAnimation.m; sourceTree = ""; usesTabs = 0; }; 02EE552419C22DA600D58D49 /* RTSpinKitArcAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTSpinKitArcAnimation.h; sourceTree = ""; }; 02EE552519C22DA600D58D49 /* RTSpinKitArcAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTSpinKitArcAnimation.m; sourceTree = ""; }; + 3182115475443FC40D47C5DF /* RTSpinKitFadingCircleSixBubblesAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTSpinKitFadingCircleSixBubblesAnimation.m; sourceTree = ""; }; + 3182152BDB0FE2D188CA7C12 /* RTSpinKitFadingCircleSixBubblesAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTSpinKitFadingCircleSixBubblesAnimation.h; sourceTree = ""; }; F64619471874E9FB00ED6B1B /* SpinKit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SpinKit.app; sourceTree = BUILT_PRODUCTS_DIR; }; F646194A1874E9FB00ED6B1B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; F646194C1874E9FB00ED6B1B /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -248,6 +251,8 @@ 02EE552519C22DA600D58D49 /* RTSpinKitArcAnimation.m */, 028F586919C75CBD0070546A /* RTSpinKitArcAltAnimation.h */, 028F586A19C75CBD0070546A /* RTSpinKitArcAltAnimation.m */, + 3182152BDB0FE2D188CA7C12 /* RTSpinKitFadingCircleSixBubblesAnimation.h */, + 3182115475443FC40D47C5DF /* RTSpinKitFadingCircleSixBubblesAnimation.m */, ); name = Animations; path = ../../SpinKit/Animations; @@ -372,6 +377,7 @@ 02EE552619C22DA600D58D49 /* RTSpinKitArcAnimation.m in Sources */, F6BC23CD19B972340055D239 /* RTSpinKitWaveAnimation.m in Sources */, F6BC23C819B972340055D239 /* RTSpinKitFadingCircleAnimation.m in Sources */, + 31821ACCFAD266B0BDB4D176 /* RTSpinKitFadingCircleSixBubblesAnimation.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Demo/SpinKit/RTTestViewController.m b/Demo/SpinKit/RTTestViewController.m index 9509d73..adc9732 100644 --- a/Demo/SpinKit/RTTestViewController.m +++ b/Demo/SpinKit/RTTestViewController.m @@ -78,6 +78,11 @@ -(void)loadView { backgroundColor:[UIColor colorWithRed:0.60 green:0.0 blue:0.0 alpha:1.0] label:@"FadingCircleAlt"]; + + [self insertSpinnerOfStyle: RTSpinKitViewStyleFadingCircleSixBubbles + backgroundColor:[UIColor colorWithRed:0.60 green:0.0 blue:0.0 alpha:1.0] + label:@"FadingCircleSixBubbles"]; + [self insertSpinnerOfStyle: RTSpinKitViewStyleArc backgroundColor:[UIColor colorWithRed:0.56 green:0.27 blue:0.68 alpha:1.0] label:@"Arc"]; diff --git a/SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.h b/SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.h new file mode 100644 index 0000000..fcd9536 --- /dev/null +++ b/SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.h @@ -0,0 +1,30 @@ +// +// RTSpinKitFadingCircleSixBubblesAnimation.h +// SpinKit +// +// Copyright (c) 2014 Ramon Torres and modified by Ivan Gaydamakin +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#import +#import "RTSpinKitAnimating.h" + +@interface RTSpinKitFadingCircleSixBubblesAnimation : NSObject + +@end diff --git a/SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.m b/SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.m new file mode 100644 index 0000000..ac93e8d --- /dev/null +++ b/SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.m @@ -0,0 +1,71 @@ +// +// RTSpinKitFadingCircleSixBubblesAnimation.m +// SpinKit +// +// Copyright (c) 2014 Ramon Torres and modified by Ivan Gaydamakin +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#import "RTSpinKitFadingCircleSixBubblesAnimation.h" +#include + +static const CGFloat kRTSpinKitDegToRad = 0.0174532925; + +@implementation RTSpinKitFadingCircleSixBubblesAnimation + +-(void)setupSpinKitAnimationInLayer:(CALayer*)layer withSize:(CGSize)size color:(UIColor*)color { + NSTimeInterval beginTime = CACurrentMediaTime() ; + + CGFloat radius = size.width / 2; + + for (NSInteger i=0; i < 12; i+=1) { + CALayer *circle = [CALayer layer]; + circle.backgroundColor = color.CGColor; + circle.anchorPoint = CGPointMake(0.5, 0.5); + circle.frame = CGRectMake(radius + cosf(kRTSpinKitDegToRad * (30.0 * i)) * radius , radius + sinf(kRTSpinKitDegToRad * (30.0 * i)) * radius, radius / 2, radius / 2); + circle.shouldRasterize = YES; + circle.rasterizationScale = [[UIScreen mainScreen] scale]; + circle.cornerRadius = CGRectGetHeight(circle.bounds) * 0.5; + + CAKeyframeAnimation* transformAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform"]; + +// transformAnimation.values = @[ +// [NSValue valueWithCATransform3D:CATransform3DMakeScale(1.0, 1.0, 0.0)], +// [NSValue valueWithCATransform3D:CATransform3DMakeScale(0.0, 0.0, 0.0)] +// ]; + + CAKeyframeAnimation* opacityAnimation = [CAKeyframeAnimation animationWithKeyPath:@"opacity"]; + + opacityAnimation.values = @[ + @(1.0), + @(-1.0) + ]; + + CAAnimationGroup* animationGroup = [[CAAnimationGroup alloc] init]; + animationGroup.removedOnCompletion = NO; + animationGroup.repeatCount = HUGE_VALF; + animationGroup.duration = 1.2; + animationGroup.beginTime = beginTime - (1.2 - (0.1 * i)); + animationGroup.animations = @[transformAnimation, opacityAnimation]; + [circle addAnimation:animationGroup forKey:@"spinkit-anim"]; + [layer addSublayer:circle]; + } +} + +@end diff --git a/SpinKit/RTSpinKitUtils.m b/SpinKit/RTSpinKitUtils.m index c1892d2..d3593eb 100644 --- a/SpinKit/RTSpinKitUtils.m +++ b/SpinKit/RTSpinKitUtils.m @@ -32,6 +32,7 @@ #import "RTSpinKitCircleFlipAnimation.h" #import "RTSpinKitFadingCircleAltAnimation.h" #import "RTSpinKitFadingCircleAnimation.h" +#import "RTSpinKitFadingCircleSixBubblesAnimation.h" #import "RTSpinKitPlaneAnimation.h" #import "RTSpinKitPulseAnimation.h" #import "RTSpinKitThreeBounceAnimation.h" @@ -97,6 +98,9 @@ CATransform3D RTSpinKit3DRotationWithPerspective(CGFloat perspective, case RTSpinKitViewStyleFadingCircleAlt: return [[RTSpinKitFadingCircleAltAnimation alloc] init]; + case RTSpinKitViewStyleFadingCircleSixBubbles: + return [[RTSpinKitFadingCircleSixBubblesAnimation alloc] init]; + case RTSpinKitViewStyleArc: return [[RTSpinKitArcAnimation alloc] init]; diff --git a/SpinKit/RTSpinKitView.h b/SpinKit/RTSpinKitView.h index 731522d..45db40a 100644 --- a/SpinKit/RTSpinKitView.h +++ b/SpinKit/RTSpinKitView.h @@ -39,6 +39,7 @@ typedef NS_ENUM(NSInteger, RTSpinKitViewStyle) { RTSpinKitViewStyleWordPress, RTSpinKitViewStyleFadingCircle, RTSpinKitViewStyleFadingCircleAlt, + RTSpinKitViewStyleFadingCircleSixBubbles, RTSpinKitViewStyleArc, RTSpinKitViewStyleArcAlt }; From 42f704e94504ef190161208ff095b0332ba3c21c Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 8 Jun 2017 11:35:59 +0300 Subject: [PATCH 2/2] up version --- SpinKit.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpinKit.podspec b/SpinKit.podspec index da062e9..392a1b4 100644 --- a/SpinKit.podspec +++ b/SpinKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'SpinKit' - s.version = '1.2.0' + s.version = '1.2.1' s.authors = {'Ramon Torres' => 'raymondjavaxx@gmail.com'} s.homepage = 'https://github.com/raymondjavaxx/SpinKit-ObjC' s.summary = 'UIActivityIndicatorView replacement with multiple styles and animations.'