Skip to content

Commit 0bf9f7a

Browse files
committed
Merge pull request Grouper#22 from dataxpress/master
iOS 5 Support
2 parents 0d2f014 + e118b40 commit 0bf9f7a

File tree

3 files changed

+33
-22
lines changed

3 files changed

+33
-22
lines changed

Classes/ios/UINavigationBar+FlatUI.m

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ - (void) configureFlatNavigationBarWithColor:(UIColor *)color {
2121
[titleTextAttributes setValue:[UIColor clearColor] forKey:UITextAttributeTextShadowColor];
2222
[titleTextAttributes setValue:[NSValue valueWithUIOffset:UIOffsetMake(0, 0)] forKey:UITextAttributeTextShadowOffset];
2323
[self setTitleTextAttributes:titleTextAttributes];
24-
[self setShadowImage:[UIImage imageWithColor:[UIColor clearColor] cornerRadius:0]];
24+
if([self respondsToSelector:@selector(setShadowImage:)])
25+
{
26+
[self setShadowImage:[UIImage imageWithColor:[UIColor clearColor] cornerRadius:0]];
27+
}
2528
}
2629

2730
@end

Classes/ios/UIStepper+FlatUI.m

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,34 @@ - (void) configureFlatStepperWithColor:(UIColor *)color
1717
disabledColor:(UIColor *)disabledColor
1818
iconColor:(UIColor *)iconColor {
1919

20-
UIImage *normalImage = [UIImage imageWithColor:color cornerRadius:2.0];
21-
UIImage *highlightedImage = [UIImage imageWithColor:highlightedColor cornerRadius:2.0];
22-
UIImage *disabledImage = [UIImage imageWithColor:disabledColor cornerRadius:2.0];
23-
[self setBackgroundImage:normalImage forState:UIControlStateNormal];
24-
[self setBackgroundImage:highlightedImage forState:UIControlStateHighlighted];
25-
[self setBackgroundImage:disabledImage forState:UIControlStateDisabled];
26-
[self setDividerImage:[UIImage imageWithColor:highlightedColor cornerRadius:0]
27-
forLeftSegmentState:UIControlStateNormal
28-
rightSegmentState:UIControlStateNormal];
29-
[self setDividerImage:[UIImage imageWithColor:highlightedColor cornerRadius:0]
30-
forLeftSegmentState:UIControlStateHighlighted
31-
rightSegmentState:UIControlStateNormal];
32-
[self setDividerImage:[UIImage imageWithColor:highlightedColor cornerRadius:0]
33-
forLeftSegmentState:UIControlStateNormal
34-
rightSegmentState:UIControlStateHighlighted];
20+
// iOS 6 compat check
21+
if([self respondsToSelector:@selector(setBackgroundImage:forState:)])
22+
{
3523

36-
UIImage *plusImage = [UIImage stepperPlusImageWithColor:iconColor];
37-
UIImage *minusImage = [UIImage stepperMinusImageWithColor:iconColor];
38-
[self setIncrementImage:plusImage forState:UIControlStateNormal];
39-
[self setIncrementImage:plusImage forState:UIControlStateDisabled];
40-
[self setDecrementImage:minusImage forState:UIControlStateNormal];
41-
[self setDecrementImage:minusImage forState:UIControlStateDisabled];
24+
UIImage *normalImage = [UIImage imageWithColor:color cornerRadius:2.0];
25+
UIImage *highlightedImage = [UIImage imageWithColor:highlightedColor cornerRadius:2.0];
26+
UIImage *disabledImage = [UIImage imageWithColor:disabledColor cornerRadius:2.0];
27+
[self setBackgroundImage:normalImage forState:UIControlStateNormal];
28+
[self setBackgroundImage:highlightedImage forState:UIControlStateHighlighted];
29+
[self setBackgroundImage:disabledImage forState:UIControlStateDisabled];
30+
[self setDividerImage:[UIImage imageWithColor:highlightedColor cornerRadius:0]
31+
forLeftSegmentState:UIControlStateNormal
32+
rightSegmentState:UIControlStateNormal];
33+
[self setDividerImage:[UIImage imageWithColor:highlightedColor cornerRadius:0]
34+
forLeftSegmentState:UIControlStateHighlighted
35+
rightSegmentState:UIControlStateNormal];
36+
[self setDividerImage:[UIImage imageWithColor:highlightedColor cornerRadius:0]
37+
forLeftSegmentState:UIControlStateNormal
38+
rightSegmentState:UIControlStateHighlighted];
39+
40+
UIImage *plusImage = [UIImage stepperPlusImageWithColor:iconColor];
41+
UIImage *minusImage = [UIImage stepperMinusImageWithColor:iconColor];
42+
[self setIncrementImage:plusImage forState:UIControlStateNormal];
43+
[self setIncrementImage:plusImage forState:UIControlStateDisabled];
44+
[self setDecrementImage:minusImage forState:UIControlStateNormal];
45+
[self setDecrementImage:minusImage forState:UIControlStateDisabled];
46+
47+
}
4248

4349
}
4450

Example/FlatUIKitExample.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@
418418
GCC_PRECOMPILE_PREFIX_HEADER = YES;
419419
GCC_PREFIX_HEADER = "FlatUIKitExample/FlatUIKitExample-Prefix.pch";
420420
INFOPLIST_FILE = "FlatUIKitExample/FlatUIKitExample-Info.plist";
421+
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
421422
PRODUCT_NAME = "$(TARGET_NAME)";
422423
WRAPPER_EXTENSION = app;
423424
};
@@ -429,6 +430,7 @@
429430
GCC_PRECOMPILE_PREFIX_HEADER = YES;
430431
GCC_PREFIX_HEADER = "FlatUIKitExample/FlatUIKitExample-Prefix.pch";
431432
INFOPLIST_FILE = "FlatUIKitExample/FlatUIKitExample-Info.plist";
433+
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
432434
PRODUCT_NAME = "$(TARGET_NAME)";
433435
WRAPPER_EXTENSION = app;
434436
};

0 commit comments

Comments
 (0)