Jawbone · simonnickel · Jan 4, 2018 · Jan 4, 2018 · Jan 4, 2018
diff --git a/Classes/Bar/JBBarChartView.m b/Classes/Bar/JBBarChartView.m
@@ -534,7 +534,7 @@ - (CGFloat)barWidth
 
 #pragma mark - Setters
 
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)(void))callback
 {
 	if (self.reloading)
 	{
@@ -664,7 +664,7 @@ - (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)for
 	}
 }
 
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)(void))callback
 {
 	[self setState:state animated:animated force:NO callback:callback];
 }

diff --git a/Classes/Base/JBChartView.h b/Classes/Base/JBChartView.h
@@ -132,7 +132,7 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
  *  @param force        If current state == new state, then setting force to YES will re-configure the chart (default NO).
  *  @param callback     Called once the animation is completed. If animated == NO, then callback is immediate.
  */
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback;
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)(void))callback;
 
 /**
  *  State setter.
@@ -141,7 +141,7 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
  *  @param animated     Whether or not the state should be animated or not.
  *  @param callback     Called once the animation is completed. If animated == NO, then callback is immediate.
  */
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback;
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)(void))callback;
 
 /**
  *  State setter.

diff --git a/Classes/Base/JBChartView.m b/Classes/Base/JBChartView.m
@@ -111,7 +111,7 @@ - (void)setFooterView:(UIView *)footerView
 	[self reloadData];
 }
 
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)(void))callback
 {
 	if ((_state == state) && !force)
 	{
@@ -123,7 +123,7 @@ - (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)for
 	// Override
 }
 
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)(void))callback
 {
 	[self setState:state animated:animated force:NO callback:callback];
 }

diff --git a/Classes/Line/JBLineChartView.m b/Classes/Line/JBLineChartView.m
@@ -748,7 +748,7 @@ - (CGFloat)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView dimmedSele
 
 #pragma mark - Setters
 
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)())callback
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)force callback:(void (^)(void))callback
 {
 	if (self.reloading)
 	{
@@ -814,7 +814,7 @@ - (void)setState:(JBChartViewState)state animated:(BOOL)animated force:(BOOL)for
 	}
 }
 
-- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)())callback
+- (void)setState:(JBChartViewState)state animated:(BOOL)animated callback:(void (^)(void))callback
 {
 	[self setState:state animated:animated force:NO callback:callback];
 }

diff --git a/Classes/Line/Views/JBLineChartDotsView.h b/Classes/Line/Views/JBLineChartDotsView.h
@@ -21,7 +21,7 @@ extern NSInteger const kJBLineChartDotsViewUnselectedLineIndex;
 @property (nonatomic, strong) NSDictionary *dotViewsDict;
 
 // Data
-- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback;
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)(void))callback;
 - (void)reloadDataAnimated:(BOOL)animated;
 - (void)reloadData;
 

diff --git a/Classes/Line/Views/JBLineChartDotsView.m b/Classes/Line/Views/JBLineChartDotsView.m
@@ -39,7 +39,7 @@ - (id)initWithFrame:(CGRect)frame
 
 #pragma mark - Data
 
-- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)(void))callback
 {
 	NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesForLineChartDotsView:)], @"JBLineChartDotsView // dataSource must implement - (NSArray *)lineChartLinesForLineChartDotsView:(JBLineChartDotsView *)lineChartDotsView");
 	NSArray *lineChartLines = [self.dataSource lineChartLinesForLineChartDotsView:self];

diff --git a/Classes/Line/Views/JBLineChartLinesView.h b/Classes/Line/Views/JBLineChartLinesView.h
@@ -20,15 +20,15 @@ extern NSInteger const kJBLineChartLinesViewUnselectedLineIndex;
 @property (nonatomic, assign) NSInteger selectedLineIndex; // -1 to unselect
 
 // Data
-- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback;
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)(void))callback;
 - (void)reloadDataAnimated:(BOOL)animated;
 - (void)reloadData;
 
 // Setters
 - (void)setSelectedLineIndex:(NSInteger)selectedLineIndex animated:(BOOL)animated;
 
 // Callback helpers
-- (void)fireCallback:(void (^)())callback;
+- (void)fireCallback:(void (^)(void))callback;
 
 @end
 

diff --git a/Classes/Line/Views/JBLineChartLinesView.m b/Classes/Line/Views/JBLineChartLinesView.m
@@ -195,7 +195,7 @@ - (void)drawRect:(CGRect)rect
 
 #pragma mark - Data
 
-- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)())callback
+- (void)reloadDataAnimated:(BOOL)animated callback:(void (^)(void))callback
 {
 	NSAssert([self.dataSource respondsToSelector:@selector(lineChartLinesForLineChartLinesView:)], @"JBLineChartLinesView // dataSource must implement - (NSArray *)lineChartLinesForLineChartLinesView:(JBLineChartLinesView *)lineChartLinesView");
 	NSArray *chartData = [self.dataSource lineChartLinesForLineChartLinesView:self];
@@ -584,7 +584,7 @@ - (CABasicAnimation *)basicPathAnimationFromBezierPath:(UIBezierPath *)fromBezie
 
 #pragma mark - Callback Helpers
 
-- (void)fireCallback:(void (^)())callback
+- (void)fireCallback:(void (^)(void))callback
 {
 	dispatch_block_t callbackCopy = [callback copy];
 

diff --git a/JBChartViewDemo/JBChartViewDemo.xcodeproj/project.pbxproj b/JBChartViewDemo/JBChartViewDemo.xcodeproj/project.pbxproj
@@ -476,7 +476,7 @@
 		9B2E52F918218CF20079B9D2 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0710;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = Jawbone;
 			};
 			buildConfigurationList = 9B2E52FC18218CF20079B9D2 /* Build configuration list for PBXProject "JBChartViewDemo" */;
@@ -580,19 +580,30 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -605,7 +616,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -620,25 +631,36 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -653,7 +675,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "JBChartViewDemo/JBChartViewDemo-Prefix.pch";
 				INFOPLIST_FILE = "JBChartViewDemo/JBChartViewDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.jawbone.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -668,7 +690,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "JBChartViewDemo/JBChartViewDemo-Prefix.pch";
 				INFOPLIST_FILE = "JBChartViewDemo/JBChartViewDemo-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.jawbone.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;

diff --git a/JBChartViewDemo/JBChartViewDemo/Misc/JBChartInformationView.m b/JBChartViewDemo/JBChartViewDemo/Misc/JBChartInformationView.m
@@ -262,25 +262,11 @@ - (id)initWithFrame:(CGRect)frame
 - (void)layoutSubviews
 {
     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];
-    }
+    valueLabelSize = [self.valueLabel.text sizeWithAttributes:@{NSFontAttributeName: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];
-    }
-
+    unitLabelSize = [self.unitLabel.text sizeWithAttributes:@{NSFontAttributeName:self.unitLabel.font}];
+
     CGFloat xOffset = ceil((self.bounds.size.width - (valueLabelSize.width + unitLabelSize.width)) * 0.5);
 
     self.valueLabel.frame = CGRectMake(xOffset, ceil(self.bounds.size.height * 0.5) - ceil(valueLabelSize.height * 0.5), valueLabelSize.width, valueLabelSize.height);