Getter method and nonnull, nonatomic property

yasuoza · Jan 29, 2016 · c861aea · c861aea
1 parent 330c31f
commit c861aea
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/Source/YOChartImageKit/YOBarChartImage.h b/Source/YOChartImageKit/YOBarChartImage.h
@@ -33,7 +33,7 @@ typedef NS_ENUM(NSInteger, YOBarChartImageBarStyle){
  *  The maximum value to use for the chart. Setting this will override the 
  *  default behavior of using the highest value as maxValue.
  */
-@property NSNumber* maxValue;
+@property (nonnull, nonatomic) NSNumber* maxValue;
 
 /**
  *  The style of the bar chart.

diff --git a/Source/YOChartImageKit/YOBarChartImage.m b/Source/YOChartImageKit/YOBarChartImage.m
@@ -17,6 +17,10 @@ - (instancetype)init
     return self;
 }
 
+- (NSNumber *) maxValue {
+    return _maxValue ? _maxValue : [NSNumber numberWithFloat:[[_values valueForKeyPath:@"@max.floatValue"] floatValue]];
+}
+
 const CGFloat kBarPaddingMultipler = 20.0f;
 
 - (UIImage *)drawImage:(CGRect)frame scale:(CGFloat)scale {

diff --git a/Source/YOChartImageKit/YOLineChartImage.h b/Source/YOChartImageKit/YOLineChartImage.h
@@ -17,7 +17,7 @@
  *  The maximum value to use for the chart. Setting this will override the
  *  default behavior of using the highest value as maxValue.
  */
-@property NSNumber* maxValue;
+@property (nonnull, nonatomic) NSNumber* maxValue;
 
 /**
  *  The width of chart's stroke. 

diff --git a/Source/YOChartImageKit/YOLineChartImage.m b/Source/YOChartImageKit/YOLineChartImage.m
@@ -12,6 +12,10 @@ - (instancetype)init {
     return self;
 }
 
+- (NSNumber *) maxValue {
+    return _maxValue ? _maxValue : [NSNumber numberWithFloat:[[_values valueForKeyPath:@"@max.floatValue"] floatValue]];
+}
+
 - (UIImage *)drawImage:(CGRect)frame scale:(CGFloat)scale {
     NSAssert(_values.count > 0, @"YOLineChartImage // must assign values property which is an array of NSNumber");