diff --git a/Sources/SwiftUICharts/BarChart/BarChartCell.swift b/Sources/SwiftUICharts/BarChart/BarChartCell.swift index a3500b7f..b50828cd 100644 --- a/Sources/SwiftUICharts/BarChart/BarChartCell.swift +++ b/Sources/SwiftUICharts/BarChart/BarChartCell.swift @@ -36,9 +36,7 @@ public struct BarChartCell : View { } #if DEBUG -struct ChartCell_Previews : PreviewProvider { - static var previews: some View { - BarChartCell(value: Double(0.75), width: 320, numberOfDataPoints: 12, accentColor: Colors.OrangeStart, gradient: nil, touchLocation: .constant(-1)) - } +#Preview { + BarChartCell(value: Double(0.75), width: 320, numberOfDataPoints: 12, accentColor: Colors.OrangeStart, gradient: nil, touchLocation: .constant(-1)) } #endif diff --git a/Sources/SwiftUICharts/BarChart/BarChartRow.swift b/Sources/SwiftUICharts/BarChart/BarChartRow.swift index 0ccd935e..3c939aa7 100644 --- a/Sources/SwiftUICharts/BarChart/BarChartRow.swift +++ b/Sources/SwiftUICharts/BarChart/BarChartRow.swift @@ -46,12 +46,10 @@ public struct BarChartRow : View { } #if DEBUG -struct ChartRow_Previews : PreviewProvider { - static var previews: some View { - Group { - BarChartRow(data: [0], accentColor: Colors.OrangeStart, touchLocation: .constant(-1)) - BarChartRow(data: [8,23,54,32,12,37,7], accentColor: Colors.OrangeStart, touchLocation: .constant(-1)) - } +#Preview { + Group { + BarChartRow(data: [0], accentColor: Colors.OrangeStart, touchLocation: .constant(-1)) + BarChartRow(data: [8,23,54,32,12,37,7], accentColor: Colors.OrangeStart, touchLocation: .constant(-1)) } } #endif diff --git a/Sources/SwiftUICharts/BarChart/BarChartView.swift b/Sources/SwiftUICharts/BarChart/BarChartView.swift index 6a502e7c..1ac44b58 100644 --- a/Sources/SwiftUICharts/BarChart/BarChartView.swift +++ b/Sources/SwiftUICharts/BarChart/BarChartView.swift @@ -149,12 +149,10 @@ public struct BarChartView : View { } #if DEBUG -struct ChartView_Previews : PreviewProvider { - static var previews: some View { - BarChartView(data: TestData.values , - title: "Model 3 sales", - legend: "Quarterly", - valueSpecifier: "%.0f") - } +#Preview { + BarChartView(data: TestData.values , + title: "Model 3 sales", + legend: "Quarterly", + valueSpecifier: "%.0f") } #endif diff --git a/Sources/SwiftUICharts/BarChart/LabelView.swift b/Sources/SwiftUICharts/BarChart/LabelView.swift index f17ae7be..9fa833b4 100644 --- a/Sources/SwiftUICharts/BarChart/LabelView.swift +++ b/Sources/SwiftUICharts/BarChart/LabelView.swift @@ -39,8 +39,6 @@ struct ArrowUp: Shape { } } -struct LabelView_Previews: PreviewProvider { - static var previews: some View { - LabelView(arrowOffset: .constant(0), title: .constant("Tesla model 3")) - } +#Preview { + LabelView(arrowOffset: .constant(0), title: .constant("Tesla model 3")) } diff --git a/Sources/SwiftUICharts/LineChart/IndicatorPoint.swift b/Sources/SwiftUICharts/LineChart/IndicatorPoint.swift index 2e8667da..f4764298 100644 --- a/Sources/SwiftUICharts/LineChart/IndicatorPoint.swift +++ b/Sources/SwiftUICharts/LineChart/IndicatorPoint.swift @@ -21,8 +21,7 @@ struct IndicatorPoint: View { } } -struct IndicatorPoint_Previews: PreviewProvider { - static var previews: some View { - IndicatorPoint() - } +#Preview { + IndicatorPoint() } + diff --git a/Sources/SwiftUICharts/LineChart/Legend.swift b/Sources/SwiftUICharts/LineChart/Legend.swift index 10190810..9c0e5c59 100644 --- a/Sources/SwiftUICharts/LineChart/Legend.swift +++ b/Sources/SwiftUICharts/LineChart/Legend.swift @@ -91,10 +91,10 @@ struct Legend: View { } } -struct Legend_Previews: PreviewProvider { - static var previews: some View { - GeometryReader{ geometry in - Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false)) - }.frame(width: 320, height: 200) +#Preview { + GeometryReader { geometry in + Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false)) } + .frame(width: 320, height: 200) } + diff --git a/Sources/SwiftUICharts/LineChart/Line.swift b/Sources/SwiftUICharts/LineChart/Line.swift index d29c1874..c33c8349 100644 --- a/Sources/SwiftUICharts/LineChart/Line.swift +++ b/Sources/SwiftUICharts/LineChart/Line.swift @@ -96,10 +96,9 @@ public struct Line: View { } -struct Line_Previews: PreviewProvider { - static var previews: some View { - GeometryReader{ geometry in - Line(data: ChartData(points: [12,-230,10,54]), frame: .constant(geometry.frame(in: .local)), touchLocation: .constant(CGPoint(x: 100, y: 12)), showIndicator: .constant(true), minDataValue: .constant(nil), maxDataValue: .constant(nil)) - }.frame(width: 320, height: 160) - } +#Preview { + GeometryReader{ geometry in + Line(data: ChartData(points: [12,-230,10,54]), frame: .constant(geometry.frame(in: .local)), touchLocation: .constant(CGPoint(x: 100, y: 12)), showIndicator: .constant(true), minDataValue: .constant(nil), maxDataValue: .constant(nil)) + }.frame(width: 320, height: 160) } + diff --git a/Sources/SwiftUICharts/LineChart/LineChartView.swift b/Sources/SwiftUICharts/LineChart/LineChartView.swift index 8e48faa1..d2afcb83 100644 --- a/Sources/SwiftUICharts/LineChart/LineChartView.swift +++ b/Sources/SwiftUICharts/LineChart/LineChartView.swift @@ -76,12 +76,12 @@ public struct LineChartView: View { if let rateValue = self.rateValue { - if (rateValue ?? 0 >= 0){ + if (rateValue >= 0){ Image(systemName: "arrow.up") }else{ Image(systemName: "arrow.down") } - Text("\(rateValue!)%") + Text("\(rateValue)%") } } } @@ -139,14 +139,10 @@ public struct LineChartView: View { } } -struct WidgetView_Previews: PreviewProvider { - static var previews: some View { - Group { - LineChartView(data: [8,23,54,32,12,37,7,23,43], title: "Line chart", legend: "Basic") - .environment(\.colorScheme, .light) - - LineChartView(data: [282.502, 284.495, 283.51, 285.019, 285.197, 286.118, 288.737, 288.455, 289.391, 287.691, 285.878, 286.46, 286.252, 284.652, 284.129, 284.188], title: "Line chart", legend: "Basic") - .environment(\.colorScheme, .light) - } +#Preview { + Group { + LineChartView(data: [8,23,54,32,12,37,7,23,43], title: "Line chart", legend: "Basic", rateValue: 5) + + LineChartView(data: [282.502, 284.495, 283.51, 285.019, 285.197, 286.118, 288.737, 288.455, 289.391, 287.691, 285.878, 286.46, 286.252, 284.652, 284.129, 284.188], title: "Line chart", legend: "Basic", rateValue: 6) } } diff --git a/Sources/SwiftUICharts/LineChart/LineView.swift b/Sources/SwiftUICharts/LineChart/LineView.swift index c69434a7..5f0103d6 100644 --- a/Sources/SwiftUICharts/LineChart/LineView.swift +++ b/Sources/SwiftUICharts/LineChart/LineView.swift @@ -122,14 +122,13 @@ public struct LineView: View { } } -struct LineView_Previews: PreviewProvider { - static var previews: some View { - Group { - LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne) - - LineView(data: [282.502, 284.495, 283.51, 285.019, 285.197, 286.118, 288.737, 288.455, 289.391, 287.691, 285.878, 286.46, 286.252, 284.652, 284.129, 284.188], title: "Full chart", style: Styles.lineChartStyleOne) - - } +#Preview { + Group { + LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne) + + LineView(data: [282.502, 284.495, 283.51, 285.019, 285.197, 286.118, 288.737, 288.455, 289.391, 287.691, 285.878, 286.46, 286.252, 284.652, 284.129, 284.188], title: "Full chart", style: Styles.lineChartStyleOne) + } } + diff --git a/Sources/SwiftUICharts/LineChart/MultiLineChartView.swift b/Sources/SwiftUICharts/LineChart/MultiLineChartView.swift index 93a5f6fb..fa37c8fd 100644 --- a/Sources/SwiftUICharts/LineChart/MultiLineChartView.swift +++ b/Sources/SwiftUICharts/LineChart/MultiLineChartView.swift @@ -154,11 +154,9 @@ public struct MultiLineChartView: View { // } } -struct MultiWidgetView_Previews: PreviewProvider { - static var previews: some View { - Group { - MultiLineChartView(data: [([8,23,54,32,12,37,7,23,43], GradientColors.orange)], title: "Line chart", legend: "Basic") - .environment(\.colorScheme, .light) - } +#Preview { + Group { + MultiLineChartView(data: [([8,23,54,32,12,37,7,23,43], GradientColors.orange)], title: "Line chart", legend: "Basic") + .environment(\.colorScheme, .light) } } diff --git a/Sources/SwiftUICharts/PieChart/PieChartCell.swift b/Sources/SwiftUICharts/PieChart/PieChartCell.swift index f511165e..26233188 100644 --- a/Sources/SwiftUICharts/PieChart/PieChartCell.swift +++ b/Sources/SwiftUICharts/PieChart/PieChartCell.swift @@ -54,12 +54,10 @@ extension CGRect { } #if DEBUG -struct PieChartCell_Previews : PreviewProvider { - static var previews: some View { - GeometryReader { geometry in - PieChartCell(rect: geometry.frame(in: .local),startDeg: 0.0,endDeg: 90.0, index: 0, backgroundColor: Color(red: 252.0/255.0, green: 236.0/255.0, blue: 234.0/255.0), accentColor: Color(red: 225.0/255.0, green: 97.0/255.0, blue: 76.0/255.0)) - }.frame(width:100, height:100) - +#Preview { + GeometryReader { geometry in + PieChartCell(rect: geometry.frame(in: .local),startDeg: 0.0,endDeg: 90.0, index: 0, backgroundColor: Color(red: 252.0/255.0, green: 236.0/255.0, blue: 234.0/255.0), accentColor: Color(red: 225.0/255.0, green: 97.0/255.0, blue: 76.0/255.0)) } + .frame(width:100, height:100) } #endif diff --git a/Sources/SwiftUICharts/PieChart/PieChartRow.swift b/Sources/SwiftUICharts/PieChart/PieChartRow.swift index a462cd96..969b27db 100644 --- a/Sources/SwiftUICharts/PieChart/PieChartRow.swift +++ b/Sources/SwiftUICharts/PieChart/PieChartRow.swift @@ -66,14 +66,13 @@ public struct PieChartRow : View { } #if DEBUG -struct PieChartRow_Previews : PreviewProvider { - static var previews: some View { - Group { - PieChartRow(data:[8,23,54,32,12,37,7,23,43], backgroundColor: Color(red: 252.0/255.0, green: 236.0/255.0, blue: 234.0/255.0), accentColor: Color(red: 225.0/255.0, green: 97.0/255.0, blue: 76.0/255.0), showValue: Binding.constant(false), currentValue: Binding.constant(0)) - .frame(width: 100, height: 100) - PieChartRow(data:[0], backgroundColor: Color(red: 252.0/255.0, green: 236.0/255.0, blue: 234.0/255.0), accentColor: Color(red: 225.0/255.0, green: 97.0/255.0, blue: 76.0/255.0), showValue: Binding.constant(false), currentValue: Binding.constant(0)) - .frame(width: 100, height: 100) - } +#Preview { + Group { + PieChartRow(data:[8,23,54,32,12,37,7,23,43], backgroundColor: Color(red: 252.0/255.0, green: 236.0/255.0, blue: 234.0/255.0), accentColor: Color(red: 225.0/255.0, green: 97.0/255.0, blue: 76.0/255.0), showValue: Binding.constant(false), currentValue: Binding.constant(0)) + .frame(width: 100, height: 100) + + PieChartRow(data:[0], backgroundColor: Color(red: 252.0/255.0, green: 236.0/255.0, blue: 234.0/255.0), accentColor: Color(red: 225.0/255.0, green: 97.0/255.0, blue: 76.0/255.0), showValue: Binding.constant(false), currentValue: Binding.constant(0)) + .frame(width: 100, height: 100) } } #endif diff --git a/Sources/SwiftUICharts/PieChart/PieChartView.swift b/Sources/SwiftUICharts/PieChart/PieChartView.swift index 81609bd1..24adfca0 100644 --- a/Sources/SwiftUICharts/PieChart/PieChartView.swift +++ b/Sources/SwiftUICharts/PieChart/PieChartView.swift @@ -76,9 +76,8 @@ public struct PieChartView : View { } #if DEBUG -struct PieChartView_Previews : PreviewProvider { - static var previews: some View { - PieChartView(data:[56,78,53,65,54], title: "Title", legend: "Legend") - } +#Preview { + PieChartView(data:[56,78,53,65,54], title: "Title", legend: "Legend") } + #endif