Skip to content

Commit 51de344

Browse files
jkpangjkpang
committed
CFTimeInterval —> NSTimeInterval
1 parent 79515c9 commit 51de344

File tree

10 files changed

+30
-26
lines changed

10 files changed

+30
-26
lines changed

‎PPCounter OSX Demo/PPCounter OSX Demo.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@
291291
COMBINE_HIDPI_IMAGES = YES;
292292
INFOPLIST_FILE = "PPCounter OSX Demo/Info.plist";
293293
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
294+
MACOSX_DEPLOYMENT_TARGET = 10.10;
294295
PRODUCT_BUNDLE_IDENTIFIER = "dsyc.com.PPCounter-OSX-Demo";
295296
PRODUCT_NAME = "$(TARGET_NAME)";
296297
};
@@ -303,6 +304,7 @@
303304
COMBINE_HIDPI_IMAGES = YES;
304305
INFOPLIST_FILE = "PPCounter OSX Demo/Info.plist";
305306
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
307+
MACOSX_DEPLOYMENT_TARGET = 10.10;
306308
PRODUCT_BUNDLE_IDENTIFIER = "dsyc.com.PPCounter-OSX-Demo";
307309
PRODUCT_NAME = "$(TARGET_NAME)";
308310
};

‎PPCounter OSX Demo/PPCounter OSX Demo.xcodeproj/project.xcworkspace/xcuserdata/duoyi.xcuserdatad/UserInterfaceState.xcuserstate

-102 Bytes
Binary file not shown.

‎PPCounter.podspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ Pod::Spec.new do |s|
1919

2020
s.source = { :git => "https://github.com/jkpang/PPCounter.git", :tag => s.version.to_s }
2121

22-
s.default_subspec = 'UIKit'
22+
s.source_files = 'PPCounter/PPCounter/**/*.{h,m}'
2323

2424
s.subspec 'Core' do |core|
25+
core.osx.deployment_target = '10.10'
26+
core.ios.deployment_target = '7.0'
2527
core.source_files = 'PPCounter/PPCounter/Core/*.{h,m}'
2628
end
2729

‎PPCounter.xcodeproj/project.xcworkspace/xcuserdata/duoyi.xcuserdatad/UserInterfaceState.xcuserstate

137 Bytes
Binary file not shown.

‎PPCounter.xcworkspace/xcuserdata/duoyi.xcuserdatad/UserInterfaceState.xcuserstate

8.82 KB
Binary file not shown.

‎PPCounter/PPCounter/Core/PPCounterEngine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*/
4747
- (void)fromNumber:(CGFloat)starNumer
4848
toNumber:(CGFloat)endNumber
49-
duration:(CFTimeInterval)duration
49+
duration:(NSTimeInterval)duration
5050
animationOptions:(PPCounterAnimationOptions)animationOptions
5151
currentNumber:(PPCurrentNumberBlock)currentNumber
5252
completion:(PPCompletionBlock)completion;

‎PPCounter/PPCounter/UIKit/UIButton+PPCounter.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
*/
4545
- (void)pp_fromNumber:(CGFloat)numberA
4646
toNumber:(CGFloat)numberB
47-
duration:(CFTimeInterval)duration
47+
duration:(NSTimeInterval)duration
4848
format:(PPFormatBlock)format;
4949

5050
/**
@@ -59,7 +59,7 @@
5959
*/
6060
- (void)pp_fromNumber:(CGFloat)numberA
6161
toNumber:(CGFloat)numberB
62-
duration:(CFTimeInterval)duration
62+
duration:(NSTimeInterval)duration
6363
format:(PPFormatBlock)format
6464
completion:(PPCompletionBlock)completion;
6565

@@ -77,7 +77,7 @@
7777
*/
7878
- (void)pp_fromNumber:(CGFloat)numberA
7979
toNumber:(CGFloat)numberB
80-
duration:(CFTimeInterval)duration
80+
duration:(NSTimeInterval)duration
8181
animationOptions:(PPCounterAnimationOptions)animationOptions
8282
format:(PPFormatBlock)format
8383
completion:(PPCompletionBlock)completion;
@@ -95,7 +95,7 @@
9595
*/
9696
- (void)pp_fromNumber:(CGFloat)numberA
9797
toNumber:(CGFloat)numberB
98-
duration:(CFTimeInterval)duration
98+
duration:(NSTimeInterval)duration
9999
attributedFormat:(PPAttributedFormatBlock)attributedFormat;
100100

101101
/**
@@ -110,7 +110,7 @@
110110
*/
111111
- (void)pp_fromNumber:(CGFloat)numberA
112112
toNumber:(CGFloat)numberB
113-
duration:(CFTimeInterval)duration
113+
duration:(NSTimeInterval)duration
114114
attributedFormat:(PPAttributedFormatBlock)attributedFormat
115115
completion:(PPCompletionBlock)completion;
116116

@@ -128,7 +128,7 @@
128128
*/
129129
- (void)pp_fromNumber:(CGFloat)numberA
130130
toNumber:(CGFloat)numberB
131-
duration:(CFTimeInterval)duration
131+
duration:(NSTimeInterval)duration
132132
animationOptions:(PPCounterAnimationOptions)animationOptions
133133
attributedFormat:(PPAttributedFormatBlock)attributedFormat
134134
completion:(PPCompletionBlock)completion;

‎PPCounter/PPCounter/UIKit/UIButton+PPCounter.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,31 @@
2929

3030
@implementation UIButton (PPCounter)
3131

32-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration format:(PPFormatBlock)format
32+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration format:(PPFormatBlock)format
3333
{
3434
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut format:format completion:nil];
3535
}
3636

37-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration format:(PPFormatBlock)format completion:(PPCompletionBlock)completion
37+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration format:(PPFormatBlock)format completion:(PPCompletionBlock)completion
3838
{
3939
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut format:format completion:completion];
4040
}
4141

42-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat
42+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat
4343
{
4444

4545
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut attributedFormat:attributedFormat completion:nil];
4646
}
4747

48-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat completion:(PPCompletionBlock)completion
48+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat completion:(PPCompletionBlock)completion
4949
{
5050
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut attributedFormat:attributedFormat completion:completion];
5151
}
5252

5353
#pragma mark - normal font
5454
- (void)pp_fromNumber:(CGFloat)numberA
5555
toNumber:(CGFloat)numberB
56-
duration:(CFTimeInterval)duration
56+
duration:(NSTimeInterval)duration
5757
animationOptions:(PPCounterAnimationOptions)animationOptions
5858
format:(PPFormatBlock)format
5959
completion:(PPCompletionBlock)completion
@@ -71,7 +71,7 @@ - (void)pp_fromNumber:(CGFloat)numberA
7171
#pragma mark - attributed font
7272
- (void)pp_fromNumber:(CGFloat)numberA
7373
toNumber:(CGFloat)numberB
74-
duration:(CFTimeInterval)duration
74+
duration:(NSTimeInterval)duration
7575
animationOptions:(PPCounterAnimationOptions)animationOptions
7676
attributedFormat:(PPAttributedFormatBlock)attributedFormat
7777
completion:(PPCompletionBlock)completion

‎PPCounter/PPCounter/UIKit/UILabel+PPCounter.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
- (void)pp_fromNumber:(CGFloat)numberA
4747
toNumber:(CGFloat)numberB
48-
duration:(CFTimeInterval)duration
48+
duration:(NSTimeInterval)duration
4949
format:(PPFormatBlock)format;
5050

5151
/**
@@ -60,7 +60,7 @@
6060
*/
6161
- (void)pp_fromNumber:(CGFloat)numberA
6262
toNumber:(CGFloat)numberB
63-
duration:(CFTimeInterval)duration
63+
duration:(NSTimeInterval)duration
6464
format:(PPFormatBlock)format
6565
completion:(PPCompletionBlock)completion;
6666

@@ -78,7 +78,7 @@
7878
*/
7979
- (void)pp_fromNumber:(CGFloat)numberA
8080
toNumber:(CGFloat)numberB
81-
duration:(CFTimeInterval)duration
81+
duration:(NSTimeInterval)duration
8282
animationOptions:(PPCounterAnimationOptions)animationOptions
8383
format:(PPFormatBlock)format
8484
completion:(PPCompletionBlock)completion;
@@ -96,7 +96,7 @@
9696
*/
9797
- (void)pp_fromNumber:(CGFloat)numberA
9898
toNumber:(CGFloat)numberB
99-
duration:(CFTimeInterval)duration
99+
duration:(NSTimeInterval)duration
100100
attributedFormat:(PPAttributedFormatBlock)attributedFormat;
101101

102102
/**
@@ -112,7 +112,7 @@
112112

113113
- (void)pp_fromNumber:(CGFloat)numberA
114114
toNumber:(CGFloat)numberB
115-
duration:(CFTimeInterval)duration
115+
duration:(NSTimeInterval)duration
116116
attributedFormat:(PPAttributedFormatBlock)attributedFormat
117117
completion:(PPCompletionBlock)completion;
118118

@@ -130,7 +130,7 @@
130130
*/
131131
- (void)pp_fromNumber:(CGFloat)numberA
132132
toNumber:(CGFloat)numberB
133-
duration:(CFTimeInterval)duration
133+
duration:(NSTimeInterval)duration
134134
animationOptions:(PPCounterAnimationOptions)animationOptions
135135
attributedFormat:(PPAttributedFormatBlock)attributedFormat
136136
completion:(PPCompletionBlock)completion;

‎PPCounter/PPCounter/UIKit/UILabel+PPCounter.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,31 @@
2929

3030
@implementation UILabel (PPCounter)
3131

32-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration format:(PPFormatBlock)format
32+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration format:(PPFormatBlock)format
3333
{
3434
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut format:format completion:nil];
3535
}
3636

37-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration format:(PPFormatBlock)format completion:(PPCompletionBlock)completion
37+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration format:(PPFormatBlock)format completion:(PPCompletionBlock)completion
3838
{
3939
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut format:format completion:completion];
4040
}
4141

42-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat
42+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat
4343
{
4444

4545
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut attributedFormat:attributedFormat completion:nil];
4646
}
4747

48-
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(CFTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat completion:(PPCompletionBlock)completion
48+
- (void)pp_fromNumber:(CGFloat)numberA toNumber:(CGFloat)numberB duration:(NSTimeInterval)duration attributedFormat:(PPAttributedFormatBlock)attributedFormat completion:(PPCompletionBlock)completion
4949
{
5050
[self pp_fromNumber:numberA toNumber:numberB duration:duration animationOptions:PPCounterAnimationOptionCurveEaseInOut attributedFormat:attributedFormat completion:completion];
5151
}
5252

5353
#pragma mark - normal font
5454
- (void)pp_fromNumber:(CGFloat)numberA
5555
toNumber:(CGFloat)numberB
56-
duration:(CFTimeInterval)duration
56+
duration:(NSTimeInterval)duration
5757
animationOptions:(PPCounterAnimationOptions)animationOptions
5858
format:(PPFormatBlock)format
5959
completion:(PPCompletionBlock)completion
@@ -71,7 +71,7 @@ - (void)pp_fromNumber:(CGFloat)numberA
7171
#pragma mark - attributed font
7272
- (void)pp_fromNumber:(CGFloat)numberA
7373
toNumber:(CGFloat)numberB
74-
duration:(CFTimeInterval)duration
74+
duration:(NSTimeInterval)duration
7575
animationOptions:(PPCounterAnimationOptions)animationOptions
7676
attributedFormat:(PPAttributedFormatBlock)attributedFormat
7777
completion:(PPCompletionBlock)completion

0 commit comments

Comments
 (0)