Use @objc(name) feature for rarely used classes (by users)

Charts/Classes/Animation/ChartAnimator.swift → Charts/Classes/Animation/Animator.swift

@@ -1,5 +1,5 @@
 //
-//  ChartAnimator.swift
+//  Animator.swift
 //  Charts
 //
 //  Created by Daniel Cohen Gindi on 3/3/15.
@@ -18,19 +18,20 @@ import CoreGraphics
     import UIKit
 #endif
 
-@objc
-public protocol ChartAnimatorDelegate
+@objc(ChartAnimatorDelegate)
+public protocol AnimatorDelegate
 {
     /// Called when the Animator has stepped.
-    func chartAnimatorUpdated(chartAnimator: ChartAnimator)
+    func animatorUpdated(chartAnimator: Animator)
 
     /// Called when the Animator has stopped.
-    func chartAnimatorStopped(chartAnimator: ChartAnimator)
+    func animatorStopped(chartAnimator: Animator)
 }
 
-public class ChartAnimator: NSObject
+@objc(ChartAnimator)
+public class Animator: NSObject
 {
-    public weak var delegate: ChartAnimatorDelegate?
+    public weak var delegate: AnimatorDelegate?
     public var updateBlock: (() -> Void)?
     public var stopBlock: (() -> Void)?
 
@@ -85,7 +86,7 @@ public class ChartAnimator: NSObject
 
                 if (delegate != nil)
                 {
-                    delegate!.chartAnimatorUpdated(self)
+                    delegate!.animatorUpdated(self)
                 }
                 if (updateBlock != nil)
                 {
@@ -95,7 +96,7 @@ public class ChartAnimator: NSObject
 
             if (delegate != nil)
             {
-                delegate!.chartAnimatorStopped(self)
+                delegate!.animatorStopped(self)
             }
             if (stopBlock != nil)
             {
@@ -154,7 +155,7 @@ public class ChartAnimator: NSObject
 
         if (delegate != nil)
         {
-            delegate!.chartAnimatorUpdated(self)
+            delegate!.animatorUpdated(self)
         }
         if (updateBlock != nil)
         {
@@ -195,7 +196,7 @@ public class ChartAnimator: NSObject
 
         if (_enabledX || _enabledY)
         {
-            _displayLink = NSUIDisplayLink(target: self, selector: #selector(ChartAnimator.animationLoop))
+            _displayLink = NSUIDisplayLink(target: self, selector: #selector(Animator.animationLoop))
             _displayLink.addToRunLoop(NSRunLoop.mainRunLoop(), forMode: NSRunLoopCommonModes)
         }
     }
@@ -261,7 +262,7 @@ public class ChartAnimator: NSObject
         {
             if _displayLink === nil
             {
-                _displayLink = NSUIDisplayLink(target: self, selector: #selector(ChartAnimator.animationLoop))
+                _displayLink = NSUIDisplayLink(target: self, selector: #selector(Animator.animationLoop))
                 _displayLink.addToRunLoop(NSRunLoop.mainRunLoop(), forMode: NSRunLoopCommonModes)
             }
         }
@@ -305,7 +306,7 @@ public class ChartAnimator: NSObject
         {
             if _displayLink === nil
             {
-                _displayLink = NSUIDisplayLink(target: self, selector: #selector(ChartAnimator.animationLoop))
+                _displayLink = NSUIDisplayLink(target: self, selector: #selector(Animator.animationLoop))
                 _displayLink.addToRunLoop(NSRunLoop.mainRunLoop(), forMode: NSRunLoopCommonModes)
             }
         }

Charts/Classes/Charts/BarLineChartViewBase.swift

@@ -62,13 +62,13 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
     /// the object representing the right y-axis
     internal var _rightAxis: ChartYAxis!
 
-    internal var _leftYAxisRenderer: ChartYAxisRenderer!
-    internal var _rightYAxisRenderer: ChartYAxisRenderer!
+    internal var _leftYAxisRenderer: YAxisRenderer!
+    internal var _rightYAxisRenderer: YAxisRenderer!
 
-    internal var _leftAxisTransformer: ChartTransformer!
-    internal var _rightAxisTransformer: ChartTransformer!
+    internal var _leftAxisTransformer: Transformer!
+    internal var _rightAxisTransformer: Transformer!
 
-    internal var _xAxisRenderer: ChartXAxisRenderer!
+    internal var _xAxisRenderer: XAxisRenderer!
 
     internal var _tapGestureRecognizer: NSUITapGestureRecognizer!
     internal var _doubleTapGestureRecognizer: NSUITapGestureRecognizer!
@@ -102,13 +102,13 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
         _leftAxis = ChartYAxis(position: .Left)
         _rightAxis = ChartYAxis(position: .Right)
 
-        _leftAxisTransformer = ChartTransformer(viewPortHandler: _viewPortHandler)
-        _rightAxisTransformer = ChartTransformer(viewPortHandler: _viewPortHandler)
+        _leftAxisTransformer = Transformer(viewPortHandler: _viewPortHandler)
+        _rightAxisTransformer = Transformer(viewPortHandler: _viewPortHandler)
 
-        _leftYAxisRenderer = ChartYAxisRenderer(viewPortHandler: _viewPortHandler, yAxis: _leftAxis, transformer: _leftAxisTransformer)
-        _rightYAxisRenderer = ChartYAxisRenderer(viewPortHandler: _viewPortHandler, yAxis: _rightAxis, transformer: _rightAxisTransformer)
+        _leftYAxisRenderer = YAxisRenderer(viewPortHandler: _viewPortHandler, yAxis: _leftAxis, transformer: _leftAxisTransformer)
+        _rightYAxisRenderer = YAxisRenderer(viewPortHandler: _viewPortHandler, yAxis: _rightAxis, transformer: _rightAxisTransformer)
 
-        _xAxisRenderer = ChartXAxisRenderer(viewPortHandler: _viewPortHandler, xAxis: _xAxis, transformer: _leftAxisTransformer)
+        _xAxisRenderer = XAxisRenderer(viewPortHandler: _viewPortHandler, xAxis: _xAxis, transformer: _leftAxisTransformer)
 
         self.highlighter = ChartHighlighter(chart: self)
 
@@ -1002,7 +1002,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
                yValue: Double,
                axis: ChartYAxis.AxisDependency)
     {
-        let job = ZoomChartViewJob(
+        let job = ZoomViewJob(
             viewPortHandler: viewPortHandler,
             scaleX: scaleX,
             scaleY: scaleY,
@@ -1056,7 +1056,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
             pt: CGPoint(x: viewPortHandler.contentLeft, y: viewPortHandler.contentTop),
             axis: axis)
 
-        let job = AnimatedZoomChartViewJob(
+        let job = AnimatedZoomViewJob(
             viewPortHandler: viewPortHandler,
             transformer: getTransformer(axis),
             view: self,
@@ -1203,7 +1203,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
     /// This also refreshes the chart by calling setNeedsDisplay().
     public func moveViewToX(xValue: Double)
     {
-        let job = MoveChartViewJob(
+        let job = MoveViewJob(
             viewPortHandler: viewPortHandler,
             xValue: xValue,
             yValue: 0.0,
@@ -1222,7 +1222,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
     {
         let yInView = getAxisRange(axis) / Double(_viewPortHandler.scaleY)
 
-        let job = MoveChartViewJob(
+        let job = MoveViewJob(
             viewPortHandler: viewPortHandler,
             xValue: 0.0,
             yValue: yValue + yInView / 2.0,
@@ -1242,7 +1242,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
     {
         let yInView = getAxisRange(axis) / Double(_viewPortHandler.scaleY)
 
-        let job = MoveChartViewJob(
+        let job = MoveViewJob(
             viewPortHandler: viewPortHandler,
             xValue: xValue,
             yValue: yValue + yInView / 2.0,
@@ -1273,7 +1273,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
 
         let yInView = getAxisRange(axis) / Double(_viewPortHandler.scaleY)
 
-        let job = AnimatedMoveChartViewJob(
+        let job = AnimatedMoveViewJob(
             viewPortHandler: viewPortHandler,
             xValue: xValue,
             yValue: yValue + yInView / 2.0,
@@ -1336,7 +1336,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
         let yInView = getAxisRange(axis) / Double(_viewPortHandler.scaleY)
         let xInView = xAxis.axisRange / Double(_viewPortHandler.scaleX)
 
-        let job = MoveChartViewJob(
+        let job = MoveViewJob(
             viewPortHandler: viewPortHandler,
             xValue: xValue - xInView / 2.0,
             yValue: yValue + yInView / 2.0,
@@ -1367,7 +1367,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
         let yInView = getAxisRange(axis) / Double(_viewPortHandler.scaleY)
         let xInView = xAxis.axisRange / Double(_viewPortHandler.scaleX)
 
-        let job = AnimatedMoveChartViewJob(
+        let job = AnimatedMoveViewJob(
             viewPortHandler: viewPortHandler,
             xValue: xValue - xInView / 2.0,
             yValue: yValue + yInView / 2.0,
@@ -1717,27 +1717,27 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
     public var hasNoDragOffset: Bool { return _viewPortHandler.hasNoDragOffset; }
 
     /// The X axis renderer. This is a read-write property so you can set your own custom renderer here.
-    /// **default**: An instance of ChartXAxisRenderer
+    /// **default**: An instance of XAxisRenderer
     /// - returns: The current set X axis renderer
-    public var xAxisRenderer: ChartXAxisRenderer
+    public var xAxisRenderer: XAxisRenderer
     {
         get { return _xAxisRenderer }
         set { _xAxisRenderer = newValue }
     }
 
     /// The left Y axis renderer. This is a read-write property so you can set your own custom renderer here.
-    /// **default**: An instance of ChartYAxisRenderer
+    /// **default**: An instance of YAxisRenderer
     /// - returns: The current set left Y axis renderer
-    public var leftYAxisRenderer: ChartYAxisRenderer
+    public var leftYAxisRenderer: YAxisRenderer
     {
         get { return _leftYAxisRenderer }
         set { _leftYAxisRenderer = newValue }
     }
 
     /// The right Y axis renderer. This is a read-write property so you can set your own custom renderer here.
-    /// **default**: An instance of ChartYAxisRenderer
+    /// **default**: An instance of YAxisRenderer
     /// - returns: The current set right Y axis renderer
-    public var rightYAxisRenderer: ChartYAxisRenderer
+    public var rightYAxisRenderer: YAxisRenderer
     {
         get { return _rightYAxisRenderer }
         set { _rightYAxisRenderer = newValue }
@@ -1845,7 +1845,7 @@ public class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChar
     /// - returns: The Transformer class that contains all matrices and is
     /// responsible for transforming values into pixels on the screen and
     /// backwards.
-    public func getTransformer(which: ChartYAxis.AxisDependency) -> ChartTransformer
+    public func getTransformer(which: ChartYAxis.AxisDependency) -> Transformer
     {
         if (which == .Left)
         {

Charts/Classes/Charts/ChartViewBase.swift

@@ -38,7 +38,7 @@ public protocol ChartViewDelegate
     optional func chartTranslated(chartView: ChartViewBase, dX: CGFloat, dY: CGFloat)
 }
 
-public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
+public class ChartViewBase: NSUIView, ChartDataProvider, AnimatorDelegate
 {
     // MARK: - Properties
 
@@ -106,18 +106,18 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
     /// text that is displayed when the chart is empty that describes why the chart is empty
     public var noDataTextDescription: String?
 
-    internal var _legendRenderer: ChartLegendRenderer!
+    internal var _legendRenderer: LegendRenderer!
 
     /// object responsible for rendering the data
-    public var renderer: ChartDataRendererBase?
+    public var renderer: DataRenderer?
 
     public var highlighter: IChartHighlighter?
 
     /// object that manages the bounds and drawing constraints of the chart
-    internal var _viewPortHandler: ChartViewPortHandler!
+    internal var _viewPortHandler: ViewPortHandler!
 
     /// object responsible for animations
-    internal var _animator: ChartAnimator!
+    internal var _animator: Animator!
 
     /// flag that indicates if offsets calculation has already been done or not
     private var _offsetsCalculated = false
@@ -184,14 +184,14 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
 
     internal func initialize()
     {
-        _animator = ChartAnimator()
+        _animator = Animator()
         _animator.delegate = self
 
-        _viewPortHandler = ChartViewPortHandler()
+        _viewPortHandler = ViewPortHandler()
         _viewPortHandler.setChartDimens(width: bounds.size.width, height: bounds.size.height)
 
         _legend = ChartLegend()
-        _legendRenderer = ChartLegendRenderer(viewPortHandler: _viewPortHandler, legend: _legend)
+        _legendRenderer = LegendRenderer(viewPortHandler: _viewPortHandler, legend: _legend)
 
         _xAxis = ChartXAxis()
 
@@ -597,7 +597,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
     // MARK: - Animation
 
     /// - returns: The animator responsible for animating chart values.
-    public var chartAnimator: ChartAnimator!
+    public var chartAnimator: Animator!
     {
         return _animator
     }
@@ -761,7 +761,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
     }
 
     /// - returns: The renderer object responsible for rendering / drawing the Legend.
-    public var legendRenderer: ChartLegendRenderer!
+    public var legendRenderer: LegendRenderer!
     {
         return _legendRenderer
     }
@@ -794,7 +794,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
 
     /// - returns: The ViewPortHandler of the chart that is responsible for the
     /// content area of the chart and its offsets and dimensions.
-    public var viewPortHandler: ChartViewPortHandler!
+    public var viewPortHandler: ViewPortHandler!
     {
         return _viewPortHandler
     }
@@ -878,7 +878,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
     }
     #endif
 
-    internal var _viewportJobs = [ChartViewPortJob]()
+    internal var _viewportJobs = [ViewPortJob]()
 
     public override func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String : AnyObject]?, context: UnsafeMutablePointer<Void>)
     {
@@ -904,7 +904,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
         }
     }
 
-    public func removeViewportJob(job: ChartViewPortJob)
+    public func removeViewportJob(job: ViewPortJob)
     {
         if let index = _viewportJobs.indexOf({ $0 === job })
         {
@@ -917,7 +917,7 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
         _viewportJobs.removeAll(keepCapacity: false)
     }
 
-    public func addViewportJob(job: ChartViewPortJob)
+    public func addViewportJob(job: ViewPortJob)
     {
         if (_viewPortHandler.hasChartDimens)
         {
@@ -972,14 +972,14 @@ public class ChartViewBase: NSUIView, ChartDataProvider, ChartAnimatorDelegate
         return Int(INT_MAX)
     }
 
-    // MARK: - ChartAnimatorDelegate
+    // MARK: - AnimatorDelegate
 
-    public func chartAnimatorUpdated(chartAnimator: ChartAnimator)
+    public func animatorUpdated(chartAnimator: Animator)
     {
         setNeedsDisplay()
     }
 
-    public func chartAnimatorStopped(chartAnimator: ChartAnimator)
+    public func animatorStopped(chartAnimator: Animator)
     {
 
     }

Charts/Classes/Charts/CombinedChartView.swift

@@ -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: ChartFillFormatter!
+    internal var _fillFormatter: FillFormatter!
 
     /// enum that allows to specify the order in which the different data objects for the combined-chart are drawn
     @objc(CombinedChartDrawOrder)
@@ -41,7 +41,7 @@ public class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
         self.highlightFullBarEnabled = true
 
         /// WORKAROUND: Swift 2.0 compiler malfunctions when optimizations are enabled, and assigning directly to _fillFormatter causes a crash with a EXC_BAD_ACCESS. See https://github.com/danielgindi/Charts/issues/406
-        let workaroundFormatter = ChartDefaultFillFormatter()
+        let workaroundFormatter = DefaultFillFormatter()
         _fillFormatter = workaroundFormatter
 
         renderer = CombinedChartRenderer(chart: self, animator: _animator, viewPortHandler: _viewPortHandler)
@@ -64,7 +64,7 @@ public class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
         }
     }
 
-    public var fillFormatter: ChartFillFormatter
+    public var fillFormatter: FillFormatter
     {
         get
         {
@@ -75,7 +75,7 @@ public class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider
             _fillFormatter = newValue
             if (_fillFormatter == nil)
             {
-                _fillFormatter = ChartDefaultFillFormatter()
+                _fillFormatter = DefaultFillFormatter()
             }
         }
     }