From 51f0d734e8e1e4d29d032ac6fd697fcaeb483c5c Mon Sep 17 00:00:00 2001 From: Xm4s Date: Tue, 25 Oct 2011 00:06:41 +0200 Subject: [PATCH] Added macro to check if iOS version is >= 5.0 at both compile and running time + fix spinner setColor on older iOS versions (spinners color set to gray). Closes #182 --- Classes/RootViewController.m | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Classes/RootViewController.m b/Classes/RootViewController.m index 02c24836..94e1cfdf 100755 --- a/Classes/RootViewController.m +++ b/Classes/RootViewController.m @@ -57,6 +57,19 @@ #define INDEX_FILE_NAME @"index.html" +// IOS VERSION >= 5.0 MACRO +#ifndef kCFCoreFoundationVersionNumber_iPhoneOS_5_0 + #define kCFCoreFoundationVersionNumber_iPhoneOS_5_0 675.00 +#endif +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_5_0 + #define IF_IOS5_OR_GREATER(...) \ + if (kCFCoreFoundationVersionNumber >= kCFCoreFoundationVersionNumber_iPhoneOS_5_0) { \ + __VA_ARGS__ \ + } +#else + #define IF_IOS5_OR_GREATER(...) +#endif + @implementation RootViewController #pragma mark - SYNTHESIS @@ -241,10 +254,12 @@ - (void)initPageDetails { [backgroundView release]; // ****** Spinners - UIActivityIndicatorView *spinner = [[UIActivityIndicatorView alloc] init]; + UIActivityIndicatorView *spinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; spinner.backgroundColor = [UIColor clearColor]; - spinner.color = foregroundColor; - spinner.alpha = [(NSNumber*) foregroundAlpha floatValue]; + IF_IOS5_OR_GREATER( + spinner.color = foregroundColor; + spinner.alpha = [(NSNumber*) foregroundAlpha floatValue]; + ); CGRect frame = spinner.frame; frame.origin.x = pageWidth * i + (pageWidth - frame.size.width) / 2;