Skip to content

Commit

Permalink
Renamed formatter interfaces
Browse files Browse the repository at this point in the history
FillFormatter -> IFillFormatter
ValueFormatter -> IValueFormatter
AxisValueFormatter -> IAxisValueFormatter
  • Loading branch information
danielgindi committed Aug 9, 2016
1 parent 800e18f commit 4bc69a2
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 45 deletions.
24 changes: 12 additions & 12 deletions Charts/Charts.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
06AEE7C21BDC4277009875AE /* FBSnapshotTestCase.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 06AEE7C11BDC4277009875AE /* FBSnapshotTestCase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
5597263B1BDABBDB00E05E59 /* Charts.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B680D3C1A9D1AD90026A057 /* Charts.h */; settings = {ATTRIBUTES = (Public, ); }; };
5597263C1BDABC0500E05E59 /* DefaultAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D51BB0A86F00890030 /* DefaultAxisValueFormatter.swift */; };
5597263D1BDABC0500E05E59 /* FillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D61BB0A86F00890030 /* FillFormatter.swift */; };
5597263D1BDABC0500E05E59 /* IFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D61BB0A86F00890030 /* IFillFormatter.swift */; };
5597263F1BDABC0500E05E59 /* CombinedHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BAAA8551BB08E1D00B20D4D /* CombinedHighlighter.swift */; };
559726401BDABC0500E05E59 /* BarChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD4C5751BCDBF6C00462351 /* BarChartDataProvider.swift */; };
559726411BDABC0500E05E59 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD4C5761BCDBF6C00462351 /* BarLineScatterCandleBubbleChartDataProvider.swift */; };
Expand Down Expand Up @@ -96,7 +96,7 @@
5B613DEB1D5A069F000F1E98 /* DefaultValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613DE81D5A069F000F1E98 /* DefaultValueFormatter.swift */; };
5B6556F71AB72BA000FFBFD3 /* ChartComponentBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6556F61AB72BA000FFBFD3 /* ChartComponentBase.swift */; };
5B6654D91BB0A86F00890030 /* DefaultAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D51BB0A86F00890030 /* DefaultAxisValueFormatter.swift */; };
5B6654DA1BB0A86F00890030 /* FillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D61BB0A86F00890030 /* FillFormatter.swift */; };
5B6654DA1BB0A86F00890030 /* IFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D61BB0A86F00890030 /* IFillFormatter.swift */; };
5B680D1F1A9D17C30026A057 /* ChartAxisBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA8EC6A1A9D151C00CE82E1 /* ChartAxisBase.swift */; };
5B680D201A9D17C30026A057 /* ChartLegend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA8EC6B1A9D151C00CE82E1 /* ChartLegend.swift */; };
5B680D211A9D17C30026A057 /* ChartLimitLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA8EC6C1A9D151C00CE82E1 /* ChartLimitLine.swift */; };
Expand Down Expand Up @@ -174,7 +174,7 @@
5BD4C5821BCDBF6C00462351 /* ScatterChartDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD4C57B1BCDBF6C00462351 /* ScatterChartDataProvider.swift */; };
5BD8F06D1AB897D500566E05 /* ViewPortHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD8F06C1AB897D500566E05 /* ViewPortHandler.swift */; };
5BD8F06E1AB89AD800566E05 /* HorizontalBarChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6A54A01AA66B6A000F57C2 /* HorizontalBarChartView.swift */; };
5BE377E01D44A17A006EB34F /* AxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE377DF1D44A17A006EB34F /* AxisValueFormatter.swift */; };
5BE377E01D44A17A006EB34F /* IAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE377DF1D44A17A006EB34F /* IAxisValueFormatter.swift */; };
5BE377E91D44D6D0006EB34F /* ChartDataEntryBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE377E81D44D6D0006EB34F /* ChartDataEntryBase.swift */; };
5BE377EA1D44D6D0006EB34F /* ChartDataEntryBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE377E81D44D6D0006EB34F /* ChartDataEntryBase.swift */; };
5BE377EB1D44D6D0006EB34F /* ChartDataEntryBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE377E81D44D6D0006EB34F /* ChartDataEntryBase.swift */; };
Expand Down Expand Up @@ -289,7 +289,7 @@
65B3F6011C7370E5000983D0 /* DataApproximator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA8EC751A9D151C00CE82E1 /* DataApproximator.swift */; };
65B3F6031C7370E5000983D0 /* DefaultFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B8E0AAD1C63737400438BAF /* DefaultFillFormatter.swift */; };
65B3F6041C7370E5000983D0 /* DefaultAxisValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D51BB0A86F00890030 /* DefaultAxisValueFormatter.swift */; };
65B3F6051C7370E5000983D0 /* FillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D61BB0A86F00890030 /* FillFormatter.swift */; };
65B3F6051C7370E5000983D0 /* IFillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D61BB0A86F00890030 /* IFillFormatter.swift */; };
65B3F6071C7370E5000983D0 /* Highlight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032441B6524AD00B6A2FE /* Highlight.swift */; };
65B3F6081C7370E5000983D0 /* Range.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032461B6524D300B6A2FE /* Range.swift */; };
65B3F6091C7370E5000983D0 /* ChartHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B0032481B6525FC00B6A2FE /* ChartHighlighter.swift */; };
Expand Down Expand Up @@ -474,7 +474,7 @@
5B613DE81D5A069F000F1E98 /* DefaultValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultValueFormatter.swift; sourceTree = "<group>"; };
5B6556F61AB72BA000FFBFD3 /* ChartComponentBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartComponentBase.swift; sourceTree = "<group>"; };
5B6654D51BB0A86F00890030 /* DefaultAxisValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultAxisValueFormatter.swift; sourceTree = "<group>"; };
5B6654D61BB0A86F00890030 /* FillFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FillFormatter.swift; sourceTree = "<group>"; };
5B6654D61BB0A86F00890030 /* IFillFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IFillFormatter.swift; sourceTree = "<group>"; };
5B680D3C1A9D1AD90026A057 /* Charts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Charts.h; sourceTree = "<group>"; };
5B6A546A1AA5C23F000F57C2 /* IMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMarker.swift; sourceTree = "<group>"; };
5B6A546D1AA5D2DC000F57C2 /* Animator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Animator.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -539,7 +539,7 @@
5BD4C57A1BCDBF6C00462351 /* LineChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartDataProvider.swift; sourceTree = "<group>"; };
5BD4C57B1BCDBF6C00462351 /* ScatterChartDataProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScatterChartDataProvider.swift; sourceTree = "<group>"; };
5BD8F06C1AB897D500566E05 /* ViewPortHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewPortHandler.swift; sourceTree = "<group>"; };
5BE377DF1D44A17A006EB34F /* AxisValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AxisValueFormatter.swift; sourceTree = "<group>"; };
5BE377DF1D44A17A006EB34F /* IAxisValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IAxisValueFormatter.swift; sourceTree = "<group>"; };
5BE377E81D44D6D0006EB34F /* ChartDataEntryBase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartDataEntryBase.swift; sourceTree = "<group>"; };
659400871BF463C1004F9C27 /* BarChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartData.swift; sourceTree = "<group>"; };
659400881BF463C1004F9C27 /* BarChartDataEntry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BarChartDataEntry.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -684,11 +684,11 @@
5B6654D41BB0A86F00890030 /* Formatters */ = {
isa = PBXGroup;
children = (
5BE377DF1D44A17A006EB34F /* AxisValueFormatter.swift */,
5B6654D51BB0A86F00890030 /* DefaultAxisValueFormatter.swift */,
5B8E0AAD1C63737400438BAF /* DefaultFillFormatter.swift */,
5B613DE81D5A069F000F1E98 /* DefaultValueFormatter.swift */,
5B6654D61BB0A86F00890030 /* FillFormatter.swift */,
5BE377DF1D44A17A006EB34F /* IAxisValueFormatter.swift */,
5B6654D61BB0A86F00890030 /* IFillFormatter.swift */,
5B613DE41D5A0582000F1E98 /* IValueFormatter.swift */,
);
path = Formatters;
Expand Down Expand Up @@ -1141,7 +1141,7 @@
5B6A54AC1AA66C1E000F57C2 /* AxisRendererBase.swift in Sources */,
65F06FAA1BE818AA0074498D /* IBarChartDataSet.swift in Sources */,
659400C41BF463C1004F9C27 /* LineScatterCandleRadarChartDataSet.swift in Sources */,
5B6654DA1BB0A86F00890030 /* FillFormatter.swift in Sources */,
5B6654DA1BB0A86F00890030 /* IFillFormatter.swift in Sources */,
659400BE1BF463C1004F9C27 /* LineChartData.swift in Sources */,
5B6A54AB1AA66BC8000F57C2 /* ScatterChartView.swift in Sources */,
5B6A548B1AA66A3D000F57C2 /* LineChartRenderer.swift in Sources */,
Expand Down Expand Up @@ -1261,7 +1261,7 @@
5BCAA7561C7CB0DE00F83F3B /* AnimatedZoomViewJob.swift in Sources */,
5B0032471B6524D300B6A2FE /* Range.swift in Sources */,
5BD8F06E1AB89AD800566E05 /* HorizontalBarChartView.swift in Sources */,
5BE377E01D44A17A006EB34F /* AxisValueFormatter.swift in Sources */,
5BE377E01D44A17A006EB34F /* IAxisValueFormatter.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1346,7 +1346,7 @@
65B3F6031C7370E5000983D0 /* DefaultFillFormatter.swift in Sources */,
5B72BF951D490FDD0009B2C7 /* BarLineScatterCandleBubbleRenderer.swift in Sources */,
65B3F6041C7370E5000983D0 /* DefaultAxisValueFormatter.swift in Sources */,
65B3F6051C7370E5000983D0 /* FillFormatter.swift in Sources */,
65B3F6051C7370E5000983D0 /* IFillFormatter.swift in Sources */,
65B3F6071C7370E5000983D0 /* Highlight.swift in Sources */,
65B3F6081C7370E5000983D0 /* Range.swift in Sources */,
5B9A0C291C83A7E200ED8ED8 /* AnimatedZoomViewJob.swift in Sources */,
Expand Down Expand Up @@ -1408,7 +1408,7 @@
files = (
5597263C1BDABC0500E05E59 /* DefaultAxisValueFormatter.swift in Sources */,
5BCAA74E1C7CAB4900F83F3B /* MoveViewJob.swift in Sources */,
5597263D1BDABC0500E05E59 /* FillFormatter.swift in Sources */,
5597263D1BDABC0500E05E59 /* IFillFormatter.swift in Sources */,
5B613DDB1D5466CE000F1E98 /* TriangleShapeRenderer.swift in Sources */,
659400BD1BF463C1004F9C27 /* CombinedChartData.swift in Sources */,
659400A91BF463C1004F9C27 /* BarLineScatterCandleBubbleChartDataSet.swift in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions Charts/Classes/Charts/CombinedChartView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import CoreGraphics
public class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
{
/// the fill-formatter used for determining the position of the fill-line
internal var _fillFormatter: FillFormatter!
internal var _fillFormatter: IFillFormatter!

/// enum that allows to specify the order in which the different data objects for the combined-chart are drawn
@objc(CombinedChartDrawOrder)
Expand Down Expand Up @@ -62,7 +62,7 @@ public class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
}
}

public var fillFormatter: FillFormatter
public var fillFormatter: IFillFormatter
{
get
{
Expand Down
4 changes: 2 additions & 2 deletions Charts/Classes/Components/ChartAxisBase.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class ChartAxisBase: ChartComponentBase
}

/// Custom formatter that is used instead of the auto-formatter if set
private var _axisValueFormatter: AxisValueFormatter?
private var _axisValueFormatter: IAxisValueFormatter?

public var labelFont = NSUIFont.systemFontOfSize(10.0)
public var labelTextColor = NSUIColor.blackColor()
Expand Down Expand Up @@ -156,7 +156,7 @@ public class ChartAxisBase: ChartComponentBase
/// Sets the formatter to be used for formatting the axis labels.
/// If no formatter is set, the chart will automatically determine a reasonable formatting (concerning decimals) for all the values that are drawn inside the chart.
/// Use `nil` to use the formatter calculated by the chart.
public var valueFormatter: AxisValueFormatter?
public var valueFormatter: IAxisValueFormatter?
{
get
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@ public class LineChartDataSet: LineRadarChartDataSet, ILineChartDataSet
public var lineCapType = CGLineCap.Butt

/// formatter for customizing the position of the fill-line
private var _fillFormatter: FillFormatter = DefaultFillFormatter()
private var _fillFormatter: IFillFormatter = DefaultFillFormatter()

/// Sets a custom FillFormatter to the chart that handles the position of the filled-line for each DataSet. Set this to null to use the default logic.
public var fillFormatter: FillFormatter?
/// Sets a custom IFillFormatter to the chart that handles the position of the filled-line for each DataSet. Set this to null to use the default logic.
public var fillFormatter: IFillFormatter?
{
get
{
Expand Down
4 changes: 2 additions & 2 deletions Charts/Classes/Data/Interfaces/ILineChartDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ public protocol ILineChartDataSet: ILineRadarChartDataSet
/// Line cap type, default is CGLineCap.Butt
var lineCapType: CGLineCap { get set }

/// Sets a custom FillFormatter to the chart that handles the position of the filled-line for each DataSet. Set this to null to use the default logic.
var fillFormatter: FillFormatter? { get set }
/// Sets a custom IFillFormatter to the chart that handles the position of the filled-line for each DataSet. Set this to null to use the default logic.
var fillFormatter: IFillFormatter? { get set }
}
2 changes: 1 addition & 1 deletion Charts/Classes/Formatters/DefaultAxisValueFormatter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import Foundation

@objc(ChartDefaultAxisValueFormatter)
public class DefaultAxisValueFormatter: NSObject, AxisValueFormatter
public class DefaultAxisValueFormatter: NSObject, IAxisValueFormatter
{
public var formatter: NSNumberFormatter?

Expand Down
2 changes: 1 addition & 1 deletion Charts/Classes/Formatters/DefaultFillFormatter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import CoreGraphics

/// Default formatter that calculates the position of the filled line.
@objc(ChartDefaultFillFormatter)
public class DefaultFillFormatter: NSObject, FillFormatter
public class DefaultFillFormatter: NSObject, IFillFormatter
{
public override init()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// AxisValueFormatter.swift
// IAxisValueFormatter.swift
// Charts
//
// Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
Expand All @@ -12,8 +12,8 @@
import Foundation

/// An interface for providing custom axis Strings.
@objc(ChartAxisValueFormatter)
public protocol AxisValueFormatter : NSObjectProtocol
@objc(IChartAxisValueFormatter)
public protocol IAxisValueFormatter : NSObjectProtocol
{

/// Called when a value from an axis is formatted before being drawn.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// FillFormatter.swift
// IFillFormatter.swift
// Charts
//
// Created by Daniel Cohen Gindi on 6/3/15.
Expand All @@ -15,8 +15,8 @@ import Foundation
import CoreGraphics

/// Protocol for providing a custom logic to where the filling line of a LineDataSet should end. This of course only works if setFillEnabled(...) is set to true.
@objc(ChartFillFormatter)
public protocol FillFormatter
@objc(IChartFillFormatter)
public protocol IFillFormatter
{
/// - returns: The vertical (y-axis) position where the filled-line of the LineDataSet should end.
func getFillLinePosition(dataSet dataSet: ILineChartDataSet, dataProvider: LineChartDataProvider) -> CGFloat
Expand Down
4 changes: 2 additions & 2 deletions ChartsDemo/Classes/Demos/CombinedChartViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#define ITEM_COUNT 12

@interface CombinedChartViewController () <ChartViewDelegate, ChartAxisValueFormatter>
@interface CombinedChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
{
NSArray<NSString *> *months;
}
Expand Down Expand Up @@ -311,7 +311,7 @@ - (void)chartValueNothingSelected:(ChartViewBase * __nonnull)chartView
NSLog(@"chartValueNothingSelected");
}

#pragma mark - AxisValueFormatter
#pragma mark - IAxisValueFormatter

- (NSString *)stringForValue:(double)value
axis:(ChartAxisBase *)axis
Expand Down
2 changes: 1 addition & 1 deletion ChartsDemo/Classes/Demos/CubicLineChartViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import "CubicLineChartViewController.h"
#import "ChartsDemo-Swift.h"

@interface CubicLineSampleFillFormatter : NSObject <ChartFillFormatter>
@interface CubicLineSampleFillFormatter : NSObject <IChartFillFormatter>
{
}
@end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import "NegativeStackedBarChartViewController.h"
#import "ChartsDemo-Swift.h"

@interface NegativeStackedBarChartViewController () <ChartViewDelegate, ChartAxisValueFormatter>
@interface NegativeStackedBarChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>

@property (nonatomic, strong) IBOutlet HorizontalBarChartView *chartView;

Expand Down Expand Up @@ -180,7 +180,7 @@ - (void)chartValueNothingSelected:(ChartViewBase * __nonnull)chartView
NSLog(@"chartValueNothingSelected");
}

#pragma mark - AxisValueFormatter
#pragma mark - IAxisValueFormatter

- (NSString *)stringForValue:(double)value
axis:(ChartAxisBase *)axis
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import "PositiveNegativeBarChartViewController.h"
#import "ChartsDemo-Swift.h"

@interface PositiveNegativeBarChartViewController () <ChartViewDelegate, ChartAxisValueFormatter>
@interface PositiveNegativeBarChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
{
NSArray<NSDictionary *> *dataList;
}
Expand Down Expand Up @@ -186,7 +186,7 @@ - (void)chartValueNothingSelected:(ChartViewBase * __nonnull)chartView
NSLog(@"chartValueNothingSelected");
}

#pragma mark - AxisValueFormatter
#pragma mark - IAxisValueFormatter

- (NSString *)stringForValue:(double)value
axis:(ChartAxisBase *)axis
Expand Down
4 changes: 2 additions & 2 deletions ChartsDemo/Classes/Demos/RadarChartViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import "RadarChartViewController.h"
#import "ChartsDemo-Swift.h"

@interface RadarChartViewController () <ChartViewDelegate, ChartAxisValueFormatter>
@interface RadarChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
{
NSArray<NSString *> *activities;
UIColor *originalBarBgColor;
Expand Down Expand Up @@ -263,7 +263,7 @@ - (void)chartValueNothingSelected:(ChartViewBase * __nonnull)chartView
NSLog(@"chartValueNothingSelected");
}

#pragma mark - AxisValueFormatter
#pragma mark - IAxisValueFormatter

- (NSString *)stringForValue:(double)value
axis:(ChartAxisBase *)axis
Expand Down
2 changes: 1 addition & 1 deletion ChartsDemo/Classes/Formatters/DayAxisValueFormatter.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import <UIKit/UIKit.h>
#import "ChartsDemo-Swift.h"

@interface DayAxisValueFormatter : NSObject <ChartAxisValueFormatter>
@interface DayAxisValueFormatter : NSObject <IChartAxisValueFormatter>

- (id)initForChart:(BarLineChartViewBase *)chart;

Expand Down
2 changes: 1 addition & 1 deletion ChartsDemo/Classes/Formatters/IntAxisValueFormatter.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
#import <UIKit/UIKit.h>
#import "ChartsDemo-Swift.h"

@interface IntAxisValueFormatter : NSObject <ChartAxisValueFormatter>
@interface IntAxisValueFormatter : NSObject <IChartAxisValueFormatter>

@end
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#import <Realm/Realm.h>
#import "Score.h"

@interface RealmWikiExampleChartViewController () <ChartViewDelegate, ChartAxisValueFormatter>
@interface RealmWikiExampleChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
{
RLMResults<Score *> *results;
}
Expand Down Expand Up @@ -165,7 +165,7 @@ - (void)chartValueNothingSelected:(ChartViewBase * __nonnull)chartView
}
}

#pragma mark - AxisValueFormatter
#pragma mark - IAxisValueFormatter

- (NSString *)stringForValue:(double)value
axis:(ChartAxisBase *)axis
Expand Down
Loading

0 comments on commit 4bc69a2

Please sign in to comment.