Fixed appearing animation

.swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>SwiftUICharts.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

Sources/SwiftUICharts/Base/CardView/CardView.swift

@@ -1,10 +1,9 @@
 import SwiftUI
 
-public struct CardView<Content: View>: View, ChartBase {
-    public var chartData = ChartData()
-    let content: () -> Content
+public struct CardView<Content: View>: View {
+    @Environment(\.chartStyle) private var chartStyle
 
-    @EnvironmentObject var style: ChartStyle
+    let content: () -> Content
 
     public init(@ViewBuilder content: @escaping () -> Content) {
         self.content = content
@@ -12,13 +11,13 @@ public struct CardView<Content: View>: View, ChartBase {
 
     public var body: some View {
         ZStack{
-            RoundedRectangle(cornerRadius: 20)
-                .fill(Color.white)
+            Rectangle()
+                .fill(self.chartStyle.backgroundColor.linearGradient(from: .bottom, to: .top))
+                .cornerRadius(20)
                 .shadow(color: Color.gray, radius: 8)
             VStack {
                 self.content()
             }
-            .clipShape(RoundedRectangle(cornerRadius: 20))
         }
     }
 }

Sources/SwiftUICharts/Base/Chart/AnyChartType.swift

@@ -0,0 +1,19 @@
+import SwiftUI
+
+struct AnyChartType: ChartType {
+    private let chartMaker: (ChartType.Data, ChartType.Style) -> AnyView
+
+    init<S: ChartType>(_ type: S) {
+        self.chartMaker = type.makeTypeErasedBody
+    }
+
+    func makeChart(data: ChartType.Data, style: ChartType.Style) -> AnyView {
+        self.chartMaker(data, style)
+    }
+}
+
+fileprivate extension ChartType {
+    func makeTypeErasedBody(data: ChartType.Data, style: ChartType.Style) -> AnyView {
+        AnyView(makeChart(data: data, style: style))
+    }
+}

Sources/SwiftUICharts/Base/Chart/ChartBase.swift

@@ -1,5 +0,0 @@
-import SwiftUI
-
-public protocol ChartBase {
-    var chartData: ChartData { get }
-}

Sources/SwiftUICharts/Base/Chart/ChartData.swift

@@ -6,8 +6,4 @@ public class ChartData: ObservableObject {
     public init(_ data: [Double]) {
         self.data = data
     }
-
-    public init() {
-        self.data = []
-    }
 }

Sources/SwiftUICharts/Base/Chart/ChartType.swift

@@ -0,0 +1,11 @@
+import SwiftUI
+
+@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
+public protocol ChartType {
+    associatedtype Body: View
+
+    func makeChart(data: Self.Data, style: Self.Style) -> Self.Body
+
+    typealias Data = ChartData
+    typealias Style = ChartStyle
+}

Sources/SwiftUICharts/Base/Chart/ChartValue.swift

@@ -1,6 +0,0 @@
-import SwiftUI
-
-public class ChartValue: ObservableObject {
-    @Published var currentValue: Double = 0
-    @Published var interactionInProgress: Bool = false
-}

Sources/SwiftUICharts/Base/ChartView.swift

@@ -0,0 +1,27 @@
+//  ChartView.swift
+//  Created by Samu András on 2020. 05. 22..
+
+import SwiftUI
+
+public struct ChartView: View {
+    @Environment(\.chartType) private var chartType
+    @Environment(\.chartStyle) private var chartStyle
+
+    private var data: ChartData
+
+    public init(data: ChartData) {
+        self.data = data
+    }
+
+    public var body: some View {
+        self.chartType.makeChart(data: data, style: chartStyle)
+    }
+}
+
+extension ChartView {
+//    public init(data: [Double]) {
+//        self.configuration = ChartTypeConfiguration(data: data)
+//    }
+
+
+}

Sources/SwiftUICharts/Base/Extensions/Array+Extension.swift

@@ -1,3 +1,10 @@
+//
+//  File.swift
+//  
+//
+//  Created by Nicolas Savoini on 2020-05-25.
+//
+
 import Foundation
 
 extension Array where Element == ColorGradient {

Sources/SwiftUICharts/Base/Extensions/CGRect+Extension.swift

@@ -1,3 +1,10 @@
+//
+//  CGRect+Extension.swift
+//  SwiftUICharts
+//
+//  Created by Nicolas Savoini on 2020-05-24.
+//
+
 import Foundation
 import SwiftUI
 

Sources/SwiftUICharts/Base/Extensions/ChartBase+Extension.swift

@@ -1,10 +0,0 @@
-import SwiftUI
-
-extension View where Self: ChartBase {
-    public func data(_ data: [Double]) -> some View {
-        chartData.data = data
-        return self
-            .environmentObject(chartData)
-            .environmentObject(ChartValue())
-    }
-}

Sources/SwiftUICharts/Base/Extensions/View+Extension.swift

@@ -1,7 +1,11 @@
 import SwiftUI
 
 extension View {
-    public func chartStyle(_ style: ChartStyle) -> some View {
-        self.environmentObject(style)
+    public func type<S>(_ type: S) -> some View where S: ChartType {
+        self.environment(\.chartType, AnyChartType(type))
+    }
+
+    public func style(_ style: ChartStyle) -> some View {
+        self.environment(\.chartStyle, style)
     }
 }

Sources/SwiftUICharts/Base/Grid/ChartGrid.swift

@@ -1,20 +0,0 @@
-import SwiftUI
-
-public struct ChartGrid<Content: View>: View, ChartBase {
-    public var chartData = ChartData()
-    let content: () -> Content
-
-    @EnvironmentObject var data: ChartData
-    @EnvironmentObject var style: ChartStyle
-
-    public init(@ViewBuilder content: @escaping () -> Content) {
-        self.content = content
-    }
-
-    public var body: some View {
-        ZStack{
-            self.content()
-        }
-    }
-}
-

Sources/SwiftUICharts/Base/Label/ChartLabel.swift

@@ -1,49 +1,19 @@
 import SwiftUI
 
+public enum ChartLabelSize: CGFloat {
+    case small = 16.0
+    case normal = 24.0
+    case large = 32.0
+}
+
 public enum ChartLabelType {
     case title
-    case subTitle
-    case largeTitle
-    case custom(size: CGFloat, padding: EdgeInsets, color: Color)
     case legend
 }
 
 public struct ChartLabel: View {
-    @EnvironmentObject var chartValue: ChartValue
-    @State var textToDisplay:String = ""
-
-    private var title: String
-
-    private var labelSize: CGFloat {
-        switch labelType {
-        case .title:
-            return 32.0
-        case .legend:
-            return 14.0
-        case .subTitle:
-            return 24.0
-        case .largeTitle:
-            return 38.0
-        case .custom(let size, _, _):
-            return size
-        }
-    }
-
-    private var labelPadding: EdgeInsets {
-        switch labelType {
-        case .title:
-            return EdgeInsets(top: 16.0, leading: 8.0, bottom: 0.0, trailing: 8.0)
-        case .legend:
-            return EdgeInsets(top: 4.0, leading: 8.0, bottom: 0.0, trailing: 8.0)
-        case .subTitle:
-            return EdgeInsets(top: 8.0, leading: 8.0, bottom: 0.0, trailing: 8.0)
-        case .largeTitle:
-            return EdgeInsets(top: 24.0, leading: 8.0, bottom: 0.0, trailing: 8.0)
-        case .custom(_, let padding, _):
-            return padding
-        }
-    }
-
+    private let text: String
+    private let labelSize: ChartLabelSize
     private let labelType: ChartLabelType
 
     private var labelColor: Color {
@@ -52,37 +22,22 @@ public struct ChartLabel: View {
             return .black
         case .legend:
             return .gray
-        case .subTitle:
-            return .black
-        case .largeTitle:
-            return .black
-        case .custom(_, _, let color):
-            return color
         }
     }
 
-    public init (_ title: String,
-                 type: ChartLabelType = .title) {
-        self.title = title
+    public init (_ text: String,
+                 type: ChartLabelType = .title,
+                 size: ChartLabelSize = .normal) {
+        self.text = text
         labelType = type
+        labelSize = size
     }
 
     public var body: some View {
-        HStack {
-            Text(textToDisplay)
-                .font(.system(size: labelSize))
-                .bold()
-                .foregroundColor(self.labelColor)
-                .padding(self.labelPadding)
-                .onAppear {
-                    self.textToDisplay = self.title
-                }
-                .onReceive(self.chartValue.objectWillChange) { _ in
-                    self.textToDisplay = self.chartValue.interactionInProgress ? String(format: "%.01f", self.chartValue.currentValue) : self.title
-                }
-            if !self.chartValue.interactionInProgress {
-                Spacer()
-            }
-        }
+        Text(self.text)
+            .font(.system(size: labelSize.rawValue))
+            .bold()
+            .foregroundColor(self.labelColor)
+            .padding([.top, .bottom], 16.0)
     }
 }

Sources/SwiftUICharts/Base/Style/ChartStyle.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-public class ChartStyle: ObservableObject {
+public struct ChartStyle {
 
     public let backgroundColor: ColorGradient
     public let foregroundColor: [ColorGradient]

Sources/SwiftUICharts/Charts/BarChart/BarChart.swift

@@ -1,14 +1,30 @@
 import SwiftUI
 
-public struct BarChart: View, ChartBase {
-    public var chartData = ChartData()
-
-    @EnvironmentObject var data: ChartData
-    @EnvironmentObject var style: ChartStyle
-
-    public var body: some View {
+public struct BarChart: ChartType {
+    public func makeChart(data: Self.Data, style: Self.Style) -> some View {
         BarChartRow(chartData: data, style: style)
     }
-
     public init() {}
 }
+
+struct BarChart_Previews: PreviewProvider {
+    static var previews: some View {
+        Group {
+            BarChart().makeChart(
+            data: .init([0]),
+            style: .init(backgroundColor: .white, foregroundColor: ColorGradient.redBlack))
+            Group {
+                BarChart().makeChart(
+                    data: .init([1, 2, 3, 5, 1]),
+                    style: .init(backgroundColor: .white, foregroundColor: ColorGradient.redBlack))
+            }.environment(\.colorScheme, .light)
+        
+            Group {
+                BarChart().makeChart(
+                data: .init([1, 2, 3]),
+                style: .init(backgroundColor: .white, foregroundColor: ColorGradient.redBlack))
+            }.environment(\.colorScheme, .dark)
+        
+        }
+    }
+}

Sources/SwiftUICharts/Charts/BarChart/BarChartRow.swift

@@ -1,7 +1,6 @@
 import SwiftUI
 
 public struct BarChartRow: View {
-    @EnvironmentObject var chartValue: ChartValue
     @ObservedObject var chartData: ChartData
     @State var touchLocation: CGFloat = -1.0
 
@@ -37,15 +36,9 @@ public struct BarChartRow: View {
             .padding([.top, .leading, .trailing], 10)
             .gesture(DragGesture()
                 .onChanged({ value in
-                    let width = geometry.frame(in: .local).width
-                    self.touchLocation = value.location.x/width
-                    if let currentValue = self.getCurrentValue(width: width) {
-                        self.chartValue.currentValue = currentValue
-                        self.chartValue.interactionInProgress = true
-                    }
+                    self.touchLocation = value.location.x/geometry.frame(in: .local).width
                 })
                 .onEnded({ value in
-                    self.chartValue.interactionInProgress = false
                     self.touchLocation = -1
                 })
             )
@@ -53,6 +46,7 @@ public struct BarChartRow: View {
     }
     
     func normalizedValue(index: Int) -> Double {
+        print(chartData.data[index])
         return Double(chartData.data[index])/Double(maxValue)
     }
 
@@ -63,10 +57,27 @@ public struct BarChartRow: View {
         }
         return CGSize(width: 1, height: 1)
     }
-
-    func getCurrentValue(width: CGFloat) -> Double? {
-        guard self.chartData.data.count > 0 else { return nil}
-            let index = max(0,min(self.chartData.data.count-1,Int(floor((self.touchLocation*width)/(width/CGFloat(self.chartData.data.count))))))
-            return self.chartData.data[index]
-        }
+    
 }
+
+//struct BarChartRow_Previews: PreviewProvider {
+//    static var previews: some View {
+//        Group {
+//            BarChartRow(data: [0], style: styleGreenRed)
+//            Group {
+//                BarChartRow(data: [1, 2, 3], style: styleGreenRed)
+//                BarChartRow(data: [1, 2, 3], style: styleGreenRedWhiteBlack)
+//            }
+//            Group {
+//                BarChartRow(data: [1, 2, 3], style: styleGreenRed)
+//                BarChartRow(data: [1, 2, 3], style: styleGreenRedWhiteBlack)
+//            }.environment(\.colorScheme, .dark)
+//        }
+//    }
+//}
+//
+//private let styleGreenRed = ChartStyle(backgroundColor: .white, foregroundColor: .greenRed)
+//
+//private let styleGreenRedWhiteBlack = ChartStyle(
+//    backgroundColor: ColorGradient.init(.white),
+//    foregroundColor: [ColorGradient.redBlack, ColorGradient.whiteBlack])

Sources/SwiftUICharts/Charts/LineChart/Line.swift

@@ -1,7 +1,6 @@
 import SwiftUI
 
 public struct Line: View {
-    @EnvironmentObject var chartValue: ChartValue
     @State var frame: CGRect = .zero
     @ObservedObject var chartData: ChartData
 
@@ -61,13 +60,10 @@ public struct Line: View {
                 .onChanged({ value in
                     self.touchLocation = value.location
                     self.showIndicator = true
-                    self.getClosestDataPoint(point: self.getClosestPointOnPath(touchLocation: value.location))
-                    self.chartValue.interactionInProgress = true
                 })
                 .onEnded({ value in
                     self.touchLocation = .zero
                     self.showIndicator = false
-                    self.chartValue.interactionInProgress = false
                 })
             )
         }
@@ -82,24 +78,11 @@ extension Line {
         return closest
     }
 
-    private func getClosestDataPoint(point: CGPoint) {
-        let index = Int(round((point.x)/step.x))
-        if (index >= 0 && index < self.chartData.data.count){
-            self.chartValue.currentValue = self.chartData.data[index]
-        }
-    }
-
     private func getBackgroundPathView() -> some View {
         self.closedPath
-            .fill(LinearGradient(gradient: Gradient(colors: [
-                                                        style.foregroundColor.first?.startColor ?? .white,
-                                                        style.foregroundColor.first?.endColor ?? .white,
-                                                        .white]),
-                                 startPoint: .bottom,
-                                 endPoint: .top))
+            .fill(style.backgroundColor.linearGradient(from: .bottom, to: .top))
             .rotationEffect(.degrees(180), anchor: .center)
             .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
-            .opacity(0.2)
             .transition(.opacity)
             .animation(.easeIn(duration: 1.6))
     }

Sources/SwiftUICharts/Charts/LineChart/LineChart.swift

@@ -1,14 +1,32 @@
 import SwiftUI
 
-public struct LineChart: View, ChartBase {
-    public var chartData = ChartData()
-
-    @EnvironmentObject var data: ChartData
-    @EnvironmentObject var style: ChartStyle
-
-    public var body: some View {
+public struct LineChart: ChartType {
+    public func makeChart(data: Self.Data, style: Self.Style) -> some View {
         Line(chartData: data, style: style)
     }
-    
+
     public init() {}
 }
+
+struct LineChart_Previews: PreviewProvider {
+    static var previews: some View {
+        Group {
+            LineChart().makeChart(
+            data: .init([0]),
+            style: .init(backgroundColor: .white, foregroundColor: ColorGradient(.black)))
+            Group {
+                LineChart().makeChart(
+                    data: .init([1, 2, 3, 5, 1]),
+                    style: .init(backgroundColor: .white, foregroundColor: ColorGradient(.black)))
+            }.environment(\.colorScheme, .light)
+        
+            Group {
+                LineChart().makeChart(
+                data: .init([1, 2, 3]),
+                style: .init(backgroundColor: .white, foregroundColor: ColorGradient.redBlack))
+            }.environment(\.colorScheme, .dark)
+        
+        }
+        
+    }
+}

Sources/SwiftUICharts/Charts/PieChart/PieChart.swift

@@ -1,14 +1,63 @@
+//
+//  PieChart.swift
+//  SwiftUICharts
+//
+//  Created by Nicolas Savoini on 2020-05-24.
+//
+
 import SwiftUI
 
-public struct PieChart: View, ChartBase {
-    public var chartData = ChartData()
-
-    @EnvironmentObject var data: ChartData
-    @EnvironmentObject var style: ChartStyle
-
-    public var body: some View {
+public struct PieChart: ChartType {
+    public func makeChart(data: Self.Data, style: Self.Style) -> some View {
         PieChartRow(chartData: data, style: style)
     }
-
     public init() {}
 }
+
+struct PieChart_Previews: PreviewProvider {
+    static var previews: some View {
+        Group {
+            PieChart().makeChart(
+                data: .init([0]),
+            style: styleOneColor)
+            
+            Group {
+                PieChart().makeChart(
+                    data: .init([56, 78, 53, 65, 54]),
+                style: styleOneColor)
+                PieChart().makeChart(
+                    data: .init([56, 78, 53, 65, 54]),
+                style: styleTwoColor)
+                PieChart().makeChart(
+                    data: .init([1, 1, 1, 1, 1, 1]),
+                style: trivialPursuit)
+            }.environment(\.colorScheme, .light)
+            
+            Group {
+                PieChart().makeChart(
+                    data: .init([56, 78, 53, 65, 54]),
+                style: styleOneColor)
+                PieChart().makeChart(
+                    data: .init([56, 78, 53, 65, 54]),
+                style: styleTwoColor)
+                PieChart().makeChart(
+                    data: .init([1, 1, 1, 1, 1, 1]),
+                style: trivialPursuit)
+            }.environment(\.colorScheme, .dark)
+            
+        }.previewLayout(.fixed(width: 250, height: 400))
+    }
+}
+
+private let styleOneColor = ChartStyle(backgroundColor: .white, foregroundColor: ColorGradient.init(.pink))
+
+private let styleTwoColor = ChartStyle(backgroundColor: ColorGradient(.black), foregroundColor: [ColorGradient(.yellow), ColorGradient(.red)])
+
+private let trivialPursuit = ChartStyle(
+    backgroundColor: .yellow,
+    foregroundColor: [ColorGradient(.yellow),
+                      ColorGradient(.pink),
+                      ColorGradient(.green),
+                      ColorGradient(.primary),
+                      ColorGradient(.blue),
+                      ColorGradient(.orange)])

Sources/SwiftUICharts/Environment/Environment.swift

@@ -0,0 +1,21 @@
+import SwiftUI
+
+extension EnvironmentValues {
+    var chartType: AnyChartType {
+        get {
+            return self[ChartTypeKey.self]
+        }
+        set {
+            self[ChartTypeKey.self] = newValue
+        }
+    }
+
+    var chartStyle: ChartStyle {
+        get {
+            return self[ChartStyleKey.self]
+        }
+        set {
+            self[ChartStyleKey.self] = newValue
+        }
+    }
+}

Sources/SwiftUICharts/Environment/EnvironmentKeys.swift

@@ -0,0 +1,11 @@
+import SwiftUI
+
+struct ChartTypeKey: EnvironmentKey {
+    static let defaultValue: AnyChartType = AnyChartType(BarChart())
+}
+
+struct ChartStyleKey: EnvironmentKey {
+    static let defaultValue: ChartStyle = ChartStyle(backgroundColor: .white,
+                                                     foregroundColor: ColorGradient(ChartColors.orangeDark,
+                                                                                    ChartColors.orangeBright))
+}