Skip to content

Commit

Permalink
feat(core): refactoring chart dispalying (#191)
Browse files Browse the repository at this point in the history 
now it is possible to add background lines precisely as charts are displayed at correct size
also rewrote basics to conform with Shapes and Animatable protocol
  • Loading branch information
@AppPear
AppPear committed Jun 9, 2021
1 parent 84578d2 commit 7861bbc
Show file tree
Hide file tree
Showing 15 changed files with 292 additions and 194 deletions.
Binary file added ...code/package.xcworkspace/xcuserdata/samuandris.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions .swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "91E23D30-CB6C-44DA-BEFC-9D39A1DA2242"
type = "1"
version = "2.0">
</Bucket>
15 changes: 14 additions & 1 deletion .swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,20 @@
<key>SwiftUICharts.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>SwiftUICharts</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>SwiftUIChartsTests</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
Expand Down
16 changes: 14 additions & 2 deletions Sources/SwiftUICharts/Base/Chart/ChartData.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,20 @@ public class ChartData: ObservableObject {
data.map { $0.0 }
}

/// Initialize with data array
/// - Parameter data: Array of `Double`
var normalisedPoints: [Double] {
points.map { $0 / (points.max() ?? 1.0) }
}

var normalisedRange: Double {
(normalisedPoints.max() ?? 0.0) - (normalisedPoints.min() ?? 0.0)
}

var isInNegativeDomain: Bool {
(points.min() ?? 0.0) < 0
}

/// Initialize with data array
/// - Parameter data: Array of `Double`
public init(_ data: [Double]) {
self.data = data.map { ("", $0) }
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftUICharts/Base/Extensions/CGPoint+Extension.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ extension CGPoint {
/// - data: array of `Double`
/// - Returns: X and Y delta as a `CGPoint`
static func getStep(frame: CGRect, data: [Double]) -> CGPoint {
let padding: CGFloat = 30.0
let padding: CGFloat = 0

// stepWidth
var stepWidth: CGFloat = 0.0
Expand Down
43 changes: 35 additions & 8 deletions Sources/SwiftUICharts/Base/Grid/ChartGrid.swift
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,52 @@
import SwiftUI

/// <#Description#>
public struct ChartGrid<Content: View>: View, ChartBase {
public var chartData = ChartData()
let content: () -> Content
let numberOfHorizontalLines = 4

@EnvironmentObject var data: ChartData
@EnvironmentObject var style: ChartStyle

/// <#Description#>
/// - Parameter content: <#content description#>
public init(@ViewBuilder content: @escaping () -> Content) {
self.content = content
}

/// The content and behavior of the `ChartGrid`.
///
/// TODO: Explain why this is in a `ZStack`
public var body: some View {
ZStack{
self.content()
HStack {
ZStack {
VStack {
ForEach(0..<numberOfHorizontalLines) { _ in
GridElement()
Spacer()
}
}
self.content()
}
}
}
}

struct GridElement: View {
var body: some View {
DashedLine()
.frame(maxHeight: 2, alignment: .center)
}
}

struct DashedLine: View {
func line(frame: CGRect) -> Path {
let baseLine: CGFloat = CGFloat(frame.height / 2)
var hLine = Path()
hLine.move(to: CGPoint(x:0, y: baseLine))
hLine.addLine(to: CGPoint(x: frame.width, y: baseLine))
return hLine
}

var body: some View {
GeometryReader { geometry in
line(frame: geometry.frame(in: .local))
.stroke(Color(white: 0.3), style: StrokeStyle(lineWidth: 1, lineCap: .round, dash: [5, 10]))
}
}
}
Expand Down
41 changes: 13 additions & 28 deletions Sources/SwiftUICharts/Charts/BarChart/BarChartCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,17 @@ import SwiftUI
public struct BarChartCell: View {
var value: Double
var index: Int = 0
var width: Float
var numberOfDataPoints: Int
var gradientColor: ColorGradient
var touchLocation: CGFloat

var cellWidth: Double {
return Double(width)/(Double(numberOfDataPoints) * 1.5)
}

@State private var firstDisplay: Bool = true
@State private var didCellAppear: Bool = false

public init( value: Double,
index: Int = 0,
width: Float,
numberOfDataPoints: Int,
gradientColor: ColorGradient,
touchLocation: CGFloat) {
self.value = value
self.index = index
self.width = width
self.numberOfDataPoints = numberOfDataPoints
self.gradientColor = gradientColor
self.touchLocation = touchLocation
}
Expand All @@ -33,38 +23,33 @@ public struct BarChartCell: View {
///
/// Animated when first displayed, using the `firstDisplay` variable, with an increasing delay through the data set.
public var body: some View {
ZStack {
RoundedRectangle(cornerRadius: 4)
.fill(gradientColor.linearGradient(from: .bottom, to: .top))
}
.frame(width: CGFloat(self.cellWidth))
.scaleEffect(CGSize(width: 1, height: self.firstDisplay ? 0.0 : self.value), anchor: .bottom)
.onAppear {
self.firstDisplay = false
BarChartCellShape(value: didCellAppear ? value : 0.0)
.fill(gradientColor.linearGradient(from: .bottom, to: .top)) .onAppear {
self.didCellAppear = true
}
.onDisappear {
self.firstDisplay = true
self.didCellAppear = false
}
.transition(.slide)
.animation(Animation.spring().delay(self.touchLocation < 0 || !firstDisplay ? Double(self.index) * 0.04 : 0))
.animation(Animation.spring().delay(self.touchLocation < 0 || !didCellAppear ? Double(self.index) * 0.04 : 0))
}
}

struct BarChartCell_Previews: PreviewProvider {
static var previews: some View {
Group {
Group {
BarChartCell(value: 0, width: 50, numberOfDataPoints: 1, gradientColor: ColorGradient.greenRed, touchLocation: CGFloat())
BarChartCell(value: 0, gradientColor: ColorGradient.greenRed, touchLocation: CGFloat())

BarChartCell(value: 1, width: 50, numberOfDataPoints: 1, gradientColor: ColorGradient.greenRed, touchLocation: CGFloat())
BarChartCell(value: 1, width: 50, numberOfDataPoints: 1, gradientColor: ColorGradient.whiteBlack, touchLocation: CGFloat())
BarChartCell(value: 1, width: 50, numberOfDataPoints: 1, gradientColor: ColorGradient(.purple), touchLocation: CGFloat())
BarChartCell(value: 0.5, gradientColor: ColorGradient.greenRed, touchLocation: CGFloat())
BarChartCell(value: 0.75, gradientColor: ColorGradient.whiteBlack, touchLocation: CGFloat())
BarChartCell(value: 1, gradientColor: ColorGradient(.purple), touchLocation: CGFloat())
}

Group {
BarChartCell(value: 1, width: 50, numberOfDataPoints: 1, gradientColor: ColorGradient.greenRed, touchLocation: CGFloat())
BarChartCell(value: 1, width: 50, numberOfDataPoints: 1, gradientColor: ColorGradient.whiteBlack, touchLocation: CGFloat())
BarChartCell(value: 1, width: 50, numberOfDataPoints: 1, gradientColor: ColorGradient(.purple), touchLocation: CGFloat())
BarChartCell(value: 1, gradientColor: ColorGradient.greenRed, touchLocation: CGFloat())
BarChartCell(value: 1, gradientColor: ColorGradient.whiteBlack, touchLocation: CGFloat())
BarChartCell(value: 1, gradientColor: ColorGradient(.purple), touchLocation: CGFloat())
}.environment(\.colorScheme, .dark)
}
}
Expand Down
44 changes: 44 additions & 0 deletions Sources/SwiftUICharts/Charts/BarChart/BarChartCellShape.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import SwiftUI

struct BarChartCellShape: Shape, Animatable {
var value: Double
var cornerRadius: CGFloat = 6.0
var animatableData: CGFloat {
get { CGFloat(value) }
set { value = Double(newValue) }
}

func path(in rect: CGRect) -> Path {
let adjustedOriginY = rect.height - (rect.height * CGFloat(value))
var path = Path()
path.move(to: CGPoint(x: 0.0 , y: rect.height))
path.addLine(to: CGPoint(x: 0.0, y: adjustedOriginY + cornerRadius))
path.addArc(center: CGPoint(x: cornerRadius, y: adjustedOriginY + cornerRadius),
radius: cornerRadius,
startAngle: Angle(radians: Double.pi),
endAngle: Angle(radians: -Double.pi/2),
clockwise: false)
path.addLine(to: CGPoint(x: rect.width - cornerRadius, y: adjustedOriginY))
path.addArc(center: CGPoint(x: rect.width - cornerRadius, y: adjustedOriginY + cornerRadius),
radius: cornerRadius,
startAngle: Angle(radians: -Double.pi/2),
endAngle: Angle(radians: 0),
clockwise: false)
path.addLine(to: CGPoint(x: rect.width, y: rect.height))
path.closeSubpath()

return path
}
}

struct BarChartCellShape_Previews: PreviewProvider {
static var previews: some View {
Group {
BarChartCellShape(value: 0.75)
.fill(Color.red)

BarChartCellShape(value: 0.3)
.fill(Color.blue)
}
}
}
31 changes: 13 additions & 18 deletions Sources/SwiftUICharts/Charts/BarChart/BarChartRow.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ public struct BarChartRow: View {
@ObservedObject var chartData: ChartData
@State private var touchLocation: CGFloat = -1.0

enum Constant {
static let spacing: CGFloat = 16.0
}

var style: ChartStyle

var maxValue: Double {
Expand All @@ -27,20 +23,18 @@ public struct BarChartRow: View {
public var body: some View {
GeometryReader { geometry in
HStack(alignment: .bottom,
spacing: (geometry.frame(in: .local).width - Constant.spacing) / CGFloat(self.chartData.data.count * 3)) {
ForEach(0..<self.chartData.data.count, id: \.self) { index in
BarChartCell(value: self.normalizedValue(index: index),
spacing: geometry.frame(in: .local).width / CGFloat(chartData.data.count * 3)) {
ForEach(0..<chartData.data.count, id: \.self) { index in
BarChartCell(value: chartData.normalisedPoints[index],
index: index,
width: Float(geometry.frame(in: .local).width - Constant.spacing),
numberOfDataPoints: self.chartData.data.count,
gradientColor: self.style.foregroundColor.rotate(for: index),
touchLocation: self.touchLocation)
.scaleEffect(self.getScaleSize(touchLocation: self.touchLocation, index: index), anchor: .bottom)
.animation(Animation.easeIn(duration: 0.2))
}
// .drawingGroup()
// .drawingGroup()
}
.padding([.top, .leading, .trailing], 10)
.frame(maxHeight: chartData.isInNegativeDomain ? geometry.size.height / 2 : geometry.size.height)
.gesture(DragGesture()
.onChanged({ value in
let width = geometry.frame(in: .local).width
Expand All @@ -58,13 +52,6 @@ public struct BarChartRow: View {
}
}

/// Value relative to maximum value
/// - Parameter index: index into array of data
/// - Returns: data value at given index, divided by data maximum
func normalizedValue(index: Int) -> Double {
return Double(chartData.points[index])/Double(maxValue)
}

/// Size to scale the touch indicator
/// - Parameters:
/// - touchLocation: fraction of width where touch is happening
Expand All @@ -87,3 +74,11 @@ public struct BarChartRow: View {
return self.chartData.points[index]
}
}

struct BarChartRow_Previews: PreviewProvider {
static let chartData = ChartData([6, 2, 5, 8, 6])
static let chartStyle = ChartStyle(backgroundColor: .white, foregroundColor: .orangeBright)
static var previews: some View {
BarChartRow(chartData: chartData, style: chartStyle)
}
}
Loading

0 comments on commit 7861bbc

Please sign in to comment.