feat(core): refactoring chart dispalying#191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AppPear merged 1 commit into from
Jun 9, 2021
Merged

feat(core): refactoring chart dispalying #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added...code/package.xcworkspace/xcuserdata/samuandris.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions .swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line numberDiff line numberDiff 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
Open in desktop
Original file line numberDiff line numberDiff 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
Open in desktop
Original file line numberDiff line numberDiff 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
Open in desktop
Original file line numberDiff line numberDiff 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
Open in desktop
Original file line numberDiff line numberDiff 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
Open in desktop
Original file line numberDiff line numberDiff 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
Open in desktop
Original file line numberDiff line numberDiff 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
Open in desktop
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(core): refactoring chart dispalying#191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AppPear
merged 1 commit into

from

Jun 9, 2021
 Merged


feat(core): refactoring chart dispalying
#191
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view

Binary file added...code/package.xcworkspace/xcuserdata/samuandris.xcuserdatad/UserInterfaceState.xcuserstate

View file


Open in desktop


Binary file not shown.


6 changes: 6 additions & 0 deletions
.swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

View file


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(core): refactoring chart dispalying#191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AppPear
merged 1 commit into

from

Jun 9, 2021
 Merged


feat(core): refactoring chart dispalying
#191
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view

Binary file added...code/package.xcworkspace/xcuserdata/samuandris.xcuserdatad/UserInterfaceState.xcuserstate

View file


Open in desktop


Binary file not shown.


6 changes: 6 additions & 0 deletions
.swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

View file


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(core): refactoring chart dispalying#191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AppPear
merged 1 commit into

from

Jun 9, 2021
 Merged


feat(core): refactoring chart dispalying
#191
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view

Binary file added...code/package.xcworkspace/xcuserdata/samuandris.xcuserdatad/UserInterfaceState.xcuserstate

View file


Open in desktop


Binary file not shown.


6 changes: 6 additions & 0 deletions
.swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

View file


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(core): refactoring chart dispalying#191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AppPear
merged 1 commit into

from

Jun 9, 2021
 Merged


feat(core): refactoring chart dispalying
#191
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view

Binary file added...code/package.xcworkspace/xcuserdata/samuandris.xcuserdatad/UserInterfaceState.xcuserstate

View file


Open in desktop


Binary file not shown.


6 changes: 6 additions & 0 deletions
.swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

View file


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(core): refactoring chart dispalying#191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AppPear
merged 1 commit into

from

Jun 9, 2021
 Merged


feat(core): refactoring chart dispalying
#191
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view

Binary file added...code/package.xcworkspace/xcuserdata/samuandris.xcuserdatad/UserInterfaceState.xcuserstate

View file


Open in desktop


Binary file not shown.


6 changes: 6 additions & 0 deletions
.swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

View file


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(core): refactoring chart dispalying#191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AppPear
merged 1 commit into

from

Jun 9, 2021
 Merged


feat(core): refactoring chart dispalying
#191
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view

Binary file added...code/package.xcworkspace/xcuserdata/samuandris.xcuserdatad/UserInterfaceState.xcuserstate

View file


Open in desktop


Binary file not shown.


6 changes: 6 additions & 0 deletions
.swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

View file


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(core): refactoring chart dispalying#191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AppPear
merged 1 commit into

from

Jun 9, 2021
 Merged


feat(core): refactoring chart dispalying
#191
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view

Binary file added...code/package.xcworkspace/xcuserdata/samuandris.xcuserdatad/UserInterfaceState.xcuserstate

View file


Open in desktop


Binary file not shown.


6 changes: 6 additions & 0 deletions
.swiftpm/xcode/xcuserdata/samuandris.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

View file


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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


Open in desktop

Original file line numberDiff line numberDiff 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