Reverted base to iOS 6

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## <a href="https://github.com/Jawbone/JBChartView/tree/v2.6.1">2.6.1</a>
+#### 07/25/14
+- Fixes issue <a href="https://github.com/Jawbone/JBChartView/pull/74">#74</a>.
+
 ## <a href="https://github.com/Jawbone/JBChartView/tree/v2.6.0">2.6.0</a>
 #### 07/24/14
 - Fixes issue <a href="https://github.com/Jawbone/JBChartView/pull/71">#71</a>.

JBChartView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "JBChartView"
-  s.version      = "2.6.0"
+  s.version      = "2.6.1"
   s.summary      = "Jawbone's iOS-based charting library for both line and bar graphs."
   s.homepage     = "https://github.com/Jawbone/JBChartView"
 
@@ -10,10 +10,10 @@ Pod::Spec.new do |s|
   s.author       = { "Terry Worona" => "tworona@jawbone.com" }
   s.source       = { 
 	:git => "https://github.com/Jawbone/JBChartView.git",
-	:tag => "v2.6.0"
+	:tag => "v2.6.1"
   }
 
-  s.platform     = :ios, '7.0'
+  s.platform     = :ios, '6.0'
   s.source_files = 'Classes/**/*.{h,m}'
   s.requires_arc = true
 end

JBChartViewDemo/JBChartViewDemo.xcodeproj/project.pbxproj

@@ -498,7 +498,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "JBChartViewDemo/JBChartViewDemo-Prefix.pch";
 				INFOPLIST_FILE = "JBChartViewDemo/JBChartViewDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -512,7 +512,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "JBChartViewDemo/JBChartViewDemo-Prefix.pch";
 				INFOPLIST_FILE = "JBChartViewDemo/JBChartViewDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

JBChartViewDemo/JBChartViewDemo/Controllers/Base/JBBaseNavigationController.m

@@ -8,6 +8,10 @@
 
 #import "JBBaseNavigationController.h"
 
+// Numerics
+NSInteger const kJBBaseNavigationControllerBarTintColorMinSystemVersion = 7;
+NSInteger const kJBBaseNavigationControllerTintColorMinSystemVersion = 7;
+
 @implementation JBBaseNavigationController
 
 #pragma mark - Alloc/Init
@@ -18,9 +22,23 @@
     if (self)
     {
         self.navigationBar.translucent = NO;
-        [[UINavigationBar appearance] setBarTintColor:kJBColorNavigationTint];
-        [[UINavigationBar appearance] setTintColor:kJBColorNavigationBarTint];
-        self.interactivePopGestureRecognizer.enabled = NO;
+        
+        // Bar tint (iOS 7)
+        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= kJBBaseNavigationControllerBarTintColorMinSystemVersion)
+        {
+            [[UINavigationBar appearance] setBarTintColor:kJBColorNavigationTint];
+        }
+
+        // Tint (iOS 7)
+        if ([[[UIDevice currentDevice] systemVersion] floatValue] >= kJBBaseNavigationControllerTintColorMinSystemVersion)
+        {
+            [[UINavigationBar appearance] setTintColor:kJBColorNavigationBarTint];
+        }
+        
+        if ([self respondsToSelector:@selector(interactivePopGestureRecognizer)])
+        {
+            self.interactivePopGestureRecognizer.enabled = NO;
+        }
     }
     return self;
 }

JBChartViewDemo/JBChartViewDemo/Controllers/Base/JBBaseViewController.m

@@ -19,7 +19,9 @@
 - (void)loadView
 {
     [super loadView];
-    self.edgesForExtendedLayout = UIRectEdgeTop;
+    if ([self respondsToSelector:@selector(setEdgesForExtendedLayout:)]) {
+        self.edgesForExtendedLayout = UIRectEdgeTop;
+    }
     self.view.backgroundColor = [UIColor whiteColor];
     self.navigationItem.titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:kJBImageIconJawboneLogo]];
 }

JBChartViewDemo/JBChartViewDemo/Misc/JBChartInformationView.m

@@ -261,8 +261,25 @@ static UIColor *kJBChartInformationViewShadowColor = nil;
 
 - (void)layoutSubviews
 {
-    CGSize valueLabelSize = [self.valueLabel.text sizeWithAttributes:@{NSFontAttributeName:self.valueLabel.font}];
-    CGSize unitLabelSize = [self.unitLabel.text sizeWithAttributes:@{NSFontAttributeName:self.unitLabel.font}];
+    CGSize valueLabelSize = CGSizeZero;
+    if ([self.valueLabel.text respondsToSelector:@selector(sizeWithAttributes:)])
+    {
+        valueLabelSize = [self.valueLabel.text sizeWithAttributes:@{NSFontAttributeName:self.valueLabel.font}];
+    }
+    else
+    {
+        valueLabelSize = [self.valueLabel.text sizeWithFont:self.valueLabel.font];
+    }
+
+    CGSize unitLabelSize = CGSizeZero;
+    if ([self.unitLabel.text respondsToSelector:@selector(sizeWithAttributes:)])
+    {
+        unitLabelSize = [self.unitLabel.text sizeWithAttributes:@{NSFontAttributeName:self.unitLabel.font}];
+    }
+    else
+    {
+        unitLabelSize = [self.unitLabel.text sizeWithFont:self.unitLabel.font];
+    }
     
     CGFloat xOffset = ceil((self.bounds.size.width - (valueLabelSize.width + unitLabelSize.width)) * 0.5);
 

README.md

@@ -18,7 +18,7 @@ Refer to the <a href="https://github.com/Jawbone/JBChartView/blob/master/CHANGEL
 
 ## Requirements
 
-- Requires iOS 7 or later
+- Requires iOS 6 or later
 - Requires Automatic Reference Counting (ARC)
 
 ## Demo Project
@@ -42,8 +42,8 @@ Simply add the following line to your <code>Podfile</code>:
 	
 Your Podfile should look something like:
 
-	platform :ios, '7.0'
-	pod 'JBChartView', '~> 2.6.0'
+	platform :ios, '6.0'
+	pod 'JBChartView', '~> 2.6.1'
 	
 ### The Old School Way