Update example

Author: Howard Wang

.gitignore

@@ -16,6 +16,7 @@ DerivedData/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata/
+.DS_Store
 
 ## Other
 *.moved-aside

HamsterUIKit.xcodeproj/project.pbxproj

@@ -31,9 +31,6 @@
 709A438D1EA3262C0076CED4 /* HamsterUIKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 709A438C1EA3262C0076CED4 /* HamsterUIKitTests.swift */; };
 709A438F1EA3262C0076CED4 /* HamsterUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 709A43811EA3262C0076CED4 /* HamsterUIKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 709A43A81EA3AECA0076CED4 /* Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 709A43A71EA3AECA0076CED4 /* Extension.swift */; };
-70A10E311F006D82001B68F5 /* HamsCoachMarkArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70A10E301F006D82001B68F5 /* HamsCoachMarkArea.swift */; };
-70D9A8241EF76991009AAB7D /* HamsCoachMark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70D9A8231EF76991009AAB7D /* HamsCoachMark.swift */; };
-70D9A8281EF772CE009AAB7D /* CoachMarkController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70D9A8271EF772CE009AAB7D /* CoachMarkController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -95,9 +92,6 @@
 709A438C1EA3262C0076CED4 /* HamsterUIKitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HamsterUIKitTests.swift; sourceTree = "<group>"; };
 709A438E1EA3262C0076CED4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 709A43A71EA3AECA0076CED4 /* Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = "<group>"; };
-70A10E301F006D82001B68F5 /* HamsCoachMarkArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HamsCoachMarkArea.swift; sourceTree = "<group>"; };
-70D9A8231EF76991009AAB7D /* HamsCoachMark.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HamsCoachMark.swift; sourceTree = "<group>"; };
-70D9A8271EF772CE009AAB7D /* CoachMarkController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoachMarkController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -138,7 +132,6 @@
 7011FE141EB2EC8F00157E9B /* LaunchScreen.storyboard */,
 7011FE171EB2EC8F00157E9B /* Info.plist */,
 7037D1341EB64AD800B8CB00 /* HelloBarChartViewController.swift */,
-70D9A8271EF772CE009AAB7D /* CoachMarkController.swift */,
 );
 path = HamsterUIKitExample;
 sourceTree = "<group>";
@@ -177,8 +170,6 @@
 701480071EAD36330065F8BF /* HamsIndexPath.swift */,
 7011FE221EB2F4F700157E9B /* HamsLabelStyle.swift */,
 7011FE2B1EB4036700157E9B /* HamsChartBase.swift */,
-70D9A8231EF76991009AAB7D /* HamsCoachMark.swift */,
-70A10E301F006D82001B68F5 /* HamsCoachMarkArea.swift */,
 );
 path = HamsterUIKit;
 sourceTree = "<group>";
@@ -353,7 +344,6 @@
 isa = PBXSourcesBuildPhase;
 buildActionMask = 2147483647;
 files = (
-70D9A8281EF772CE009AAB7D /* CoachMarkController.swift in Sources */,
 7011FE0C1EB2EC8F00157E9B /* AppDelegate.swift in Sources */,
 7011FE251EB39B3A00157E9B /* HamsCurveChartController.swift in Sources */,
 7037D1351EB64AD800B8CB00 /* HelloBarChartViewController.swift in Sources */,
@@ -365,14 +355,12 @@
 isa = PBXSourcesBuildPhase;
 buildActionMask = 2147483647;
 files = (
-70D9A8241EF76991009AAB7D /* HamsCoachMark.swift in Sources */,
 709A43A81EA3AECA0076CED4 /* Extension.swift in Sources */,
 701480061EAD35E00065F8BF /* HamsBackgoundStyle.swift in Sources */,
 701480041EAD34AB0065F8BF /* HamsCurveChartPoint.swift in Sources */,
 706153271EAFDA690078250E /* HamsBarChartRect.swift in Sources */,
 7011FE2C1EB4036700157E9B /* HamsChartBase.swift in Sources */,
 7011FE231EB2F4F700157E9B /* HamsLabelStyle.swift in Sources */,
-70A10E311F006D82001B68F5 /* HamsCoachMarkArea.swift in Sources */,
 701480081EAD36330065F8BF /* HamsIndexPath.swift in Sources */,
 70147FFF1EAD34030065F8BF /* ChartsCore.swift in Sources */,
 706153231EAFA7B90078250E /* HamsBarChart.swift in Sources */,

HamsterUIKit/ChartsCore.swift

@@ -26,13 +26,13 @@ open class ChartsCore {
 return chartHeight - topBorder - bottomBorder
 }
 
-open var max: CGFloat {
-return getY(by: values.max()!)
-}
-
-open var min: CGFloat {
-return getY(by: values.min()!)
-}
+ open lazy var max: CGFloat = {
+ return self.getY(by: self.values.max()!)
+ }()
+ 
+ open lazy var min: CGFloat = {
+ return self.getY(by: self.values.min()!)
+ }()
 
 public init(with points: [CGFloat], frameSize:CGSize) {
 values = points

HamsterUIKit/HamsCoachMark.swift

@@ -118,41 +118,46 @@ open class HamsCurveChart: HamsChartBase {
 delegate?.curveChart!(self, configureForCharts: currentChart)
 super.update()
 
-if numberOfValues > 0 {
-for i in 0..<numberOfValues(in: currentChart) {
-let curveChartPoint = dataSource?.curveChart(self, pointForChart: HamsIndexPath(column: i, view: currentChart))
-chartValues.append((curveChartPoint?.pointValue)!)
-}
-if chartValues.max() == 0 {
-isDataEmpty = true
-} else {
-isDataEmpty = false
-}
-} else {
-chartValues = [0, 0]
-isDataEmpty = true
-}
-
-if let val = value(type: startPoint, left: true) {
-chartValues = [val] + chartValues
-}
-
-if let val = value(type: endPoint, left: false) {
-chartValues = chartValues + [val]
-}
-numberOfValues = chartValues.count
-
+updateData()
+
 let contentOffsets = ChartOffset(top: offsets.top + chartHeaderHeight + gapBtwPointAndValue + labelHeight + 20,
  bottom: offsets.bottom + chartFooterHeight,
  column: offsets.column,
  horizon: offsets.horizon)
 quadCurve = QuadCurveAlgorithm(with: chartValues, frameSize: frame.size, offsets: contentOffsets)
-
+
 quadCurve.maxValue = maximum
 labelWidth = quadCurve.unitWidth
 setLabels()
 }
 
+ fileprivate func updateData() {
+ if numberOfValues > 0 {
+ for i in 0..<numberOfValues(in: currentChart) {
+ let curveChartPoint = dataSource?.curveChart(self, pointForChart: HamsIndexPath(column: i, view: currentChart))
+ chartValues.append((curveChartPoint?.pointValue)!)
+ }
+
+ if chartValues.max() == 0 {
+ isDataEmpty = true
+ } else {
+ isDataEmpty = false
+ }
+ } else {
+ chartValues = [0, 0]
+ isDataEmpty = true
+ }
+ 
+ if let val = value(type: startPoint, left: true) {
+ chartValues = [val] + chartValues
+ }
+ 
+ if let val = value(type: endPoint, left: false) {
+ chartValues = chartValues + [val]
+ }
+ numberOfValues = chartValues.count
+ }
+ 
 override open func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
 super.beginTracking(touch, with: event)
 touchedPoint = touch.location(in: self)
@@ -230,13 +235,13 @@ open class HamsCurveChart: HamsChartBase {
 let height = frame.height
 
 let graphPath = quadCurve.quadCurvePath
-graphPath.addLine(to: CGPoint(
+ graphPath?.addLine(to: CGPoint(
 x: quadCurve.getX(by: chartValues.count - 1),
 y:height))
-graphPath.addLine(to: CGPoint(
+ graphPath?.addLine(to: CGPoint(
 x:quadCurve.getX(by: 0),
 y:height))
-graphPath.close()
+ graphPath?.close()
 
 
 switch filledStyle! {
@@ -250,7 +255,7 @@ open class HamsCurveChart: HamsChartBase {
  colors: colors as CFArray,
  locations: colorLocations)
 
-ctx.addPath(graphPath.cgPath)
+ ctx.addPath((graphPath?.cgPath)!)
 ctx.clip()
 var startPoint = CGPoint.zero
 if quadCurve.maxValue == 0{
@@ -266,7 +271,7 @@ open class HamsCurveChart: HamsChartBase {
 case .plain(let color):
 defaultColor = color
 color.setFill()
-graphPath.fill()
+ graphPath?.fill()
 }
 
 }

HamsterUIKit/HamsCoachMarkArea.swift

@@ -18,7 +18,7 @@ open class HamsIndexPath {
 ///	method to create a HamsIndexPath
 public init(column: Int, view: Int) {
 _column = column
-_chart = chart
+_chart = view
 }
 
 open var column: Int { return _column }