PR Boris-Em#295 fixes

Spacing consistency with rest of project
topline fix
Move UIButton+switch and UITextField+Numbers from Master to separate files
Title of Master "Options"
Add Graph button if collapsed

Author: mackworth

Classes/BEMAverageLine.m

@@ -22,7 +22,7 @@ - (instancetype)init {
     return self;
 }
 
-- (instancetype) initWithCoder:(NSCoder *)coder {
+- (instancetype)initWithCoder:(NSCoder *)coder {
 
 #define RestoreProperty(property, type) {\
 if ([coder containsValueForKey:@#property]) { \
@@ -46,7 +46,7 @@ - (instancetype) initWithCoder:(NSCoder *)coder {
     return self;
 }
 
-- (void) encodeWithCoder: (NSCoder *)coder {
+- (void)encodeWithCoder:(NSCoder *)coder {
 
 #define EncodeProperty(property, type) [coder encode ## type: self.property forKey:@#property]
     EncodeProperty (enableAverageLine, Bool);
@@ -60,14 +60,14 @@ - (void) encodeWithCoder: (NSCoder *)coder {
 
 
 
--(void) setLabel:(UILabel *)label {
+- (void)setLabel:(UILabel *)label {
     if (_label != label) {
         [_label removeFromSuperview];
         _label = label;
     }
 }
 
--(void) dealloc {
+- (void)dealloc {
     self.label= nil;
 }
 @end

Classes/BEMLine.m

@@ -48,30 +48,29 @@ - (void)drawRect:(CGRect)rect {
     referenceFramePath.lineCapStyle = kCGLineCapButt;
     referenceFramePath.lineWidth = 0.7f;
 
-    if (self.enableReferenceFrame == YES) {
-        if (self.enableBottomReferenceFrameLine) {
-            // Bottom Line
-            [referenceFramePath moveToPoint:CGPointMake(0, self.frame.size.height-self.referenceLineWidth/4)];
-            [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width, self.frame.size.height-self.referenceLineWidth/4)];
-        }
+    CGFloat offset = self.referenceLineWidth/4; //moves framing ref line slightly into view
+    if (self.enableBottomReferenceFrameLine) {
+        // Bottom Line
+        [referenceFramePath moveToPoint:   CGPointMake(0,                              self.frame.size.height-offset)];
+        [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width,          self.frame.size.height-offset)];
+    }
 
-        if (self.enableLeftReferenceFrameLine) {
-            // Left Line
-            [referenceFramePath moveToPoint:CGPointMake(0+self.referenceLineWidth/4, self.frame.size.height)];
-            [referenceFramePath addLineToPoint:CGPointMake(0+self.referenceLineWidth/4, 0)];
-        }
+    if (self.enableLeftReferenceFrameLine) {
+        // Left Line
+        [referenceFramePath moveToPoint:   CGPointMake(0+offset,                       self.frame.size.height)];
+        [referenceFramePath addLineToPoint:CGPointMake(0+offset,                       0)];
+    }
 
-        if (self.enableTopReferenceFrameLine) {
-            // Top Line
-            [referenceFramePath moveToPoint:CGPointMake(0+self.referenceLineWidth/4, self.referenceLineWidth/4)];
-            [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width, self.referenceLineWidth/4)];
-        }
+    if (self.enableTopReferenceFrameLine) {
+        // Top Line
+        [referenceFramePath moveToPoint:   CGPointMake(0,                              offset)];
+        [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width,          offset)];
+    }
 
-        if (self.enableRightReferenceFrameLine) {
-            // Right Line
-            [referenceFramePath moveToPoint:CGPointMake(self.frame.size.width - self.referenceLineWidth/4, self.frame.size.height)];
-            [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width - self.referenceLineWidth/4, 0)];
-        }
+    if (self.enableRightReferenceFrameLine) {
+        // Right Line
+        [referenceFramePath moveToPoint:   CGPointMake(self.frame.size.width - offset, self.frame.size.height)];
+        [referenceFramePath addLineToPoint:CGPointMake(self.frame.size.width - offset, 0)];
     }
 
     if (self.enableReferenceLines == YES) {
@@ -309,7 +308,7 @@ - (void)drawRect:(CGRect)rect {
     }
 }
 
-- (NSArray <NSValue *> *) areaArrayFromArray: (NSArray <NSValue *> *) array withEdgeAt:(CGFloat) edgeHeight  {
+- (NSArray <NSValue *> *)areaArrayFromArray:(NSArray <NSValue *> *)array withEdgeAt:(CGFloat)edgeHeight  {
     CGFloat halfHeight = self.frame.size.height/2;
     CGPoint midLeftPoint = CGPointMake(0, halfHeight);
     CGPoint midRightPoint = CGPointMake(self.frame.size.width,halfHeight);
@@ -328,11 +327,11 @@ - (void)drawRect:(CGRect)rect {
     return areaPoints;
 }
 
-- (NSArray <NSValue *> *)topPointsFromArray: (NSArray <NSValue *> *) array {
+- (NSArray <NSValue *> *)topPointsFromArray:(NSArray <NSValue *> *)array {
     return [self areaArrayFromArray: array withEdgeAt:0];
 }
 
-- (NSArray <NSValue *> *)bottomPointsFromArray: (NSArray <NSValue *> *) array  {
+- (NSArray <NSValue *> *)bottomPointsFromArray:(NSArray <NSValue *> *)array  {
     return [self areaArrayFromArray: array withEdgeAt:self.frame.size.height];
 }
 

Classes/BEMSimpleLineGraphView.h

@@ -72,7 +72,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
 /** Allows a higher-resolution snapshot of the graph while the app is in the foreground.
  @param size in pixels for your image.
  @return The snapshot of the graph as a UIImage object. */
-- (UIImage *)graphSnapshotImage: (CGSize) size NS_AVAILABLE_IOS(7_0);
+- (UIImage *)graphSnapshotImage:(CGSize)size NS_AVAILABLE_IOS(7_0);
 
 
 /** Takes a snapshot of the graph.
@@ -639,7 +639,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
  @param displayMinXValue The smallest datapoint that will be included in the chart (either index or value, depending on whether locationForPointAtIndex is implemented).
  @param displayMaxXValue The largest datapoint that will be included in the chart.
  @return YES if pan/zoom is ok; No if pan/zoom is prevented. */
--(BOOL) lineGraph:(BEMSimpleLineGraphView *)graph shouldScaleFrom:(CGFloat)oldScale to:(CGFloat)newScale showingFromXMinValue:(CGFloat)displayMinXValue toXMaxValue:(CGFloat)displayMaxXValue;
+- (BOOL)lineGraph:(BEMSimpleLineGraphView *)graph shouldScaleFrom:(CGFloat)oldScale to:(CGFloat)newScale showingFromXMinValue:(CGFloat)displayMinXValue toXMaxValue:(CGFloat)displayMaxXValue;
 
 //----- Y AXIS -----//
 
@@ -663,17 +663,19 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel
 - (NSString *)yAxisSuffixOnLineGraph:(BEMSimpleLineGraphView *)graph;
 
 
-/** Starting value to begin drawing Y-Axis labels  MUST ALSO IMPLEMENT incrementValueForYAxisOnLineGraph FOR THIS TO TAKE EFFECT
- @discussion This allows you to finally hone the granularity of the data label.  Instead of drawing values like 11.24,
+/** Starting value to begin drawing Y-Axis labels  
+ MUST ALSO IMPLEMENT incrementValueForYAxisOnLineGraph FOR THIS TO TAKE EFFECT
+ @discussion This allows you to finely hone the granularity of the data label.  Instead of drawing values like 11.24,
  you can lock these values to draw 11.20 to make it more user friendly.  When this is set, `numberOfYAxisLabelsOnLineGraph` is ignored.
  @param graph The graph object which is requesting the number of gaps between the labels.
  @return The base value to draw the first Y-Axis label */
 - (CGFloat)baseValueForYAxisOnLineGraph:(BEMSimpleLineGraphView *)graph;
 
 
-/** Increment value to apply to the base Y-Axis label.  MUST ALSO IMPLEMENT baseValueForYAxisOnLineGraph FOR THIS TO TAKE EFFECT
+/** Increment value to apply to the base Y-Axis label.  
+ MUST ALSO IMPLEMENT baseValueForYAxisOnLineGraph FOR THIS TO TAKE EFFECT
  @discussion This value tells the graph the interval to be applied to the base Y-Axis value.  This allows you to increment the Y-Axis via user-friendly values rather than values
- like 37.17.  This let's you enforce that your Y-Axis have values rounded to whatever granularity best fits your data.
+ like 37.17.  This lets you enforce that your Y-Axis have values rounded to whatever granularity best fits your data.
  @param graph The graph object which is requesting the number of gaps between the labels.
  @return The increment value to add to the value returned from `baseValueForYAxisOnLineGraph` for future Y-Axis labels */
 - (CGFloat)incrementValueForYAxisOnLineGraph:(BEMSimpleLineGraphView *)graph;