Skip to content

Commit 9ae019a

Browse files
Merge commit '89f58d307311635b22e287fdac7014d7f2fa5a6c' into CarthageSupport
# Conflicts: # Classes/BEMCheckBox.h
2 parents adf72fc + 89f58d3 commit 9ae019a

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
language: objective-c
2-
osx_image: xcode6.4
3-
# xcode_project: Sample Project/CheckBox.xcodeproj
4-
# xcode_scheme: CheckBoxTests
5-
# xcode_sdk: iphonesimulator
2+
osx_image: xcode7.3
3+
64
script:
7-
- xcodebuild clean build test -project "Sample Project/CheckBox.xcodeproj" -scheme CheckBox -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
5+
- xcodebuild clean build test -project "Sample Project/CheckBox.xcodeproj" -scheme CheckBox -sdk iphonesimulator9.3 -destination "OS=9.3,name=iPhone 5S" ONLY_ACTIVE_ARCH=NO

Classes/BEMAnimationManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright (c) 2015 Boris Emorine. All rights reserved.
77
//
88

9-
@import UIKit;
9+
#import <UIKit/UIKit.h>
1010

1111
/** Animation object used by BEMCheckBox to generate animations.
1212
*/

Classes/BEMCheckBox.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
// Copyright (c) 2015 Boris Emorine. All rights reserved.
77
//
88

9-
@import UIKit;
9+
#import <UIKit/UIKit.h>
10+
1011
@protocol BEMCheckBoxDelegate;
1112

1213
/** The different type of boxes available.
@@ -30,7 +31,11 @@ NS_ASSUME_NONNULL_BEGIN
3031

3132
/** Tasteful Checkbox for iOS.
3233
*/
34+
#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_9_3
35+
IB_DESIGNABLE @interface BEMCheckBox : UIView <CAAnimationDelegate>
36+
#else
3337
IB_DESIGNABLE @interface BEMCheckBox : UIView
38+
#endif
3439

3540
/** The different type of animations available.
3641
* @see onAnimationType and offAnimationType.

Classes/BEMCheckBox.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ - (void)addOnAnimation {
320320
return;
321321

322322
case BEMAnimationTypeOneStroke: {
323-
// Temporary set the path of the checkmarl to the long checkmarl
323+
// Temporary set the path of the checkmark to the long checkmark
324324
self.checkMarkLayer.path = [[self.pathManager pathForLongCheckMark] bezierPathByReversingPath].CGPath;
325325

326326
CABasicAnimation *boxStrokeAnimation = [self.animationManager strokeAnimationReverse:NO];

Classes/BEMPathManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright (c) 2015 Boris Emorine. All rights reserved.
77
//
88

9-
@import UIKit;
9+
#import <UIKit/UIKit.h>
1010
#import "BEMCheckBox.h"
1111

1212
/** Path object used by BEMCheckBox to generate paths.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Example usage:
132132
**BEMCheckBox** uses a delegate to receive check box events. The delegate object must conform to the `BEMCheckBoxDelegate` protocol, which is composed of two optional methods:
133133

134134
- `didTapCheckBox:`
135-
Sent to the delegate every time the check box gets tapped, after its properties are updated (on), but before the animations are completed.
135+
Sent to the delegate every time the check box gets tapped, after its properties are updated (`on`), but before the animations are completed.
136136

137137
- `animationDidStopForCheckBox:`
138138
Sent to the delegate every time the check box finishes being animated.

0 commit comments

Comments
 (0)