From f2866ae2811bc78360ef8a0bdea827b31edd93d1 Mon Sep 17 00:00:00 2001 From: nicolas Date: Thu, 28 May 2020 04:54:06 -0400 Subject: [PATCH] Syntax corrections (#105) * Movie PieChartFile * Variable renaming --- .../SwiftUICharts/Base/Chart/ChartType.swift | 2 +- .../Base/Extensions/CGPoint+Extension.swift | 2 +- .../Base/Extensions/Path+QuadCurve.swift | 101 +++++++++--------- .../Base/Extensions/View+Extension.swift | 2 +- .../SwiftUICharts/Base/Label/ChartLabel.swift | 2 +- Sources/SwiftUICharts/Base/Style/Colors.swift | 4 +- .../Charts/LineChart/IndicatorPoint.swift | 6 +- .../SwiftUICharts/Charts/LineChart/Line.swift | 4 +- .../{ => Charts}/PieChart/PieChart.swift | 0 .../{ => Charts}/PieChart/PieChartCell.swift | 0 .../{ => Charts}/PieChart/PieChartRow.swift | 0 .../ArrayExtensionTests.swift | 1 - .../SwiftUIChartsTests.swift | 2 +- .../SwiftUIChartsTests/XCTestManifests.swift | 2 +- 14 files changed, 66 insertions(+), 62 deletions(-) rename Sources/SwiftUICharts/{ => Charts}/PieChart/PieChart.swift (100%) rename Sources/SwiftUICharts/{ => Charts}/PieChart/PieChartCell.swift (100%) rename Sources/SwiftUICharts/{ => Charts}/PieChart/PieChartRow.swift (100%) diff --git a/Sources/SwiftUICharts/Base/Chart/ChartType.swift b/Sources/SwiftUICharts/Base/Chart/ChartType.swift index 7951d29..b7bada4 100644 --- a/Sources/SwiftUICharts/Base/Chart/ChartType.swift +++ b/Sources/SwiftUICharts/Base/Chart/ChartType.swift @@ -2,7 +2,7 @@ import SwiftUI @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *) public protocol ChartType { - associatedtype Body : View + associatedtype Body: View func makeChart(configuration: Self.Configuration, style: Self.Style) -> Self.Body diff --git a/Sources/SwiftUICharts/Base/Extensions/CGPoint+Extension.swift b/Sources/SwiftUICharts/Base/Extensions/CGPoint+Extension.swift index f824141..07f3325 100644 --- a/Sources/SwiftUICharts/Base/Extensions/CGPoint+Extension.swift +++ b/Sources/SwiftUICharts/Base/Extensions/CGPoint+Extension.swift @@ -23,7 +23,7 @@ extension CGPoint { return .zero } if let min = min, let max = max, min != max { - if (min <= 0) { + if min <= 0 { stepHeight = (frame.size.height - padding) / CGFloat(max - min) } else { stepHeight = (frame.size.height - padding) / CGFloat(max + min) diff --git a/Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift b/Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift index f1828ff..9e9e3cd 100644 --- a/Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift +++ b/Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift @@ -108,76 +108,80 @@ extension Path { return ret } - static func quadCurvedPathWithPoints(points:[Double], step:CGPoint, globalOffset: Double? = nil) -> Path { + static func quadCurvedPathWithPoints(points: [Double], step: CGPoint, globalOffset: Double? = nil) -> Path { var path = Path() - if (points.count < 2){ + if points.count < 2 { return path } let offset = globalOffset ?? points.min()! // guard let offset = points.min() else { return path } - var p1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y) - path.move(to: p1) + var point1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y) + path.move(to: point1) for pointIndex in 1.. Path { + static func quadClosedCurvedPathWithPoints(points: [Double], step: CGPoint, globalOffset: Double? = nil) -> Path { var path = Path() - if (points.count < 2){ + if points.count < 2 { return path } let offset = globalOffset ?? points.min()! // guard let offset = points.min() else { return path } path.move(to: .zero) - var p1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y) - path.addLine(to: p1) + var point1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y) + path.addLine(to: point1) for pointIndex in 1.. Path { + static func linePathWithPoints(points: [Double], step: CGPoint) -> Path { var path = Path() - if (points.count < 2){ + if points.count < 2 { return path } - guard let offset = points.min() else { return path } - let p1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y) - path.move(to: p1) + guard let offset = points.min() else { + return path + } + let point1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y) + path.move(to: point1) for pointIndex in 1.. Path { + static func closedLinePathWithPoints(points: [Double], step: CGPoint) -> Path { var path = Path() - if (points.count < 2){ + if points.count < 2 { return path } - guard let offset = points.min() else { return path } - var p1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y) - path.move(to: p1) - for pointIndex in 1.. CGPoint { - let x = CGPoint.value(x: self.x, y: to.x, t: t, c1: control1.x, c2: control2.x) - let y = CGPoint.value(x: self.y, y: to.y, t: t, c1: control1.y, c2: control2.x) + let x = CGPoint.value(x: self.x, y: to.x, t: t, control1: control1.x, control2: control2.x) + let y = CGPoint.value(x: self.y, y: to.y, t: t, control1: control1.y, control2: control2.x) return CGPoint(x: x, y: y) } @@ -306,12 +310,12 @@ extension CGPoint { return value } - static func value(x: CGFloat, y: CGFloat, t: CGFloat, c1: CGFloat, c2: CGFloat) -> CGFloat { + static func value(x: CGFloat, y: CGFloat, t: CGFloat, control1: CGFloat, control2: CGFloat) -> CGFloat { var value: CGFloat = 0.0 // (1-t)^3 * p0 + 3 * (1-t)^2 * t * c1 + 3 * (1-t) * t^2 * c2 + t^3 * p1 value += pow(1-t, 3) * x - value += 3 * pow(1-t, 2) * t * c1 - value += 3 * (1-t) * pow(t, 2) * c2 + value += 3 * pow(1-t, 2) * t * control1 + value += 3 * (1-t) * pow(t, 2) * control2 value += pow(t, 3) * y return value } @@ -327,20 +331,21 @@ extension CGPoint { return sqrt((pow(self.x - to.x, 2) + pow(self.y - to.y, 2))) } - static func midPointForPoints(p1:CGPoint, p2:CGPoint) -> CGPoint { - return CGPoint(x:(p1.x + p2.x) / 2,y: (p1.y + p2.y) / 2) + static func midPointForPoints(firstPoint: CGPoint, secondPoint: CGPoint) -> CGPoint { + return CGPoint( + x: (firstPoint.x + secondPoint.x) / 2, + y: (firstPoint.y + secondPoint.y) / 2) } - static func controlPointForPoints(p1:CGPoint, p2:CGPoint) -> CGPoint { - var controlPoint = CGPoint.midPointForPoints(p1:p1, p2:p2) - let diffY = abs(p2.y - controlPoint.y) + static func controlPointForPoints(firstPoint: CGPoint, secondPoint: CGPoint) -> CGPoint { + var controlPoint = CGPoint.midPointForPoints(firstPoint: firstPoint, secondPoint: secondPoint) + let diffY = abs(secondPoint.y - controlPoint.y) - if (p1.y < p2.y){ + if firstPoint.y < secondPoint.y { controlPoint.y += diffY - } else if (p1.y > p2.y) { + } else if firstPoint.y > secondPoint.y { controlPoint.y -= diffY } return controlPoint } } - diff --git a/Sources/SwiftUICharts/Base/Extensions/View+Extension.swift b/Sources/SwiftUICharts/Base/Extensions/View+Extension.swift index fbfc7fb..06e57ed 100644 --- a/Sources/SwiftUICharts/Base/Extensions/View+Extension.swift +++ b/Sources/SwiftUICharts/Base/Extensions/View+Extension.swift @@ -1,7 +1,7 @@ import SwiftUI extension View { - public func type(_ type: S) -> some View where S : ChartType { + public func type(_ type: S) -> some View where S: ChartType { self.environment(\.chartType, AnyChartType(type)) } diff --git a/Sources/SwiftUICharts/Base/Label/ChartLabel.swift b/Sources/SwiftUICharts/Base/Label/ChartLabel.swift index a3134e5..6e30478 100644 --- a/Sources/SwiftUICharts/Base/Label/ChartLabel.swift +++ b/Sources/SwiftUICharts/Base/Label/ChartLabel.swift @@ -3,7 +3,7 @@ import SwiftUI @available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *) public protocol ChartLabel { - associatedtype Body : View + associatedtype Body: View func makeLabel(configuration: Self.Configuration) -> Self.Body diff --git a/Sources/SwiftUICharts/Base/Style/Colors.swift b/Sources/SwiftUICharts/Base/Style/Colors.swift index 9e3478b..0d16693 100644 --- a/Sources/SwiftUICharts/Base/Style/Colors.swift +++ b/Sources/SwiftUICharts/Base/Style/Colors.swift @@ -5,6 +5,6 @@ public enum ChartColors { static let orangeBright = Color(hexString: "#FF782C") static let orangeDark = Color(hexString: "#EC2301") - static let LegendColor:Color = Color(hexString: "#E8E7EA") - static let IndicatorKnob:Color = Color(hexString: "#FF57A6") + static let legendColor: Color = Color(hexString: "#E8E7EA") + static let indicatorKnob: Color = Color(hexString: "#FF57A6") } diff --git a/Sources/SwiftUICharts/Charts/LineChart/IndicatorPoint.swift b/Sources/SwiftUICharts/Charts/LineChart/IndicatorPoint.swift index 5a3f569..925ecc7 100644 --- a/Sources/SwiftUICharts/Charts/LineChart/IndicatorPoint.swift +++ b/Sources/SwiftUICharts/Charts/LineChart/IndicatorPoint.swift @@ -10,14 +10,14 @@ import SwiftUI struct IndicatorPoint: View { var body: some View { - ZStack{ + ZStack { Circle() - .fill(ChartColors.IndicatorKnob) + .fill(ChartColors.indicatorKnob) Circle() .stroke(Color.white, style: StrokeStyle(lineWidth: 4)) } .frame(width: 14, height: 14) - .shadow(color: ChartColors.LegendColor, radius: 6, x: 0, y: 6) + .shadow(color: ChartColors.legendColor, radius: 6, x: 0, y: 6) } } diff --git a/Sources/SwiftUICharts/Charts/LineChart/Line.swift b/Sources/SwiftUICharts/Charts/LineChart/Line.swift index 2138d5a..ce51c42 100644 --- a/Sources/SwiftUICharts/Charts/LineChart/Line.swift +++ b/Sources/SwiftUICharts/Charts/LineChart/Line.swift @@ -45,14 +45,14 @@ public struct Line: View { self.getBackgroundPathView() } self.getLinePathView() - if(self.showIndicator) { + if self.showIndicator { IndicatorPoint() .position(self.getClosestPointOnPath(touchLocation: self.touchLocation)) .rotationEffect(.degrees(180), anchor: .center) .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0)) } } - .onAppear() { + .onAppear { self.frame = geometry.frame(in: .local) } .gesture(DragGesture() diff --git a/Sources/SwiftUICharts/PieChart/PieChart.swift b/Sources/SwiftUICharts/Charts/PieChart/PieChart.swift similarity index 100% rename from Sources/SwiftUICharts/PieChart/PieChart.swift rename to Sources/SwiftUICharts/Charts/PieChart/PieChart.swift diff --git a/Sources/SwiftUICharts/PieChart/PieChartCell.swift b/Sources/SwiftUICharts/Charts/PieChart/PieChartCell.swift similarity index 100% rename from Sources/SwiftUICharts/PieChart/PieChartCell.swift rename to Sources/SwiftUICharts/Charts/PieChart/PieChartCell.swift diff --git a/Sources/SwiftUICharts/PieChart/PieChartRow.swift b/Sources/SwiftUICharts/Charts/PieChart/PieChartRow.swift similarity index 100% rename from Sources/SwiftUICharts/PieChart/PieChartRow.swift rename to Sources/SwiftUICharts/Charts/PieChart/PieChartRow.swift diff --git a/Tests/SwiftUIChartsTests/ArrayExtensionTests.swift b/Tests/SwiftUIChartsTests/ArrayExtensionTests.swift index 35b1e30..ad77114 100644 --- a/Tests/SwiftUIChartsTests/ArrayExtensionTests.swift +++ b/Tests/SwiftUIChartsTests/ArrayExtensionTests.swift @@ -42,4 +42,3 @@ class ArrayExtensionTests: XCTestCase { } } - diff --git a/Tests/SwiftUIChartsTests/SwiftUIChartsTests.swift b/Tests/SwiftUIChartsTests/SwiftUIChartsTests.swift index 0171d83..dc7dc53 100644 --- a/Tests/SwiftUIChartsTests/SwiftUIChartsTests.swift +++ b/Tests/SwiftUIChartsTests/SwiftUIChartsTests.swift @@ -9,6 +9,6 @@ final class SwiftUIChartsTests: XCTestCase { } static var allTests = [ - ("testExample", testExample), + ("testExample", testExample) ] } diff --git a/Tests/SwiftUIChartsTests/XCTestManifests.swift b/Tests/SwiftUIChartsTests/XCTestManifests.swift index a3999a8..e80e585 100644 --- a/Tests/SwiftUIChartsTests/XCTestManifests.swift +++ b/Tests/SwiftUIChartsTests/XCTestManifests.swift @@ -3,7 +3,7 @@ import XCTest #if !canImport(ObjectiveC) public func allTests() -> [XCTestCaseEntry] { return [ - testCase(SwiftUIChartsTests.allTests), + testCase(SwiftUIChartsTests.allTests) ] } #endif