Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Demo/SpinKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -54,6 +55,8 @@
028F586A19C75CBD0070546A /* RTSpinKitArcAltAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTSpinKitArcAltAnimation.m; sourceTree = "<group>"; usesTabs = 0; };
02EE552419C22DA600D58D49 /* RTSpinKitArcAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTSpinKitArcAnimation.h; sourceTree = "<group>"; };
02EE552519C22DA600D58D49 /* RTSpinKitArcAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTSpinKitArcAnimation.m; sourceTree = "<group>"; };
3182115475443FC40D47C5DF /* RTSpinKitFadingCircleSixBubblesAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RTSpinKitFadingCircleSixBubblesAnimation.m; sourceTree = "<group>"; };
3182152BDB0FE2D188CA7C12 /* RTSpinKitFadingCircleSixBubblesAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTSpinKitFadingCircleSixBubblesAnimation.h; sourceTree = "<group>"; };
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; };
Expand Down Expand Up @@ -248,6 +251,8 @@
02EE552519C22DA600D58D49 /* RTSpinKitArcAnimation.m */,
028F586919C75CBD0070546A /* RTSpinKitArcAltAnimation.h */,
028F586A19C75CBD0070546A /* RTSpinKitArcAltAnimation.m */,
3182152BDB0FE2D188CA7C12 /* RTSpinKitFadingCircleSixBubblesAnimation.h */,
3182115475443FC40D47C5DF /* RTSpinKitFadingCircleSixBubblesAnimation.m */,
);
name = Animations;
path = ../../SpinKit/Animations;
Expand Down Expand Up @@ -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;
};
Expand Down
5 changes: 5 additions & 0 deletions Demo/SpinKit/RTTestViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand Down
2 changes: 1 addition & 1 deletion SpinKit.podspec
Original file line number Diff line number Diff line change
@@ -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.'
Expand Down
30 changes: 30 additions & 0 deletions SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.h
Original file line number Diff line number Diff line change
@@ -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 <Foundation/Foundation.h>
#import "RTSpinKitAnimating.h"

@interface RTSpinKitFadingCircleSixBubblesAnimation : NSObject<RTSpinKitAnimating>

@end
71 changes: 71 additions & 0 deletions SpinKit/Animations/RTSpinKitFadingCircleSixBubblesAnimation.m
Original file line number Diff line number Diff line change
@@ -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 <tgmath.h>

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
4 changes: 4 additions & 0 deletions SpinKit/RTSpinKitUtils.m
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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];

Expand Down
1 change: 1 addition & 0 deletions SpinKit/RTSpinKitView.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ typedef NS_ENUM(NSInteger, RTSpinKitViewStyle) {
RTSpinKitViewStyleWordPress,
RTSpinKitViewStyleFadingCircle,
RTSpinKitViewStyleFadingCircleAlt,
RTSpinKitViewStyleFadingCircleSixBubbles,
RTSpinKitViewStyleArc,
RTSpinKitViewStyleArcAlt
};
Expand Down