function names for custom view changed

Zomato · Jul 28, 2016 · 6d89f6d · 6d89f6d
1 parent 088f49b
commit 6d89f6d
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 16 deletions.
diff --git a/...dr-ChartsExample.xcworkspace/xcuserdata/zomato.xcuserdatad/UserInterfaceState.xcuserstate b/...dr-ChartsExample.xcworkspace/xcuserdata/zomato.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/dr-ChartsExample/dr-ChartsExample/PageViewController.m b/dr-ChartsExample/dr-ChartsExample/PageViewController.m
@@ -212,7 +212,7 @@ - (NSMutableArray *)dataForLineWithLineNumber:(NSInteger)lineNumber{
     return [[NSMutableArray alloc] init];
 }
 
-- (UIView *)viewForLineChartTouchWithXValue:(NSNumber *)xValue andYValue:(NSNumber *)yValue{
+- (UIView *)customViewForLineChartTouchWithXValue:(NSNumber *)xValue andYValue:(NSNumber *)yValue{
     UIView *view = [[UIView alloc] init];
     [view setBackgroundColor:[UIColor whiteColor]];
     [view.layer setCornerRadius:4.0F];
@@ -270,7 +270,7 @@ - (NSNumber *)valueInPieChartWithIndex:(NSInteger)index{
     return [NSNumber numberWithLong:random() % 100];
 }
 
-- (UIView *)viewForPieChartTouchWithValue:(NSNumber *)value{
+- (UIView *)customViewForPieChartTouchWithValue:(NSNumber *)value{
     UIView *view = [[UIView alloc] init];
     [view setBackgroundColor:[UIColor whiteColor]];
     [view.layer setCornerRadius:4.0F];
@@ -328,7 +328,7 @@ - (NSNumber *)valueInStackChartWithIndex:(NSInteger)index{
     return [NSNumber numberWithLong:random() % 100];
 }
 
-- (UIView *)viewForStackChartTouchWithValue:(NSNumber *)value{
+- (UIView *)customViewForStackChartTouchWithValue:(NSNumber *)value{
     UIView *view = [[UIView alloc] init];
     [view setBackgroundColor:[UIColor whiteColor]];
     [view.layer setCornerRadius:4.0F];
@@ -360,6 +360,7 @@ - (void)createBarChart{
     [barChartView setDataSource:self];
     [barChartView setDelegate:self];
     [barChartView setLegendViewType:LegendTypeHorizontal];
+    [barChartView setShowCustomMarkerView:TRUE];
     [barChartView drawBarGraph];
 
     [self.view addSubview:barChartView];
@@ -402,7 +403,7 @@ - (NSMutableArray *)yDataForBarWithBarNumber:(NSInteger)barNumber{
     return array;
 }
 
-- (UIView *)viewForBarChartTouchWithValue:(NSNumber *)value{
+- (UIView *)customViewForBarChartTouchWithValue:(NSNumber *)value{
     UIView *view = [[UIView alloc] init];
     [view setBackgroundColor:[UIColor whiteColor]];
     [view.layer setCornerRadius:4.0F];
@@ -428,7 +429,7 @@ - (void)didTapOnBarChartWithValue:(NSString *)value{
     NSLog(@"Bar Chart: %@",value);
 }
 
-#pragma Mark CreatePieChart
+#pragma Mark CreateCircularChart
 - (void)createCircularChart{
     CircularChart *chart = [[CircularChart alloc] initWithFrame:CGRectMake(0, header_height, WIDTH(self.view), (HEIGHT(self.view) - header_height)/2)];
     [chart setDataSource:self];
@@ -464,7 +465,7 @@ - (NSNumber *)valueInCircularChartWithIndex:(NSInteger)index{
     return [NSNumber numberWithLong:random() % 100];
 }
 
-- (UIView *)viewForCircularChartTouchWithValue:(NSNumber *)value{
+- (UIView *)customViewForCircularChartTouchWithValue:(NSNumber *)value{
     UIView *view = [[UIView alloc] init];
     [view setBackgroundColor:[UIColor whiteColor]];
     [view.layer setCornerRadius:4.0F];

diff --git a/dr-charts/Classes/BarChart/BarChart.h b/dr-charts/Classes/BarChart/BarChart.h
@@ -39,7 +39,7 @@
 //Set y-Axis data for each item in a Bar Chart
 
 @optional
-- (UIView *)viewForBarChartTouchWithValue:(NSNumber *)value;
+- (UIView *)customViewForBarChartTouchWithValue:(NSNumber *)value;
 //Set Custom View for touch on each item in a Bar Chart
 
 @end

diff --git a/dr-charts/Classes/BarChart/BarChart.m b/dr-charts/Classes/BarChart/BarChart.m
@@ -419,7 +419,7 @@ - (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
 
 #pragma mark Show Custom Marker
 - (void)showCustomMarkerViewWithData:(NSString *)data{
-    self.customMarkerView = [self.dataSource viewForBarChartTouchWithValue:[NSNumber numberWithFloat:data.floatValue]];
+    self.customMarkerView = [self.dataSource customViewForBarChartTouchWithValue:[NSNumber numberWithFloat:data.floatValue]];
 
     if (self.customMarkerView != nil) {
         CGRect rect = CGPathGetBoundingBox(touchedLayer.path);

diff --git a/dr-charts/Classes/CircularChart/CircularChart.h b/dr-charts/Classes/CircularChart/CircularChart.h
@@ -37,7 +37,7 @@
 //Default value is 0
 
 @optional
-- (UIView *)viewForCircularChartTouchWithValue:(NSNumber *)value;
+- (UIView *)customViewForCircularChartTouchWithValue:(NSNumber *)value;
 //Set Custom View for touch on each item in a Circular Chart
 
 @end

diff --git a/dr-charts/Classes/CircularChart/CircularChart.m b/dr-charts/Classes/CircularChart/CircularChart.m
@@ -228,7 +228,7 @@ - (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
 
 #pragma mark Show Custom Marker
 - (void)showCustomMarkerViewWithData:(NSString *)data{
-    self.customMarkerView = [self.dataSource viewForCircularChartTouchWithValue:[NSNumber numberWithFloat:data.floatValue]];
+    self.customMarkerView = [self.dataSource customViewForCircularChartTouchWithValue:[NSNumber numberWithFloat:data.floatValue]];
 
     if (self.customMarkerView != nil) {
 

diff --git a/dr-charts/Classes/HorizontalStackChart/HorizontalStackBarChart.h b/dr-charts/Classes/HorizontalStackChart/HorizontalStackBarChart.h
@@ -32,7 +32,7 @@
 //Set Value for each item in a Stack Chart
 
 @optional
-- (UIView *)viewForStackChartTouchWithValue:(NSNumber *)value;
+- (UIView *)customViewForStackChartTouchWithValue:(NSNumber *)value;
 //Set Custom View for touch on each item in a Stack Chart
 
 @end

diff --git a/dr-charts/Classes/HorizontalStackChart/HorizontalStackBarChart.m b/dr-charts/Classes/HorizontalStackChart/HorizontalStackBarChart.m
@@ -251,7 +251,7 @@ - (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
 
 #pragma mark Show Custom Marker
 - (void)showCustomMarkerViewWithData:(NSString *)data withTouchedPoint:(CGPoint)point{
-    self.customMarkerView = [self.dataSource viewForStackChartTouchWithValue:[NSNumber numberWithFloat:data.floatValue]];
+    self.customMarkerView = [self.dataSource customViewForStackChartTouchWithValue:[NSNumber numberWithFloat:data.floatValue]];
 
     if (self.customMarkerView != nil) {
         CGRect rect = CGPathGetBoundingBox(touchedLayer.path);

diff --git a/dr-charts/Classes/LineChart/MultiLineGraphView.h b/dr-charts/Classes/LineChart/MultiLineGraphView.h
@@ -58,7 +58,7 @@ typedef enum {
 //If LineType is LineParallelYAxis, Set xData for the Line on Line Graph
 
 @optional
-- (UIView *)viewForLineChartTouchWithXValue:(NSNumber *)xValue andYValue:(NSNumber *)yValue;
+- (UIView *)customViewForLineChartTouchWithXValue:(NSNumber *)xValue andYValue:(NSNumber *)yValue;
 //Set Custom View for touch on each item in a Line Chart
 
 @end

diff --git a/dr-charts/Classes/LineChart/MultiLineGraphView.m b/dr-charts/Classes/LineChart/MultiLineGraphView.m
@@ -626,7 +626,7 @@ - (void)findValueForTouch:(UITouch *)touch{
             [self.marker setHidden:YES];
             [self.marker removeFromSuperview];
 
-            self.customMarkerView = [self.dataSource viewForLineChartTouchWithXValue:[NSNumber numberWithFloat:xData.floatValue] andYValue:[NSNumber numberWithFloat:yData.floatValue]];
+            self.customMarkerView = [self.dataSource customViewForLineChartTouchWithXValue:[NSNumber numberWithFloat:xData.floatValue] andYValue:[NSNumber numberWithFloat:yData.floatValue]];
 
             if (selectedPoint.x + WIDTH(self.customMarkerView) > self.graphScrollView.contentSize.width) {
                 selectedPoint.x -= WIDTH(self.customMarkerView);

diff --git a/dr-charts/Classes/PieChart/PieChart.h b/dr-charts/Classes/PieChart/PieChart.h
@@ -33,7 +33,7 @@
 //Default Value is 0
 
 @optional
-- (UIView *)viewForPieChartTouchWithValue:(NSNumber *)value;
+- (UIView *)customViewForPieChartTouchWithValue:(NSNumber *)value;
 //Set Custom View for touch on each item in a Pie Chart
 
 @end

diff --git a/dr-charts/Classes/PieChart/PieChart.m b/dr-charts/Classes/PieChart/PieChart.m
@@ -255,7 +255,7 @@ - (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
 
 #pragma mark Show Custom Marker
 - (void)showCustomMarkerViewWithData:(NSString *)data withTouchedPoint:(CGPoint)point{
-    self.customMarkerView = [self.dataSource viewForPieChartTouchWithValue:[NSNumber numberWithFloat:data.floatValue]];
+    self.customMarkerView = [self.dataSource customViewForPieChartTouchWithValue:[NSNumber numberWithFloat:data.floatValue]];
 
     if (self.customMarkerView != nil) {
         CGFloat viewX = 0;

diff --git a/...codeproj/project.xcworkspace/xcuserdata/zomato.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/zomato.xcuserdatad/UserInterfaceState.xcuserstate