messing around with loading states

Classes/Base/JBChartView.h

@@ -69,6 +69,15 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
 @property (nonatomic, weak) id<JBChartViewDataSource> dataSource;
 @property (nonatomic, weak) id<JBChartViewDelegate> delegate;
 
+/*
+ * Since loading is such a common UIView requirement, 
+ * setting to YES will snapshot the chart, blur it, and display a loading indicator.
+ */
+@property (nonatomic, assign) BOOL loading;
+
+- (void)setLoading:(BOOL)loading animated:(BOOL)animated callback:(void (^)())callback;
+- (void)setLoading:(BOOL)loading animated:(BOOL)animated;
+
 /**
  *  Header and footer views are shown above and below the chart respectively.
  *  Each view will be stretched horizontally to fill width of chart.

Classes/Base/JBChartView.m

@@ -16,6 +16,8 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
 
 @interface JBChartView ()
 
+@property (nonatomic, strong) UIImageView *loadingImageView;
+
 @property (nonatomic, assign) BOOL hasMaximumValue;
 @property (nonatomic, assign) BOOL hasMinimumValue;
 
@@ -77,8 +79,111 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
 	NSAssert((self.headerView.bounds.size.height + self.footerView.bounds.size.height) <= self.bounds.size.height, @"JBChartView // the combined height of the footer and header can not be greater than the total height of the chart.");
 }
 
+#pragma mark - Getters
+
++ (UIImage *)imageWithView:(UIView *)view
+{
+    UIGraphicsBeginImageContextWithOptions(view.bounds.size, view.opaque, 0.0);
+    [view.layer renderInContext:UIGraphicsGetCurrentContext()];
+    UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    return image;
+}
+
 #pragma mark - Setters
 
+- (void)setLoading:(BOOL)loading animated:(BOOL)animated callback:(void (^)())callback
+{
+    if (_loading == loading)
+    {
+        return;
+    }
+    
+    _loading = loading;
+    
+    if (loading) // show
+    {
+        UIImage *snapshotImage = [JBChartView imageWithView:self];
+        self.loadingImageView = [[UIImageView alloc] initWithImage:snapshotImage];
+        self.loadingImageView.frame = self.bounds;
+        
+        UIBlurEffect *blur = [UIBlurEffect effectWithStyle:UIBlurEffectStyleLight];
+        UIVisualEffectView *effectView = [[UIVisualEffectView alloc] initWithEffect:blur];
+        effectView.frame = self.loadingImageView.frame;
+        [self.loadingImageView addSubview:effectView];
+        
+        UIActivityIndicatorView *activityIndicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+        [activityIndicatorView startAnimating];
+        activityIndicatorView.frame = CGRectMake(ceil(self.loadingImageView.frame.size.width * 0.5) - ceil(activityIndicatorView.frame.size.width * 0.5), ceil(self.loadingImageView.frame.size.height * 0.5) - ceil(activityIndicatorView.frame.size.height * 0.5), activityIndicatorView.frame.size.width, activityIndicatorView.frame.size.height);
+        [self.loadingImageView addSubview:activityIndicatorView];
+        
+        if (animated)
+        {
+            self.loadingImageView.alpha = 0.0;
+            [self addSubview:self.loadingImageView];
+            [UIView animateWithDuration:0.25 animations:^{
+                self.loadingImageView.alpha = 1.0;
+            } completion:^(BOOL finished) {
+                if (callback)
+                {
+                    callback();
+                }
+            }];
+        }
+        else
+        {
+            [self addSubview:self.loadingImageView];
+            if (callback)
+            {
+                callback();
+            }
+        }
+    }
+    else // hide
+    {
+        if (self.loadingImageView != nil)
+        {
+            if (animated)
+            {
+                [UIView animateWithDuration:0.25 animations:^{
+                    self.loadingImageView.alpha = 0.0;
+                } completion:^(BOOL finished) {
+                    [self.loadingImageView removeFromSuperview];
+                    if (callback)
+                    {
+                        callback();
+                    }
+                }];
+            }
+            else
+            {
+                [self.loadingImageView removeFromSuperview];
+                if (callback)
+                {
+                    callback();
+                }
+            }
+        }
+        else
+        {
+            if (callback)
+            {
+                callback();
+            }
+        }
+    }
+}
+
+- (void)setLoading:(BOOL)loading animated:(BOOL)animated
+{
+    [self setLoading:loading animated:animated callback:nil];
+}
+
+- (void)setLoading:(BOOL)loading
+{
+    [self setLoading:loading animated:NO];
+}
+
 - (void)setHeaderView:(UIView *)headerView
 {
 	if (_headerView)

Classes/Line/Views/JBLineChartDotsView.m

@@ -112,13 +112,12 @@ NSInteger const kJBLineChartDotsViewUnselectedLineIndex = -1;
 					JBLineChartPoint *lineChartPoint = [sortedLineChartPoints objectAtIndex:horizontalIndex];
 					if(lineChartPoint.hidden)
 					{
-                        [mutableDotViews addObject:[NSNull null]];
-                        continue;
+						continue;
 					}
 					
 					UIView *dotView = [self dotViewForHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
 					dotView.center = CGPointMake(lineChartPoint.position.x, lineChartPoint.position.y);
-                    [mutableDotViews addObject:dotView];
+					[mutableDotViews addObject:dotView];
 					[self addSubview:dotView];
 				}
 				[mutableDotViewsDict setObject:[NSArray arrayWithArray:mutableDotViews] forKey:[NSNumber numberWithInteger:lineIndex]];
@@ -159,42 +158,39 @@ NSInteger const kJBLineChartDotsViewUnselectedLineIndex = -1;
 				if ([key isKindOfClass:[NSNumber class]])
 				{
 					NSInteger lineIndex = [((NSNumber *)key) intValue];
-                    
-                    if (![dotView isKindOfClass:[NSNull class]])
-                    {
-                        // Internal dot
-                        if ([dotView isKindOfClass:[JBLineChartDotView class]])
-                        {
-                            if (weakSelf.selectedLineIndex == lineIndex)
-                            {
-                                NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:selectedColorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView selectedColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
-                                dotView.backgroundColor = [self.dataSource lineChartDotsView:self selectedColorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
-                            }
-                            else
-                            {
-                                NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:colorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
-                                dotView.backgroundColor = [self.dataSource lineChartDotsView:self colorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
-                                
-                                NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:dimmedSelectionDotOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartDotsView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionDotOpacityAtLineIndex:(NSUInteger)lineIndex");
-                                dotView.alpha = (weakSelf.selectedLineIndex == kJBLineChartDotsViewUnselectedLineIndex) ? 1.0f : [self.dataSource lineChartDotsView:self dimmedSelectionDotOpacityAtLineIndex:lineIndex];
-                            }
-                        }
-                        // Custom dot
-                        else
-                        {
-                            NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:shouldHideDotViewOnSelectionAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView shouldHideDotViewOnSelectionAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
-                            BOOL hideDotView = [self.dataSource lineChartDotsView:self shouldHideDotViewOnSelectionAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
-                            if (weakSelf.selectedLineIndex == lineIndex)
-                            {
-                                NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:dimmedSelectionDotOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartDotsView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionDotOpacityAtLineIndex:(NSUInteger)lineIndex");
-                                dotView.alpha = hideDotView ? [self.dataSource lineChartDotsView:self dimmedSelectionDotOpacityAtLineIndex:lineIndex] : 1.0f;
-                            }
-                            else
-                            {
-                                dotView.alpha = 1.0;
-                            }
-                        }   
-                    }
+					
+					// Internal dot
+					if ([dotView isKindOfClass:[JBLineChartDotView class]])
+					{
+						if (weakSelf.selectedLineIndex == lineIndex)
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:selectedColorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView selectedColorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+							dotView.backgroundColor = [self.dataSource lineChartDotsView:self selectedColorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+						}
+						else
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:colorForDotAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (UIColor *)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView colorForDotAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+							dotView.backgroundColor = [self.dataSource lineChartDotsView:self colorForDotAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:dimmedSelectionDotOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartDotsView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionDotOpacityAtLineIndex:(NSUInteger)lineIndex");
+							dotView.alpha = (weakSelf.selectedLineIndex == kJBLineChartDotsViewUnselectedLineIndex) ? 1.0f : [self.dataSource lineChartDotsView:self dimmedSelectionDotOpacityAtLineIndex:lineIndex];
+						}
+					}
+					// Custom dot
+					else
+					{
+						NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:shouldHideDotViewOnSelectionAtHorizontalIndex:atLineIndex:)], @"JBLineChartDotsView // dataSource must implement - (BOOL)lineChartDotsView:(JBLineChartDotsView *)lineChartDotsView shouldHideDotViewOnSelectionAtHorizontalIndex:(NSUInteger)horizontalIndex atLineIndex:(NSUInteger)lineIndex");
+						BOOL hideDotView = [self.dataSource lineChartDotsView:self shouldHideDotViewOnSelectionAtHorizontalIndex:horizontalIndex atLineIndex:lineIndex];
+						if (weakSelf.selectedLineIndex == lineIndex)
+						{
+							NSAssert([self.dataSource respondsToSelector:@selector(lineChartDotsView:dimmedSelectionDotOpacityAtLineIndex:)], @"JBLineChartLinesView // dataSource must implement - (CGFloat)lineChartDotsView:(JBLineChartLinesView *)lineChartLinesView dimmedSelectionDotOpacityAtLineIndex:(NSUInteger)lineIndex");
+							dotView.alpha = hideDotView ? [self.dataSource lineChartDotsView:self dimmedSelectionDotOpacityAtLineIndex:lineIndex] : 1.0f;
+						}
+						else
+						{
+							dotView.alpha = 1.0;
+						}
+					}
 				}
 				horizontalIndex++;
 			}

JBChartViewDemo/JBChartViewDemo/Controllers/JBLineChartViewController.m

@@ -305,15 +305,7 @@ NSString * const kJBLineChartViewControllerNavButtonViewKey = @"view";
 
 - (void)chartToggleButtonPressed:(id)sender
 {
-	UIView *buttonImageView = [self.navigationItem.rightBarButtonItem valueForKey:kJBLineChartViewControllerNavButtonViewKey];
-	buttonImageView.userInteractionEnabled = NO;
-	
-	CGAffineTransform transform = self.lineChartView.state == JBChartViewStateExpanded ? CGAffineTransformMakeRotation(M_PI) : CGAffineTransformMakeRotation(0);
-	buttonImageView.transform = transform;
-	
-	[self.lineChartView setState:self.lineChartView.state == JBChartViewStateExpanded ? JBChartViewStateCollapsed : JBChartViewStateExpanded animated:YES callback:^{
-		buttonImageView.userInteractionEnabled = YES;
-	}];
+    [self.chartView setLoading:!self.chartView.loading animated:YES];
 }
 
 #pragma mark - Overrides