feat: add new axis interface#253

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
Oct 24, 2022
Merged

feat: add new axis interface #253

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
104 changes: 81 additions & 23 deletions Sources/SwiftUICharts/Base/Axis/AxisLabels.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,98 @@
import SwiftUI

public struct AxisLabels<Content: View>: View {
struct YAxisViewKey: ViewPreferenceKey { }
struct ChartViewKey: ViewPreferenceKey { }

var axisLabelsData = AxisLabelsData()
var axisLabelsStyle = AxisLabelsStyle()

@State private var yAxisWidth: CGFloat = 25
@State private var chartWidth: CGFloat = 0
@State private var chartHeight: CGFloat = 0

let content: () -> Content
// font
// foregroundColor

public init(@ViewBuilder content: @escaping () -> Content) {
self.content = content
}

var yAxis: some View {
VStack(spacing: 0.0) {
ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
Text(axisYData)
.font(axisLabelsStyle.axisFont)
.foregroundColor(axisLabelsStyle.axisFontColor)
.frame(height: getYHeight(index: index,
chartHeight: chartHeight,
count: axisLabelsData.axisYLabels.count),
alignment: getYAlignment(index: index, count: axisLabelsData.axisYLabels.count))
}
}
.padding([.leading, .trailing], 4.0)
.background(ViewGeometry<YAxisViewKey>())
.onPreferenceChange(YAxisViewKey.self) { value in
yAxisWidth = value.first?.size.width ?? 0.0
}
}

func xAxis(chartWidth: CGFloat) -> some View {
HStack(spacing: 0.0) {
ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
Text(axisXData)
.font(axisLabelsStyle.axisFont)
.foregroundColor(axisLabelsStyle.axisFontColor)
.frame(width: chartWidth / CGFloat(axisLabelsData.axisXLabels.count - 1))
}
}
.frame(height: 24.0, alignment: .top)
}

var chart: some View {
self.content()
.background(ViewGeometry<ChartViewKey>())
.onPreferenceChange(ChartViewKey.self) { value in
chartWidth = value.first?.size.width ?? 0.0
chartHeight = value.first?.size.height ?? 0.0
}
}

public var body: some View {
HStack {
VStack {
ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
Text(axisYData)
if index != axisLabelsData.axisYLabels.count - 1 {
Spacer()
}
VStack(spacing: 0.0) {
HStack {
if axisLabelsStyle.axisLabelsYPosition == .leading {
yAxis
} else {
Spacer(minLength: yAxisWidth)
}
}
.padding([.trailing], 8.0)
.padding([.bottom], axisLabelsData.axisXLabels.count > 0 ? 28.0 : 0)
.frame(maxHeight: .infinity)
VStack {
self.content()
HStack {
ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
Text(axisXData)
if index != axisLabelsData.axisXLabels.count - 1 {
Spacer()
}
}
chart
if axisLabelsStyle.axisLabelsYPosition == .leading {
Spacer(minLength: yAxisWidth)
} else {
yAxis
}
}
.padding([.top, .bottom], 10.0)
xAxis(chartWidth: chartWidth)
}
}

private func getYHeight(index: Int, chartHeight: CGFloat, count: Int) -> CGFloat {
if index == 0 || index == count - 1 {
return chartHeight / (CGFloat(count - 1) * 2) + 10
}

return chartHeight / CGFloat(count - 1)
}

private func getYAlignment(index: Int, count: Int) -> Alignment {
if index == 0 {
return .top
}

if index == count - 1 {
return .bottom
}

return .center
}
}
46 changes: 45 additions & 1 deletion Sources/SwiftUICharts/Base/Axis/Extension/AxisLabels+Extension.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,57 @@
import SwiftUI

extension AxisLabels {
public func setAxisYLabels(_ labels: [String]) -> AxisLabels {
public func setAxisYLabels(_ labels: [String],
position: AxisLabelsYPosition = .leading) -> AxisLabels {
self.axisLabelsData.axisYLabels = labels
self.axisLabelsStyle.axisLabelsYPosition = position
return self
}

public func setAxisXLabels(_ labels: [String]) -> AxisLabels {
self.axisLabelsData.axisXLabels = labels
return self
}

public func setAxisYLabels(_ labels: [(Double, String)],
range: ClosedRange<Int>,
position: AxisLabelsYPosition = .leading) -> AxisLabels {
let overreach = range.overreach + 1
var labelArray = [String](repeating: "", count: overreach)
labels.forEach {
let index = Int($0.0) - range.lowerBound
if labelArray[safe: index] != nil {
labelArray[index] = $0.1
}
}

self.axisLabelsData.axisYLabels = labelArray
self.axisLabelsStyle.axisLabelsYPosition = position

return self
}

public func setAxisXLabels(_ labels: [(Double, String)], range: ClosedRange<Int>) -> AxisLabels {
let overreach = range.overreach + 1
var labelArray = [String](repeating: "", count: overreach)
labels.forEach {
let index = Int($0.0) - range.lowerBound
if labelArray[safe: index] != nil {
labelArray[index] = $0.1
}
}

self.axisLabelsData.axisXLabels = labelArray
return self
}

public func setColor(_ color: Color) -> AxisLabels {
self.axisLabelsStyle.axisFontColor = color
return self
}

public func setFont(_ font: Font) -> AxisLabels {
self.axisLabelsStyle.axisFont = font
return self
}
}
11 changes: 11 additions & 0 deletions Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsPosition.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

public enum AxisLabelsYPosition {
case leading
case trailing
}

public enum AxisLabelsXPosition {
case top
case bottom
}
11 changes: 11 additions & 0 deletions Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsStyle.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import SwiftUI

public final class AxisLabelsStyle: ObservableObject {
@Published public var axisFont: Font = .callout
@Published public var axisFontColor: Color = .primary
@Published var axisLabelsYPosition: AxisLabelsYPosition = .leading
@Published var axisLabelsXPosition: AxisLabelsXPosition = .bottom
public init() {
// no-op
}
}
10 changes: 10 additions & 0 deletions Sources/SwiftUICharts/Base/Common/ViewGeometry.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import SwiftUI

public struct ViewGeometry<T>: View where T: PreferenceKey {
public var body: some View {
GeometryReader { geometry in
Color.clear
.preference(key: T.self, value: [ViewSizeData(size: geometry.size)] as! T.Value)
}
}
}
15 changes: 15 additions & 0 deletions Sources/SwiftUICharts/Base/Common/ViewPreferenceKey.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import SwiftUI

public protocol ViewPreferenceKey: PreferenceKey {
typealias Value = [ViewSizeData]
}

public extension ViewPreferenceKey {
static var defaultValue: [ViewSizeData] {
[]
}

static func reduce(value: inout [ViewSizeData], nextValue: () -> [ViewSizeData]) {
value.append(contentsOf: nextValue())
}
}
14 changes: 14 additions & 0 deletions Sources/SwiftUICharts/Base/Common/ViewSizeData.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import SwiftUI

public struct ViewSizeData: Identifiable, Equatable, Hashable {
public let id: UUID = UUID()
public let size: CGSize

public static func == (lhs: Self, rhs: Self) -> Bool {
return lhs.id == rhs.id
}

public func hash(into hasher: inout Hasher) {
hasher.combine(id)
}
}
7 changes: 7 additions & 0 deletions Sources/SwiftUICharts/Base/Extensions/Array+Extension.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,3 +17,10 @@ extension Array where Element == ColorGradient {
return self[index]
}
}

extension Collection {
/// Returns the element at the specified index if it is within bounds, otherwise nil.
subscript (safe index: Index) -> Element? {
return indices.contains(index) ? self[index] : nil
}
}
12 changes: 7 additions & 5 deletions Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,15 +150,17 @@ extension Path {

static func drawChartMarkers(data: [(Double, Double)], in rect: CGRect) -> Path {
var path = Path()
if data.count < 1 {
let filteredData = data.filter { $0.1 <= 1 && $0.1 >= 0 }

if filteredData.count < 1 {
return path
}

let convertedXValues = data.map { CGFloat($0.0) * rect.width }
let convertedYPoints = data.map { CGFloat($0.1) * rect.height }
let convertedXValues = filteredData.map { CGFloat($0.0) * rect.width }
let convertedYPoints = filteredData.map { CGFloat($0.1) * rect.height }

let markerSize = CGSize(width: 8, height: 8)
for pointIndex in 0..<data.count {
for pointIndex in 0..<filteredData.count {
path.addRoundedRect(in: CGRect(origin: CGPoint(x: convertedXValues[pointIndex] - markerSize.width / 2,
y: convertedYPoints[pointIndex] - markerSize.height / 2),
size: markerSize),
Expand DownExpand Up@@ -199,7 +201,7 @@ extension Path {
let convertedXValues = data.map { CGFloat($0.0) * rect.width }
let convertedYPoints = data.map { CGFloat($0.1) * rect.height }

path.move(to: .zero)
path.move(to: CGPoint(x: convertedXValues[0], y: 0))
var point1 = CGPoint(x: convertedXValues[0], y: convertedYPoints[0])
path.addLine(to: point1)
for pointIndex in 1..<data.count {
Expand Down
7 changes: 4 additions & 3 deletions Sources/SwiftUICharts/Charts/LineChart/Extension/LineChart+Extension.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,13 +6,14 @@ extension LineChart {
return self
}

public func showBackground(_ show: Bool) -> LineChart {
self.chartProperties.showBackground = show
public func setBackground(colorGradient: ColorGradient) -> LineChart {
self.chartProperties.backgroundGradient = colorGradient
return self
}

public func showChartMarks(_ show: Bool) -> LineChart {
public func showChartMarks(_ show: Bool, with color: ColorGradient? = nil) -> LineChart {
self.chartProperties.showChartMarks = show
self.chartProperties.customChartMarksColors = color
return self
}

Expand Down
34 changes: 15 additions & 19 deletions Sources/SwiftUICharts/Charts/LineChart/Line.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import SwiftUI

/// A single line of data, a view in a `LineChart`
public struct Line: View {
@EnvironmentObject var chartValue: ChartValue
@ObservedObject var chartData: ChartData
@ObservedObject var chartProperties: LineChartProperties

Expand All@@ -29,17 +28,17 @@ public struct Line: View {
public var body: some View {
GeometryReader { geometry in
ZStack {
if self.didCellAppear && self.chartProperties.showBackground {
if self.didCellAppear, let backgroundColor = chartProperties.backgroundGradient {
LineBackgroundShapeView(chartData: chartData,
geometry: geometry,
style: style)
backgroundColor: backgroundColor)
}
LineShapeView(chartData: chartData,
chartProperties: chartProperties,
geometry: geometry,
style: style,
trimTo: didCellAppear ? 1.0 : 0.0)
.animation(.easeIn)
.animation(Animation.easeIn(duration: 0.75))
if self.showIndicator {
IndicatorPoint()
.position(self.getClosestPointOnPath(geometry: geometry,
Expand All@@ -54,20 +53,17 @@ public struct Line: View {
.onDisappear() {
didCellAppear = false
}

.gesture(DragGesture()
.onChanged({ value in
self.touchLocation = value.location
self.showIndicator = true
self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
self.chartValue.interactionInProgress = true
})
.onEnded({ value in
self.touchLocation = .zero
self.showIndicator = false
self.chartValue.interactionInProgress = false
})
)
// .gesture(DragGesture()
// .onChanged({ value in
// self.touchLocation = value.location
// self.showIndicator = true
// self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
// })
// .onEnded({ value in
// self.touchLocation = .zero
// self.showIndicator = false
// })
// )
}
}
}
Expand All@@ -94,7 +90,7 @@ extension Line {
let geometryWidth = geometry.frame(in: .local).width
let index = Int(round((touchLocation.x / geometryWidth) * CGFloat(chartData.points.count - 1)))
if (index >= 0 && index < self.chartData.data.count){
self.chartValue.currentValue = self.chartData.points[index]
// self.chartValue.currentValue = self.chartData.points[index]
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/SwiftUICharts/Charts/LineChart/LineBackgroundShapeView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@ import SwiftUI
struct LineBackgroundShapeView: View {
var chartData: ChartData
var geometry: GeometryProxy
var style: ChartStyle
var backgroundColor: ColorGradient

var body: some View {
LineBackgroundShape(data: chartData.normalisedData)
.fill(LinearGradient(gradient: Gradient(colors: [style.backgroundColor.startColor,
style.foregroundColor.first?.startColor ?? .white]),
.fill(LinearGradient(gradient: Gradient(colors: [backgroundColor.startColor,
backgroundColor.endColor]),
startPoint: .bottom,
endPoint: .top))
.rotationEffect(.degrees(180), anchor: .center)
Expand Down
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: add new axis interface#253

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

Oct 24, 2022
 Merged


feat: add new axis interface
#253
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


104 changes: 81 additions & 23 deletions
Sources/SwiftUICharts/Base/Axis/AxisLabels.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,40 +1,98 @@
import SwiftUI

public struct AxisLabels<Content: View>: View {
 struct YAxisViewKey: ViewPreferenceKey { }
 struct ChartViewKey: ViewPreferenceKey { }

 var axisLabelsData = AxisLabelsData()
 var axisLabelsStyle = AxisLabelsStyle()

 @State private var yAxisWidth: CGFloat = 25
 @State private var chartWidth: CGFloat = 0
 @State private var chartHeight: CGFloat = 0

 let content: () -> Content
 // font
 // foregroundColor

 public init(@ViewBuilder content: @escaping () -> Content) {
 self.content = content
 }

 var yAxis: some View {
 VStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(height: getYHeight(index: index,
 chartHeight: chartHeight,
 count: axisLabelsData.axisYLabels.count),
 alignment: getYAlignment(index: index, count: axisLabelsData.axisYLabels.count))
 }
 }
 .padding([.leading, .trailing], 4.0)
 .background(ViewGeometry<YAxisViewKey>())
 .onPreferenceChange(YAxisViewKey.self) { value in
 yAxisWidth = value.first?.size.width ?? 0.0
 }
 }

 func xAxis(chartWidth: CGFloat) -> some View {
 HStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(width: chartWidth / CGFloat(axisLabelsData.axisXLabels.count - 1))
 }
 }
 .frame(height: 24.0, alignment: .top)
 }

 var chart: some View {
 self.content()
 .background(ViewGeometry<ChartViewKey>())
 .onPreferenceChange(ChartViewKey.self) { value in
 chartWidth = value.first?.size.width ?? 0.0
 chartHeight = value.first?.size.height ?? 0.0
 }
 }

 public var body: some View {
 HStack {
 VStack {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 if index != axisLabelsData.axisYLabels.count - 1 {
 Spacer()
 }
 VStack(spacing: 0.0) {
 HStack {
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 yAxis
 } else {
 Spacer(minLength: yAxisWidth)
 }
 }
 .padding([.trailing], 8.0)
 .padding([.bottom], axisLabelsData.axisXLabels.count > 0 ? 28.0 : 0)
 .frame(maxHeight: .infinity)
 VStack {
 self.content()
 HStack {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 if index != axisLabelsData.axisXLabels.count - 1 {
 Spacer()
 }
 }
 chart
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 Spacer(minLength: yAxisWidth)
 } else {
 yAxis
 }
 }
.padding([.top, .bottom], 10.0)
xAxis(chartWidth: chartWidth)
 }
 }

 private func getYHeight(index: Int, chartHeight: CGFloat, count: Int) -> CGFloat {
 if index == 0 || index == count - 1 {
 return chartHeight / (CGFloat(count - 1) * 2) + 10
 }

 return chartHeight / CGFloat(count - 1)
 }

 private func getYAlignment(index: Int, count: Int) -> Alignment {
 if index == 0 {
 return .top
 }

 if index == count - 1 {
 return .bottom
 }

 return .center
 }
}

46 changes: 45 additions & 1 deletion
Sources/SwiftUICharts/Base/Axis/Extension/AxisLabels+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,57 @@
import SwiftUI

extension AxisLabels {
 public func setAxisYLabels(_ labels: [String]) -> AxisLabels {
 public func setAxisYLabels(_ labels: [String],
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 self.axisLabelsData.axisYLabels = labels
 self.axisLabelsStyle.axisLabelsYPosition = position
 return self
 }

 public func setAxisXLabels(_ labels: [String]) -> AxisLabels {
 self.axisLabelsData.axisXLabels = labels
 return self
 }

 public func setAxisYLabels(_ labels: [(Double, String)],
 range: ClosedRange<Int>,
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisYLabels = labelArray
 self.axisLabelsStyle.axisLabelsYPosition = position

 return self
 }

 public func setAxisXLabels(_ labels: [(Double, String)], range: ClosedRange<Int>) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisXLabels = labelArray
 return self
 }

 public func setColor(_ color: Color) -> AxisLabels {
 self.axisLabelsStyle.axisFontColor = color
 return self
 }

 public func setFont(_ font: Font) -> AxisLabels {
 self.axisLabelsStyle.axisFont = font
 return self
 }
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsPosition.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

public enum AxisLabelsYPosition {
 case leading
 case trailing
}

public enum AxisLabelsXPosition {
 case top
 case bottom
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsStyle.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import SwiftUI

public final class AxisLabelsStyle: ObservableObject {
 @Published public var axisFont: Font = .callout
 @Published public var axisFontColor: Color = .primary
 @Published var axisLabelsYPosition: AxisLabelsYPosition = .leading
 @Published var axisLabelsXPosition: AxisLabelsXPosition = .bottom
 public init() {
 // no-op
 }
}

10 changes: 10 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewGeometry.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import SwiftUI

public struct ViewGeometry<T>: View where T: PreferenceKey {
 public var body: some View {
 GeometryReader { geometry in
 Color.clear
 .preference(key: T.self, value: [ViewSizeData(size: geometry.size)] as! T.Value)
 }
 }
}

15 changes: 15 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewPreferenceKey.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import SwiftUI

public protocol ViewPreferenceKey: PreferenceKey {
 typealias Value = [ViewSizeData]
}

public extension ViewPreferenceKey {
 static var defaultValue: [ViewSizeData] {
 []
 }

 static func reduce(value: inout [ViewSizeData], nextValue: () -> [ViewSizeData]) {
 value.append(contentsOf: nextValue())
 }
}

14 changes: 14 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewSizeData.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import SwiftUI

public struct ViewSizeData: Identifiable, Equatable, Hashable {
 public let id: UUID = UUID()
 public let size: CGSize

 public static func == (lhs: Self, rhs: Self) -> Bool {
 return lhs.id == rhs.id
 }

 public func hash(into hasher: inout Hasher) {
 hasher.combine(id)
 }
}

7 changes: 7 additions & 0 deletions
Sources/SwiftUICharts/Base/Extensions/Array+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,3 +17,10 @@ extension Array where Element == ColorGradient {
 return self[index]
 }
}

extension Collection {
 /// Returns the element at the specified index if it is within bounds, otherwise nil.
 subscript (safe index: Index) -> Element? {
 return indices.contains(index) ? self[index] : nil
 }
}

12 changes: 7 additions & 5 deletions
Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,15 +150,17 @@ extension Path {

 static func drawChartMarkers(data: [(Double, Double)], in rect: CGRect) -> Path {
 var path = Path()
 if data.count < 1 {
 let filteredData = data.filter { $0.1 <= 1 && $0.1 >= 0 }

 if filteredData.count < 1 {
 return path
 }

 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }
 let convertedXValues = filteredData.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = filteredData.map { CGFloat($0.1) * rect.height }

 let markerSize = CGSize(width: 8, height: 8)
 for pointIndex in 0..<data.count {
 for pointIndex in 0..<filteredData.count {
 path.addRoundedRect(in: CGRect(origin: CGPoint(x: convertedXValues[pointIndex] - markerSize.width / 2,
 y: convertedYPoints[pointIndex] - markerSize.height / 2),
 size: markerSize),
Expand DownExpand Up@@ -199,7 +201,7 @@ extension Path {
 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }

 path.move(to: .zero)
 path.move(to: CGPoint(x: convertedXValues[0], y: 0))
 var point1 = CGPoint(x: convertedXValues[0], y: convertedYPoints[0])
 path.addLine(to: point1)
 for pointIndex in 1..<data.count {
Expand Down

7 changes: 4 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/Extension/LineChart+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,13 +6,14 @@ extension LineChart {
 return self
 }

 public func showBackground(_ show: Bool) -> LineChart {
 self.chartProperties.showBackground = show
 public func setBackground(colorGradient: ColorGradient) -> LineChart {
 self.chartProperties.backgroundGradient = colorGradient
 return self
 }

 public func showChartMarks(_ show: Bool) -> LineChart {
 public func showChartMarks(_ show: Bool, with color: ColorGradient? = nil) -> LineChart {
 self.chartProperties.showChartMarks = show
 self.chartProperties.customChartMarksColors = color
 return self
 }

Expand Down

34 changes: 15 additions & 19 deletions
Sources/SwiftUICharts/Charts/LineChart/Line.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import SwiftUI

/// A single line of data, a view in a `LineChart`
public struct Line: View {
 @EnvironmentObject var chartValue: ChartValue
 @ObservedObject var chartData: ChartData
 @ObservedObject var chartProperties: LineChartProperties

Expand All@@ -29,17 +28,17 @@ public struct Line: View {
 public var body: some View {
 GeometryReader { geometry in
 ZStack {
 if self.didCellAppear && self.chartProperties.showBackground {
 if self.didCellAppear, let backgroundColor = chartProperties.backgroundGradient {
 LineBackgroundShapeView(chartData: chartData,
 geometry: geometry,
style: style)
backgroundColor: backgroundColor)
 }
 LineShapeView(chartData: chartData,
 chartProperties: chartProperties,
 geometry: geometry,
 style: style,
 trimTo: didCellAppear ? 1.0 : 0.0)
.animation(.easeIn)
 .animation(Animation.easeIn(duration: 0.75))
 if self.showIndicator {
 IndicatorPoint()
 .position(self.getClosestPointOnPath(geometry: geometry,
Expand All@@ -54,20 +53,17 @@ public struct Line: View {
 .onDisappear() {
 didCellAppear = false
 }

 .gesture(DragGesture()
 .onChanged({ value in
 self.touchLocation = value.location
 self.showIndicator = true
 self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
 self.chartValue.interactionInProgress = true
 })
 .onEnded({ value in
 self.touchLocation = .zero
 self.showIndicator = false
 self.chartValue.interactionInProgress = false
 })
 )
// .gesture(DragGesture()
// .onChanged({ value in
// self.touchLocation = value.location
// self.showIndicator = true
// self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
// })
// .onEnded({ value in
// self.touchLocation = .zero
// self.showIndicator = false
// })
// )
 }
 }
}
Expand All@@ -94,7 +90,7 @@ extension Line {
 let geometryWidth = geometry.frame(in: .local).width
 let index = Int(round((touchLocation.x / geometryWidth) * CGFloat(chartData.points.count - 1)))
 if (index >= 0 && index < self.chartData.data.count){
 self.chartValue.currentValue = self.chartData.points[index]
// self.chartValue.currentValue = self.chartData.points[index]
 }
 }
}
Expand Down

6 changes: 3 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/LineBackgroundShapeView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@ import SwiftUI
struct LineBackgroundShapeView: View {
 var chartData: ChartData
 var geometry: GeometryProxy
 var style: ChartStyle
 var backgroundColor: ColorGradient

 var body: some View {
 LineBackgroundShape(data: chartData.normalisedData)
 .fill(LinearGradient(gradient: Gradient(colors: [style.backgroundColor.startColor,
style.foregroundColor.first?.startColor ?? .white]),
 .fill(LinearGradient(gradient: Gradient(colors: [backgroundColor.startColor,
backgroundColor.endColor]),
 startPoint: .bottom,
 endPoint: .top))
 .rotationEffect(.degrees(180), anchor: .center)
Expand Down
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: add new axis interface#253

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

Oct 24, 2022
 Merged


feat: add new axis interface
#253
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


104 changes: 81 additions & 23 deletions
Sources/SwiftUICharts/Base/Axis/AxisLabels.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,40 +1,98 @@
import SwiftUI

public struct AxisLabels<Content: View>: View {
 struct YAxisViewKey: ViewPreferenceKey { }
 struct ChartViewKey: ViewPreferenceKey { }

 var axisLabelsData = AxisLabelsData()
 var axisLabelsStyle = AxisLabelsStyle()

 @State private var yAxisWidth: CGFloat = 25
 @State private var chartWidth: CGFloat = 0
 @State private var chartHeight: CGFloat = 0

 let content: () -> Content
 // font
 // foregroundColor

 public init(@ViewBuilder content: @escaping () -> Content) {
 self.content = content
 }

 var yAxis: some View {
 VStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(height: getYHeight(index: index,
 chartHeight: chartHeight,
 count: axisLabelsData.axisYLabels.count),
 alignment: getYAlignment(index: index, count: axisLabelsData.axisYLabels.count))
 }
 }
 .padding([.leading, .trailing], 4.0)
 .background(ViewGeometry<YAxisViewKey>())
 .onPreferenceChange(YAxisViewKey.self) { value in
 yAxisWidth = value.first?.size.width ?? 0.0
 }
 }

 func xAxis(chartWidth: CGFloat) -> some View {
 HStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(width: chartWidth / CGFloat(axisLabelsData.axisXLabels.count - 1))
 }
 }
 .frame(height: 24.0, alignment: .top)
 }

 var chart: some View {
 self.content()
 .background(ViewGeometry<ChartViewKey>())
 .onPreferenceChange(ChartViewKey.self) { value in
 chartWidth = value.first?.size.width ?? 0.0
 chartHeight = value.first?.size.height ?? 0.0
 }
 }

 public var body: some View {
 HStack {
 VStack {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 if index != axisLabelsData.axisYLabels.count - 1 {
 Spacer()
 }
 VStack(spacing: 0.0) {
 HStack {
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 yAxis
 } else {
 Spacer(minLength: yAxisWidth)
 }
 }
 .padding([.trailing], 8.0)
 .padding([.bottom], axisLabelsData.axisXLabels.count > 0 ? 28.0 : 0)
 .frame(maxHeight: .infinity)
 VStack {
 self.content()
 HStack {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 if index != axisLabelsData.axisXLabels.count - 1 {
 Spacer()
 }
 }
 chart
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 Spacer(minLength: yAxisWidth)
 } else {
 yAxis
 }
 }
.padding([.top, .bottom], 10.0)
xAxis(chartWidth: chartWidth)
 }
 }

 private func getYHeight(index: Int, chartHeight: CGFloat, count: Int) -> CGFloat {
 if index == 0 || index == count - 1 {
 return chartHeight / (CGFloat(count - 1) * 2) + 10
 }

 return chartHeight / CGFloat(count - 1)
 }

 private func getYAlignment(index: Int, count: Int) -> Alignment {
 if index == 0 {
 return .top
 }

 if index == count - 1 {
 return .bottom
 }

 return .center
 }
}

46 changes: 45 additions & 1 deletion
Sources/SwiftUICharts/Base/Axis/Extension/AxisLabels+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,57 @@
import SwiftUI

extension AxisLabels {
 public func setAxisYLabels(_ labels: [String]) -> AxisLabels {
 public func setAxisYLabels(_ labels: [String],
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 self.axisLabelsData.axisYLabels = labels
 self.axisLabelsStyle.axisLabelsYPosition = position
 return self
 }

 public func setAxisXLabels(_ labels: [String]) -> AxisLabels {
 self.axisLabelsData.axisXLabels = labels
 return self
 }

 public func setAxisYLabels(_ labels: [(Double, String)],
 range: ClosedRange<Int>,
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisYLabels = labelArray
 self.axisLabelsStyle.axisLabelsYPosition = position

 return self
 }

 public func setAxisXLabels(_ labels: [(Double, String)], range: ClosedRange<Int>) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisXLabels = labelArray
 return self
 }

 public func setColor(_ color: Color) -> AxisLabels {
 self.axisLabelsStyle.axisFontColor = color
 return self
 }

 public func setFont(_ font: Font) -> AxisLabels {
 self.axisLabelsStyle.axisFont = font
 return self
 }
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsPosition.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

public enum AxisLabelsYPosition {
 case leading
 case trailing
}

public enum AxisLabelsXPosition {
 case top
 case bottom
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsStyle.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import SwiftUI

public final class AxisLabelsStyle: ObservableObject {
 @Published public var axisFont: Font = .callout
 @Published public var axisFontColor: Color = .primary
 @Published var axisLabelsYPosition: AxisLabelsYPosition = .leading
 @Published var axisLabelsXPosition: AxisLabelsXPosition = .bottom
 public init() {
 // no-op
 }
}

10 changes: 10 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewGeometry.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import SwiftUI

public struct ViewGeometry<T>: View where T: PreferenceKey {
 public var body: some View {
 GeometryReader { geometry in
 Color.clear
 .preference(key: T.self, value: [ViewSizeData(size: geometry.size)] as! T.Value)
 }
 }
}

15 changes: 15 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewPreferenceKey.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import SwiftUI

public protocol ViewPreferenceKey: PreferenceKey {
 typealias Value = [ViewSizeData]
}

public extension ViewPreferenceKey {
 static var defaultValue: [ViewSizeData] {
 []
 }

 static func reduce(value: inout [ViewSizeData], nextValue: () -> [ViewSizeData]) {
 value.append(contentsOf: nextValue())
 }
}

14 changes: 14 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewSizeData.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import SwiftUI

public struct ViewSizeData: Identifiable, Equatable, Hashable {
 public let id: UUID = UUID()
 public let size: CGSize

 public static func == (lhs: Self, rhs: Self) -> Bool {
 return lhs.id == rhs.id
 }

 public func hash(into hasher: inout Hasher) {
 hasher.combine(id)
 }
}

7 changes: 7 additions & 0 deletions
Sources/SwiftUICharts/Base/Extensions/Array+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,3 +17,10 @@ extension Array where Element == ColorGradient {
 return self[index]
 }
}

extension Collection {
 /// Returns the element at the specified index if it is within bounds, otherwise nil.
 subscript (safe index: Index) -> Element? {
 return indices.contains(index) ? self[index] : nil
 }
}

12 changes: 7 additions & 5 deletions
Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,15 +150,17 @@ extension Path {

 static func drawChartMarkers(data: [(Double, Double)], in rect: CGRect) -> Path {
 var path = Path()
 if data.count < 1 {
 let filteredData = data.filter { $0.1 <= 1 && $0.1 >= 0 }

 if filteredData.count < 1 {
 return path
 }

 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }
 let convertedXValues = filteredData.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = filteredData.map { CGFloat($0.1) * rect.height }

 let markerSize = CGSize(width: 8, height: 8)
 for pointIndex in 0..<data.count {
 for pointIndex in 0..<filteredData.count {
 path.addRoundedRect(in: CGRect(origin: CGPoint(x: convertedXValues[pointIndex] - markerSize.width / 2,
 y: convertedYPoints[pointIndex] - markerSize.height / 2),
 size: markerSize),
Expand DownExpand Up@@ -199,7 +201,7 @@ extension Path {
 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }

 path.move(to: .zero)
 path.move(to: CGPoint(x: convertedXValues[0], y: 0))
 var point1 = CGPoint(x: convertedXValues[0], y: convertedYPoints[0])
 path.addLine(to: point1)
 for pointIndex in 1..<data.count {
Expand Down

7 changes: 4 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/Extension/LineChart+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,13 +6,14 @@ extension LineChart {
 return self
 }

 public func showBackground(_ show: Bool) -> LineChart {
 self.chartProperties.showBackground = show
 public func setBackground(colorGradient: ColorGradient) -> LineChart {
 self.chartProperties.backgroundGradient = colorGradient
 return self
 }

 public func showChartMarks(_ show: Bool) -> LineChart {
 public func showChartMarks(_ show: Bool, with color: ColorGradient? = nil) -> LineChart {
 self.chartProperties.showChartMarks = show
 self.chartProperties.customChartMarksColors = color
 return self
 }

Expand Down

34 changes: 15 additions & 19 deletions
Sources/SwiftUICharts/Charts/LineChart/Line.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import SwiftUI

/// A single line of data, a view in a `LineChart`
public struct Line: View {
 @EnvironmentObject var chartValue: ChartValue
 @ObservedObject var chartData: ChartData
 @ObservedObject var chartProperties: LineChartProperties

Expand All@@ -29,17 +28,17 @@ public struct Line: View {
 public var body: some View {
 GeometryReader { geometry in
 ZStack {
 if self.didCellAppear && self.chartProperties.showBackground {
 if self.didCellAppear, let backgroundColor = chartProperties.backgroundGradient {
 LineBackgroundShapeView(chartData: chartData,
 geometry: geometry,
style: style)
backgroundColor: backgroundColor)
 }
 LineShapeView(chartData: chartData,
 chartProperties: chartProperties,
 geometry: geometry,
 style: style,
 trimTo: didCellAppear ? 1.0 : 0.0)
.animation(.easeIn)
 .animation(Animation.easeIn(duration: 0.75))
 if self.showIndicator {
 IndicatorPoint()
 .position(self.getClosestPointOnPath(geometry: geometry,
Expand All@@ -54,20 +53,17 @@ public struct Line: View {
 .onDisappear() {
 didCellAppear = false
 }

 .gesture(DragGesture()
 .onChanged({ value in
 self.touchLocation = value.location
 self.showIndicator = true
 self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
 self.chartValue.interactionInProgress = true
 })
 .onEnded({ value in
 self.touchLocation = .zero
 self.showIndicator = false
 self.chartValue.interactionInProgress = false
 })
 )
// .gesture(DragGesture()
// .onChanged({ value in
// self.touchLocation = value.location
// self.showIndicator = true
// self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
// })
// .onEnded({ value in
// self.touchLocation = .zero
// self.showIndicator = false
// })
// )
 }
 }
}
Expand All@@ -94,7 +90,7 @@ extension Line {
 let geometryWidth = geometry.frame(in: .local).width
 let index = Int(round((touchLocation.x / geometryWidth) * CGFloat(chartData.points.count - 1)))
 if (index >= 0 && index < self.chartData.data.count){
 self.chartValue.currentValue = self.chartData.points[index]
// self.chartValue.currentValue = self.chartData.points[index]
 }
 }
}
Expand Down

6 changes: 3 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/LineBackgroundShapeView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@ import SwiftUI
struct LineBackgroundShapeView: View {
 var chartData: ChartData
 var geometry: GeometryProxy
 var style: ChartStyle
 var backgroundColor: ColorGradient

 var body: some View {
 LineBackgroundShape(data: chartData.normalisedData)
 .fill(LinearGradient(gradient: Gradient(colors: [style.backgroundColor.startColor,
style.foregroundColor.first?.startColor ?? .white]),
 .fill(LinearGradient(gradient: Gradient(colors: [backgroundColor.startColor,
backgroundColor.endColor]),
 startPoint: .bottom,
 endPoint: .top))
 .rotationEffect(.degrees(180), anchor: .center)
Expand Down
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: add new axis interface#253

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

Oct 24, 2022
 Merged


feat: add new axis interface
#253
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


104 changes: 81 additions & 23 deletions
Sources/SwiftUICharts/Base/Axis/AxisLabels.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,40 +1,98 @@
import SwiftUI

public struct AxisLabels<Content: View>: View {
 struct YAxisViewKey: ViewPreferenceKey { }
 struct ChartViewKey: ViewPreferenceKey { }

 var axisLabelsData = AxisLabelsData()
 var axisLabelsStyle = AxisLabelsStyle()

 @State private var yAxisWidth: CGFloat = 25
 @State private var chartWidth: CGFloat = 0
 @State private var chartHeight: CGFloat = 0

 let content: () -> Content
 // font
 // foregroundColor

 public init(@ViewBuilder content: @escaping () -> Content) {
 self.content = content
 }

 var yAxis: some View {
 VStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(height: getYHeight(index: index,
 chartHeight: chartHeight,
 count: axisLabelsData.axisYLabels.count),
 alignment: getYAlignment(index: index, count: axisLabelsData.axisYLabels.count))
 }
 }
 .padding([.leading, .trailing], 4.0)
 .background(ViewGeometry<YAxisViewKey>())
 .onPreferenceChange(YAxisViewKey.self) { value in
 yAxisWidth = value.first?.size.width ?? 0.0
 }
 }

 func xAxis(chartWidth: CGFloat) -> some View {
 HStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(width: chartWidth / CGFloat(axisLabelsData.axisXLabels.count - 1))
 }
 }
 .frame(height: 24.0, alignment: .top)
 }

 var chart: some View {
 self.content()
 .background(ViewGeometry<ChartViewKey>())
 .onPreferenceChange(ChartViewKey.self) { value in
 chartWidth = value.first?.size.width ?? 0.0
 chartHeight = value.first?.size.height ?? 0.0
 }
 }

 public var body: some View {
 HStack {
 VStack {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 if index != axisLabelsData.axisYLabels.count - 1 {
 Spacer()
 }
 VStack(spacing: 0.0) {
 HStack {
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 yAxis
 } else {
 Spacer(minLength: yAxisWidth)
 }
 }
 .padding([.trailing], 8.0)
 .padding([.bottom], axisLabelsData.axisXLabels.count > 0 ? 28.0 : 0)
 .frame(maxHeight: .infinity)
 VStack {
 self.content()
 HStack {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 if index != axisLabelsData.axisXLabels.count - 1 {
 Spacer()
 }
 }
 chart
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 Spacer(minLength: yAxisWidth)
 } else {
 yAxis
 }
 }
.padding([.top, .bottom], 10.0)
xAxis(chartWidth: chartWidth)
 }
 }

 private func getYHeight(index: Int, chartHeight: CGFloat, count: Int) -> CGFloat {
 if index == 0 || index == count - 1 {
 return chartHeight / (CGFloat(count - 1) * 2) + 10
 }

 return chartHeight / CGFloat(count - 1)
 }

 private func getYAlignment(index: Int, count: Int) -> Alignment {
 if index == 0 {
 return .top
 }

 if index == count - 1 {
 return .bottom
 }

 return .center
 }
}

46 changes: 45 additions & 1 deletion
Sources/SwiftUICharts/Base/Axis/Extension/AxisLabels+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,57 @@
import SwiftUI

extension AxisLabels {
 public func setAxisYLabels(_ labels: [String]) -> AxisLabels {
 public func setAxisYLabels(_ labels: [String],
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 self.axisLabelsData.axisYLabels = labels
 self.axisLabelsStyle.axisLabelsYPosition = position
 return self
 }

 public func setAxisXLabels(_ labels: [String]) -> AxisLabels {
 self.axisLabelsData.axisXLabels = labels
 return self
 }

 public func setAxisYLabels(_ labels: [(Double, String)],
 range: ClosedRange<Int>,
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisYLabels = labelArray
 self.axisLabelsStyle.axisLabelsYPosition = position

 return self
 }

 public func setAxisXLabels(_ labels: [(Double, String)], range: ClosedRange<Int>) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisXLabels = labelArray
 return self
 }

 public func setColor(_ color: Color) -> AxisLabels {
 self.axisLabelsStyle.axisFontColor = color
 return self
 }

 public func setFont(_ font: Font) -> AxisLabels {
 self.axisLabelsStyle.axisFont = font
 return self
 }
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsPosition.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

public enum AxisLabelsYPosition {
 case leading
 case trailing
}

public enum AxisLabelsXPosition {
 case top
 case bottom
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsStyle.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import SwiftUI

public final class AxisLabelsStyle: ObservableObject {
 @Published public var axisFont: Font = .callout
 @Published public var axisFontColor: Color = .primary
 @Published var axisLabelsYPosition: AxisLabelsYPosition = .leading
 @Published var axisLabelsXPosition: AxisLabelsXPosition = .bottom
 public init() {
 // no-op
 }
}

10 changes: 10 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewGeometry.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import SwiftUI

public struct ViewGeometry<T>: View where T: PreferenceKey {
 public var body: some View {
 GeometryReader { geometry in
 Color.clear
 .preference(key: T.self, value: [ViewSizeData(size: geometry.size)] as! T.Value)
 }
 }
}

15 changes: 15 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewPreferenceKey.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import SwiftUI

public protocol ViewPreferenceKey: PreferenceKey {
 typealias Value = [ViewSizeData]
}

public extension ViewPreferenceKey {
 static var defaultValue: [ViewSizeData] {
 []
 }

 static func reduce(value: inout [ViewSizeData], nextValue: () -> [ViewSizeData]) {
 value.append(contentsOf: nextValue())
 }
}

14 changes: 14 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewSizeData.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import SwiftUI

public struct ViewSizeData: Identifiable, Equatable, Hashable {
 public let id: UUID = UUID()
 public let size: CGSize

 public static func == (lhs: Self, rhs: Self) -> Bool {
 return lhs.id == rhs.id
 }

 public func hash(into hasher: inout Hasher) {
 hasher.combine(id)
 }
}

7 changes: 7 additions & 0 deletions
Sources/SwiftUICharts/Base/Extensions/Array+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,3 +17,10 @@ extension Array where Element == ColorGradient {
 return self[index]
 }
}

extension Collection {
 /// Returns the element at the specified index if it is within bounds, otherwise nil.
 subscript (safe index: Index) -> Element? {
 return indices.contains(index) ? self[index] : nil
 }
}

12 changes: 7 additions & 5 deletions
Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,15 +150,17 @@ extension Path {

 static func drawChartMarkers(data: [(Double, Double)], in rect: CGRect) -> Path {
 var path = Path()
 if data.count < 1 {
 let filteredData = data.filter { $0.1 <= 1 && $0.1 >= 0 }

 if filteredData.count < 1 {
 return path
 }

 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }
 let convertedXValues = filteredData.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = filteredData.map { CGFloat($0.1) * rect.height }

 let markerSize = CGSize(width: 8, height: 8)
 for pointIndex in 0..<data.count {
 for pointIndex in 0..<filteredData.count {
 path.addRoundedRect(in: CGRect(origin: CGPoint(x: convertedXValues[pointIndex] - markerSize.width / 2,
 y: convertedYPoints[pointIndex] - markerSize.height / 2),
 size: markerSize),
Expand DownExpand Up@@ -199,7 +201,7 @@ extension Path {
 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }

 path.move(to: .zero)
 path.move(to: CGPoint(x: convertedXValues[0], y: 0))
 var point1 = CGPoint(x: convertedXValues[0], y: convertedYPoints[0])
 path.addLine(to: point1)
 for pointIndex in 1..<data.count {
Expand Down

7 changes: 4 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/Extension/LineChart+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,13 +6,14 @@ extension LineChart {
 return self
 }

 public func showBackground(_ show: Bool) -> LineChart {
 self.chartProperties.showBackground = show
 public func setBackground(colorGradient: ColorGradient) -> LineChart {
 self.chartProperties.backgroundGradient = colorGradient
 return self
 }

 public func showChartMarks(_ show: Bool) -> LineChart {
 public func showChartMarks(_ show: Bool, with color: ColorGradient? = nil) -> LineChart {
 self.chartProperties.showChartMarks = show
 self.chartProperties.customChartMarksColors = color
 return self
 }

Expand Down

34 changes: 15 additions & 19 deletions
Sources/SwiftUICharts/Charts/LineChart/Line.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import SwiftUI

/// A single line of data, a view in a `LineChart`
public struct Line: View {
 @EnvironmentObject var chartValue: ChartValue
 @ObservedObject var chartData: ChartData
 @ObservedObject var chartProperties: LineChartProperties

Expand All@@ -29,17 +28,17 @@ public struct Line: View {
 public var body: some View {
 GeometryReader { geometry in
 ZStack {
 if self.didCellAppear && self.chartProperties.showBackground {
 if self.didCellAppear, let backgroundColor = chartProperties.backgroundGradient {
 LineBackgroundShapeView(chartData: chartData,
 geometry: geometry,
style: style)
backgroundColor: backgroundColor)
 }
 LineShapeView(chartData: chartData,
 chartProperties: chartProperties,
 geometry: geometry,
 style: style,
 trimTo: didCellAppear ? 1.0 : 0.0)
.animation(.easeIn)
 .animation(Animation.easeIn(duration: 0.75))
 if self.showIndicator {
 IndicatorPoint()
 .position(self.getClosestPointOnPath(geometry: geometry,
Expand All@@ -54,20 +53,17 @@ public struct Line: View {
 .onDisappear() {
 didCellAppear = false
 }

 .gesture(DragGesture()
 .onChanged({ value in
 self.touchLocation = value.location
 self.showIndicator = true
 self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
 self.chartValue.interactionInProgress = true
 })
 .onEnded({ value in
 self.touchLocation = .zero
 self.showIndicator = false
 self.chartValue.interactionInProgress = false
 })
 )
// .gesture(DragGesture()
// .onChanged({ value in
// self.touchLocation = value.location
// self.showIndicator = true
// self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
// })
// .onEnded({ value in
// self.touchLocation = .zero
// self.showIndicator = false
// })
// )
 }
 }
}
Expand All@@ -94,7 +90,7 @@ extension Line {
 let geometryWidth = geometry.frame(in: .local).width
 let index = Int(round((touchLocation.x / geometryWidth) * CGFloat(chartData.points.count - 1)))
 if (index >= 0 && index < self.chartData.data.count){
 self.chartValue.currentValue = self.chartData.points[index]
// self.chartValue.currentValue = self.chartData.points[index]
 }
 }
}
Expand Down

6 changes: 3 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/LineBackgroundShapeView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@ import SwiftUI
struct LineBackgroundShapeView: View {
 var chartData: ChartData
 var geometry: GeometryProxy
 var style: ChartStyle
 var backgroundColor: ColorGradient

 var body: some View {
 LineBackgroundShape(data: chartData.normalisedData)
 .fill(LinearGradient(gradient: Gradient(colors: [style.backgroundColor.startColor,
style.foregroundColor.first?.startColor ?? .white]),
 .fill(LinearGradient(gradient: Gradient(colors: [backgroundColor.startColor,
backgroundColor.endColor]),
 startPoint: .bottom,
 endPoint: .top))
 .rotationEffect(.degrees(180), anchor: .center)
Expand Down
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: add new axis interface#253

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

Oct 24, 2022
 Merged


feat: add new axis interface
#253
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


104 changes: 81 additions & 23 deletions
Sources/SwiftUICharts/Base/Axis/AxisLabels.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,40 +1,98 @@
import SwiftUI

public struct AxisLabels<Content: View>: View {
 struct YAxisViewKey: ViewPreferenceKey { }
 struct ChartViewKey: ViewPreferenceKey { }

 var axisLabelsData = AxisLabelsData()
 var axisLabelsStyle = AxisLabelsStyle()

 @State private var yAxisWidth: CGFloat = 25
 @State private var chartWidth: CGFloat = 0
 @State private var chartHeight: CGFloat = 0

 let content: () -> Content
 // font
 // foregroundColor

 public init(@ViewBuilder content: @escaping () -> Content) {
 self.content = content
 }

 var yAxis: some View {
 VStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(height: getYHeight(index: index,
 chartHeight: chartHeight,
 count: axisLabelsData.axisYLabels.count),
 alignment: getYAlignment(index: index, count: axisLabelsData.axisYLabels.count))
 }
 }
 .padding([.leading, .trailing], 4.0)
 .background(ViewGeometry<YAxisViewKey>())
 .onPreferenceChange(YAxisViewKey.self) { value in
 yAxisWidth = value.first?.size.width ?? 0.0
 }
 }

 func xAxis(chartWidth: CGFloat) -> some View {
 HStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(width: chartWidth / CGFloat(axisLabelsData.axisXLabels.count - 1))
 }
 }
 .frame(height: 24.0, alignment: .top)
 }

 var chart: some View {
 self.content()
 .background(ViewGeometry<ChartViewKey>())
 .onPreferenceChange(ChartViewKey.self) { value in
 chartWidth = value.first?.size.width ?? 0.0
 chartHeight = value.first?.size.height ?? 0.0
 }
 }

 public var body: some View {
 HStack {
 VStack {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 if index != axisLabelsData.axisYLabels.count - 1 {
 Spacer()
 }
 VStack(spacing: 0.0) {
 HStack {
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 yAxis
 } else {
 Spacer(minLength: yAxisWidth)
 }
 }
 .padding([.trailing], 8.0)
 .padding([.bottom], axisLabelsData.axisXLabels.count > 0 ? 28.0 : 0)
 .frame(maxHeight: .infinity)
 VStack {
 self.content()
 HStack {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 if index != axisLabelsData.axisXLabels.count - 1 {
 Spacer()
 }
 }
 chart
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 Spacer(minLength: yAxisWidth)
 } else {
 yAxis
 }
 }
.padding([.top, .bottom], 10.0)
xAxis(chartWidth: chartWidth)
 }
 }

 private func getYHeight(index: Int, chartHeight: CGFloat, count: Int) -> CGFloat {
 if index == 0 || index == count - 1 {
 return chartHeight / (CGFloat(count - 1) * 2) + 10
 }

 return chartHeight / CGFloat(count - 1)
 }

 private func getYAlignment(index: Int, count: Int) -> Alignment {
 if index == 0 {
 return .top
 }

 if index == count - 1 {
 return .bottom
 }

 return .center
 }
}

46 changes: 45 additions & 1 deletion
Sources/SwiftUICharts/Base/Axis/Extension/AxisLabels+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,57 @@
import SwiftUI

extension AxisLabels {
 public func setAxisYLabels(_ labels: [String]) -> AxisLabels {
 public func setAxisYLabels(_ labels: [String],
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 self.axisLabelsData.axisYLabels = labels
 self.axisLabelsStyle.axisLabelsYPosition = position
 return self
 }

 public func setAxisXLabels(_ labels: [String]) -> AxisLabels {
 self.axisLabelsData.axisXLabels = labels
 return self
 }

 public func setAxisYLabels(_ labels: [(Double, String)],
 range: ClosedRange<Int>,
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisYLabels = labelArray
 self.axisLabelsStyle.axisLabelsYPosition = position

 return self
 }

 public func setAxisXLabels(_ labels: [(Double, String)], range: ClosedRange<Int>) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisXLabels = labelArray
 return self
 }

 public func setColor(_ color: Color) -> AxisLabels {
 self.axisLabelsStyle.axisFontColor = color
 return self
 }

 public func setFont(_ font: Font) -> AxisLabels {
 self.axisLabelsStyle.axisFont = font
 return self
 }
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsPosition.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

public enum AxisLabelsYPosition {
 case leading
 case trailing
}

public enum AxisLabelsXPosition {
 case top
 case bottom
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsStyle.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import SwiftUI

public final class AxisLabelsStyle: ObservableObject {
 @Published public var axisFont: Font = .callout
 @Published public var axisFontColor: Color = .primary
 @Published var axisLabelsYPosition: AxisLabelsYPosition = .leading
 @Published var axisLabelsXPosition: AxisLabelsXPosition = .bottom
 public init() {
 // no-op
 }
}

10 changes: 10 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewGeometry.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import SwiftUI

public struct ViewGeometry<T>: View where T: PreferenceKey {
 public var body: some View {
 GeometryReader { geometry in
 Color.clear
 .preference(key: T.self, value: [ViewSizeData(size: geometry.size)] as! T.Value)
 }
 }
}

15 changes: 15 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewPreferenceKey.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import SwiftUI

public protocol ViewPreferenceKey: PreferenceKey {
 typealias Value = [ViewSizeData]
}

public extension ViewPreferenceKey {
 static var defaultValue: [ViewSizeData] {
 []
 }

 static func reduce(value: inout [ViewSizeData], nextValue: () -> [ViewSizeData]) {
 value.append(contentsOf: nextValue())
 }
}

14 changes: 14 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewSizeData.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import SwiftUI

public struct ViewSizeData: Identifiable, Equatable, Hashable {
 public let id: UUID = UUID()
 public let size: CGSize

 public static func == (lhs: Self, rhs: Self) -> Bool {
 return lhs.id == rhs.id
 }

 public func hash(into hasher: inout Hasher) {
 hasher.combine(id)
 }
}

7 changes: 7 additions & 0 deletions
Sources/SwiftUICharts/Base/Extensions/Array+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,3 +17,10 @@ extension Array where Element == ColorGradient {
 return self[index]
 }
}

extension Collection {
 /// Returns the element at the specified index if it is within bounds, otherwise nil.
 subscript (safe index: Index) -> Element? {
 return indices.contains(index) ? self[index] : nil
 }
}

12 changes: 7 additions & 5 deletions
Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,15 +150,17 @@ extension Path {

 static func drawChartMarkers(data: [(Double, Double)], in rect: CGRect) -> Path {
 var path = Path()
 if data.count < 1 {
 let filteredData = data.filter { $0.1 <= 1 && $0.1 >= 0 }

 if filteredData.count < 1 {
 return path
 }

 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }
 let convertedXValues = filteredData.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = filteredData.map { CGFloat($0.1) * rect.height }

 let markerSize = CGSize(width: 8, height: 8)
 for pointIndex in 0..<data.count {
 for pointIndex in 0..<filteredData.count {
 path.addRoundedRect(in: CGRect(origin: CGPoint(x: convertedXValues[pointIndex] - markerSize.width / 2,
 y: convertedYPoints[pointIndex] - markerSize.height / 2),
 size: markerSize),
Expand DownExpand Up@@ -199,7 +201,7 @@ extension Path {
 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }

 path.move(to: .zero)
 path.move(to: CGPoint(x: convertedXValues[0], y: 0))
 var point1 = CGPoint(x: convertedXValues[0], y: convertedYPoints[0])
 path.addLine(to: point1)
 for pointIndex in 1..<data.count {
Expand Down

7 changes: 4 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/Extension/LineChart+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,13 +6,14 @@ extension LineChart {
 return self
 }

 public func showBackground(_ show: Bool) -> LineChart {
 self.chartProperties.showBackground = show
 public func setBackground(colorGradient: ColorGradient) -> LineChart {
 self.chartProperties.backgroundGradient = colorGradient
 return self
 }

 public func showChartMarks(_ show: Bool) -> LineChart {
 public func showChartMarks(_ show: Bool, with color: ColorGradient? = nil) -> LineChart {
 self.chartProperties.showChartMarks = show
 self.chartProperties.customChartMarksColors = color
 return self
 }

Expand Down

34 changes: 15 additions & 19 deletions
Sources/SwiftUICharts/Charts/LineChart/Line.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import SwiftUI

/// A single line of data, a view in a `LineChart`
public struct Line: View {
 @EnvironmentObject var chartValue: ChartValue
 @ObservedObject var chartData: ChartData
 @ObservedObject var chartProperties: LineChartProperties

Expand All@@ -29,17 +28,17 @@ public struct Line: View {
 public var body: some View {
 GeometryReader { geometry in
 ZStack {
 if self.didCellAppear && self.chartProperties.showBackground {
 if self.didCellAppear, let backgroundColor = chartProperties.backgroundGradient {
 LineBackgroundShapeView(chartData: chartData,
 geometry: geometry,
style: style)
backgroundColor: backgroundColor)
 }
 LineShapeView(chartData: chartData,
 chartProperties: chartProperties,
 geometry: geometry,
 style: style,
 trimTo: didCellAppear ? 1.0 : 0.0)
.animation(.easeIn)
 .animation(Animation.easeIn(duration: 0.75))
 if self.showIndicator {
 IndicatorPoint()
 .position(self.getClosestPointOnPath(geometry: geometry,
Expand All@@ -54,20 +53,17 @@ public struct Line: View {
 .onDisappear() {
 didCellAppear = false
 }

 .gesture(DragGesture()
 .onChanged({ value in
 self.touchLocation = value.location
 self.showIndicator = true
 self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
 self.chartValue.interactionInProgress = true
 })
 .onEnded({ value in
 self.touchLocation = .zero
 self.showIndicator = false
 self.chartValue.interactionInProgress = false
 })
 )
// .gesture(DragGesture()
// .onChanged({ value in
// self.touchLocation = value.location
// self.showIndicator = true
// self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
// })
// .onEnded({ value in
// self.touchLocation = .zero
// self.showIndicator = false
// })
// )
 }
 }
}
Expand All@@ -94,7 +90,7 @@ extension Line {
 let geometryWidth = geometry.frame(in: .local).width
 let index = Int(round((touchLocation.x / geometryWidth) * CGFloat(chartData.points.count - 1)))
 if (index >= 0 && index < self.chartData.data.count){
 self.chartValue.currentValue = self.chartData.points[index]
// self.chartValue.currentValue = self.chartData.points[index]
 }
 }
}
Expand Down

6 changes: 3 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/LineBackgroundShapeView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@ import SwiftUI
struct LineBackgroundShapeView: View {
 var chartData: ChartData
 var geometry: GeometryProxy
 var style: ChartStyle
 var backgroundColor: ColorGradient

 var body: some View {
 LineBackgroundShape(data: chartData.normalisedData)
 .fill(LinearGradient(gradient: Gradient(colors: [style.backgroundColor.startColor,
style.foregroundColor.first?.startColor ?? .white]),
 .fill(LinearGradient(gradient: Gradient(colors: [backgroundColor.startColor,
backgroundColor.endColor]),
 startPoint: .bottom,
 endPoint: .top))
 .rotationEffect(.degrees(180), anchor: .center)
Expand Down
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: add new axis interface#253

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

Oct 24, 2022
 Merged


feat: add new axis interface
#253
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


104 changes: 81 additions & 23 deletions
Sources/SwiftUICharts/Base/Axis/AxisLabels.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,40 +1,98 @@
import SwiftUI

public struct AxisLabels<Content: View>: View {
 struct YAxisViewKey: ViewPreferenceKey { }
 struct ChartViewKey: ViewPreferenceKey { }

 var axisLabelsData = AxisLabelsData()
 var axisLabelsStyle = AxisLabelsStyle()

 @State private var yAxisWidth: CGFloat = 25
 @State private var chartWidth: CGFloat = 0
 @State private var chartHeight: CGFloat = 0

 let content: () -> Content
 // font
 // foregroundColor

 public init(@ViewBuilder content: @escaping () -> Content) {
 self.content = content
 }

 var yAxis: some View {
 VStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(height: getYHeight(index: index,
 chartHeight: chartHeight,
 count: axisLabelsData.axisYLabels.count),
 alignment: getYAlignment(index: index, count: axisLabelsData.axisYLabels.count))
 }
 }
 .padding([.leading, .trailing], 4.0)
 .background(ViewGeometry<YAxisViewKey>())
 .onPreferenceChange(YAxisViewKey.self) { value in
 yAxisWidth = value.first?.size.width ?? 0.0
 }
 }

 func xAxis(chartWidth: CGFloat) -> some View {
 HStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(width: chartWidth / CGFloat(axisLabelsData.axisXLabels.count - 1))
 }
 }
 .frame(height: 24.0, alignment: .top)
 }

 var chart: some View {
 self.content()
 .background(ViewGeometry<ChartViewKey>())
 .onPreferenceChange(ChartViewKey.self) { value in
 chartWidth = value.first?.size.width ?? 0.0
 chartHeight = value.first?.size.height ?? 0.0
 }
 }

 public var body: some View {
 HStack {
 VStack {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 if index != axisLabelsData.axisYLabels.count - 1 {
 Spacer()
 }
 VStack(spacing: 0.0) {
 HStack {
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 yAxis
 } else {
 Spacer(minLength: yAxisWidth)
 }
 }
 .padding([.trailing], 8.0)
 .padding([.bottom], axisLabelsData.axisXLabels.count > 0 ? 28.0 : 0)
 .frame(maxHeight: .infinity)
 VStack {
 self.content()
 HStack {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 if index != axisLabelsData.axisXLabels.count - 1 {
 Spacer()
 }
 }
 chart
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 Spacer(minLength: yAxisWidth)
 } else {
 yAxis
 }
 }
.padding([.top, .bottom], 10.0)
xAxis(chartWidth: chartWidth)
 }
 }

 private func getYHeight(index: Int, chartHeight: CGFloat, count: Int) -> CGFloat {
 if index == 0 || index == count - 1 {
 return chartHeight / (CGFloat(count - 1) * 2) + 10
 }

 return chartHeight / CGFloat(count - 1)
 }

 private func getYAlignment(index: Int, count: Int) -> Alignment {
 if index == 0 {
 return .top
 }

 if index == count - 1 {
 return .bottom
 }

 return .center
 }
}

46 changes: 45 additions & 1 deletion
Sources/SwiftUICharts/Base/Axis/Extension/AxisLabels+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,57 @@
import SwiftUI

extension AxisLabels {
 public func setAxisYLabels(_ labels: [String]) -> AxisLabels {
 public func setAxisYLabels(_ labels: [String],
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 self.axisLabelsData.axisYLabels = labels
 self.axisLabelsStyle.axisLabelsYPosition = position
 return self
 }

 public func setAxisXLabels(_ labels: [String]) -> AxisLabels {
 self.axisLabelsData.axisXLabels = labels
 return self
 }

 public func setAxisYLabels(_ labels: [(Double, String)],
 range: ClosedRange<Int>,
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisYLabels = labelArray
 self.axisLabelsStyle.axisLabelsYPosition = position

 return self
 }

 public func setAxisXLabels(_ labels: [(Double, String)], range: ClosedRange<Int>) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisXLabels = labelArray
 return self
 }

 public func setColor(_ color: Color) -> AxisLabels {
 self.axisLabelsStyle.axisFontColor = color
 return self
 }

 public func setFont(_ font: Font) -> AxisLabels {
 self.axisLabelsStyle.axisFont = font
 return self
 }
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsPosition.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

public enum AxisLabelsYPosition {
 case leading
 case trailing
}

public enum AxisLabelsXPosition {
 case top
 case bottom
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsStyle.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import SwiftUI

public final class AxisLabelsStyle: ObservableObject {
 @Published public var axisFont: Font = .callout
 @Published public var axisFontColor: Color = .primary
 @Published var axisLabelsYPosition: AxisLabelsYPosition = .leading
 @Published var axisLabelsXPosition: AxisLabelsXPosition = .bottom
 public init() {
 // no-op
 }
}

10 changes: 10 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewGeometry.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import SwiftUI

public struct ViewGeometry<T>: View where T: PreferenceKey {
 public var body: some View {
 GeometryReader { geometry in
 Color.clear
 .preference(key: T.self, value: [ViewSizeData(size: geometry.size)] as! T.Value)
 }
 }
}

15 changes: 15 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewPreferenceKey.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import SwiftUI

public protocol ViewPreferenceKey: PreferenceKey {
 typealias Value = [ViewSizeData]
}

public extension ViewPreferenceKey {
 static var defaultValue: [ViewSizeData] {
 []
 }

 static func reduce(value: inout [ViewSizeData], nextValue: () -> [ViewSizeData]) {
 value.append(contentsOf: nextValue())
 }
}

14 changes: 14 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewSizeData.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import SwiftUI

public struct ViewSizeData: Identifiable, Equatable, Hashable {
 public let id: UUID = UUID()
 public let size: CGSize

 public static func == (lhs: Self, rhs: Self) -> Bool {
 return lhs.id == rhs.id
 }

 public func hash(into hasher: inout Hasher) {
 hasher.combine(id)
 }
}

7 changes: 7 additions & 0 deletions
Sources/SwiftUICharts/Base/Extensions/Array+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,3 +17,10 @@ extension Array where Element == ColorGradient {
 return self[index]
 }
}

extension Collection {
 /// Returns the element at the specified index if it is within bounds, otherwise nil.
 subscript (safe index: Index) -> Element? {
 return indices.contains(index) ? self[index] : nil
 }
}

12 changes: 7 additions & 5 deletions
Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,15 +150,17 @@ extension Path {

 static func drawChartMarkers(data: [(Double, Double)], in rect: CGRect) -> Path {
 var path = Path()
 if data.count < 1 {
 let filteredData = data.filter { $0.1 <= 1 && $0.1 >= 0 }

 if filteredData.count < 1 {
 return path
 }

 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }
 let convertedXValues = filteredData.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = filteredData.map { CGFloat($0.1) * rect.height }

 let markerSize = CGSize(width: 8, height: 8)
 for pointIndex in 0..<data.count {
 for pointIndex in 0..<filteredData.count {
 path.addRoundedRect(in: CGRect(origin: CGPoint(x: convertedXValues[pointIndex] - markerSize.width / 2,
 y: convertedYPoints[pointIndex] - markerSize.height / 2),
 size: markerSize),
Expand DownExpand Up@@ -199,7 +201,7 @@ extension Path {
 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }

 path.move(to: .zero)
 path.move(to: CGPoint(x: convertedXValues[0], y: 0))
 var point1 = CGPoint(x: convertedXValues[0], y: convertedYPoints[0])
 path.addLine(to: point1)
 for pointIndex in 1..<data.count {
Expand Down

7 changes: 4 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/Extension/LineChart+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,13 +6,14 @@ extension LineChart {
 return self
 }

 public func showBackground(_ show: Bool) -> LineChart {
 self.chartProperties.showBackground = show
 public func setBackground(colorGradient: ColorGradient) -> LineChart {
 self.chartProperties.backgroundGradient = colorGradient
 return self
 }

 public func showChartMarks(_ show: Bool) -> LineChart {
 public func showChartMarks(_ show: Bool, with color: ColorGradient? = nil) -> LineChart {
 self.chartProperties.showChartMarks = show
 self.chartProperties.customChartMarksColors = color
 return self
 }

Expand Down

34 changes: 15 additions & 19 deletions
Sources/SwiftUICharts/Charts/LineChart/Line.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import SwiftUI

/// A single line of data, a view in a `LineChart`
public struct Line: View {
 @EnvironmentObject var chartValue: ChartValue
 @ObservedObject var chartData: ChartData
 @ObservedObject var chartProperties: LineChartProperties

Expand All@@ -29,17 +28,17 @@ public struct Line: View {
 public var body: some View {
 GeometryReader { geometry in
 ZStack {
 if self.didCellAppear && self.chartProperties.showBackground {
 if self.didCellAppear, let backgroundColor = chartProperties.backgroundGradient {
 LineBackgroundShapeView(chartData: chartData,
 geometry: geometry,
style: style)
backgroundColor: backgroundColor)
 }
 LineShapeView(chartData: chartData,
 chartProperties: chartProperties,
 geometry: geometry,
 style: style,
 trimTo: didCellAppear ? 1.0 : 0.0)
.animation(.easeIn)
 .animation(Animation.easeIn(duration: 0.75))
 if self.showIndicator {
 IndicatorPoint()
 .position(self.getClosestPointOnPath(geometry: geometry,
Expand All@@ -54,20 +53,17 @@ public struct Line: View {
 .onDisappear() {
 didCellAppear = false
 }

 .gesture(DragGesture()
 .onChanged({ value in
 self.touchLocation = value.location
 self.showIndicator = true
 self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
 self.chartValue.interactionInProgress = true
 })
 .onEnded({ value in
 self.touchLocation = .zero
 self.showIndicator = false
 self.chartValue.interactionInProgress = false
 })
 )
// .gesture(DragGesture()
// .onChanged({ value in
// self.touchLocation = value.location
// self.showIndicator = true
// self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
// })
// .onEnded({ value in
// self.touchLocation = .zero
// self.showIndicator = false
// })
// )
 }
 }
}
Expand All@@ -94,7 +90,7 @@ extension Line {
 let geometryWidth = geometry.frame(in: .local).width
 let index = Int(round((touchLocation.x / geometryWidth) * CGFloat(chartData.points.count - 1)))
 if (index >= 0 && index < self.chartData.data.count){
 self.chartValue.currentValue = self.chartData.points[index]
// self.chartValue.currentValue = self.chartData.points[index]
 }
 }
}
Expand Down

6 changes: 3 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/LineBackgroundShapeView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@ import SwiftUI
struct LineBackgroundShapeView: View {
 var chartData: ChartData
 var geometry: GeometryProxy
 var style: ChartStyle
 var backgroundColor: ColorGradient

 var body: some View {
 LineBackgroundShape(data: chartData.normalisedData)
 .fill(LinearGradient(gradient: Gradient(colors: [style.backgroundColor.startColor,
style.foregroundColor.first?.startColor ?? .white]),
 .fill(LinearGradient(gradient: Gradient(colors: [backgroundColor.startColor,
backgroundColor.endColor]),
 startPoint: .bottom,
 endPoint: .top))
 .rotationEffect(.degrees(180), anchor: .center)
Expand Down
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: add new axis interface#253

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

Oct 24, 2022
 Merged


feat: add new axis interface
#253
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


104 changes: 81 additions & 23 deletions
Sources/SwiftUICharts/Base/Axis/AxisLabels.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,40 +1,98 @@
import SwiftUI

public struct AxisLabels<Content: View>: View {
 struct YAxisViewKey: ViewPreferenceKey { }
 struct ChartViewKey: ViewPreferenceKey { }

 var axisLabelsData = AxisLabelsData()
 var axisLabelsStyle = AxisLabelsStyle()

 @State private var yAxisWidth: CGFloat = 25
 @State private var chartWidth: CGFloat = 0
 @State private var chartHeight: CGFloat = 0

 let content: () -> Content
 // font
 // foregroundColor

 public init(@ViewBuilder content: @escaping () -> Content) {
 self.content = content
 }

 var yAxis: some View {
 VStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(height: getYHeight(index: index,
 chartHeight: chartHeight,
 count: axisLabelsData.axisYLabels.count),
 alignment: getYAlignment(index: index, count: axisLabelsData.axisYLabels.count))
 }
 }
 .padding([.leading, .trailing], 4.0)
 .background(ViewGeometry<YAxisViewKey>())
 .onPreferenceChange(YAxisViewKey.self) { value in
 yAxisWidth = value.first?.size.width ?? 0.0
 }
 }

 func xAxis(chartWidth: CGFloat) -> some View {
 HStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(width: chartWidth / CGFloat(axisLabelsData.axisXLabels.count - 1))
 }
 }
 .frame(height: 24.0, alignment: .top)
 }

 var chart: some View {
 self.content()
 .background(ViewGeometry<ChartViewKey>())
 .onPreferenceChange(ChartViewKey.self) { value in
 chartWidth = value.first?.size.width ?? 0.0
 chartHeight = value.first?.size.height ?? 0.0
 }
 }

 public var body: some View {
 HStack {
 VStack {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 if index != axisLabelsData.axisYLabels.count - 1 {
 Spacer()
 }
 VStack(spacing: 0.0) {
 HStack {
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 yAxis
 } else {
 Spacer(minLength: yAxisWidth)
 }
 }
 .padding([.trailing], 8.0)
 .padding([.bottom], axisLabelsData.axisXLabels.count > 0 ? 28.0 : 0)
 .frame(maxHeight: .infinity)
 VStack {
 self.content()
 HStack {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 if index != axisLabelsData.axisXLabels.count - 1 {
 Spacer()
 }
 }
 chart
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 Spacer(minLength: yAxisWidth)
 } else {
 yAxis
 }
 }
.padding([.top, .bottom], 10.0)
xAxis(chartWidth: chartWidth)
 }
 }

 private func getYHeight(index: Int, chartHeight: CGFloat, count: Int) -> CGFloat {
 if index == 0 || index == count - 1 {
 return chartHeight / (CGFloat(count - 1) * 2) + 10
 }

 return chartHeight / CGFloat(count - 1)
 }

 private func getYAlignment(index: Int, count: Int) -> Alignment {
 if index == 0 {
 return .top
 }

 if index == count - 1 {
 return .bottom
 }

 return .center
 }
}

46 changes: 45 additions & 1 deletion
Sources/SwiftUICharts/Base/Axis/Extension/AxisLabels+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,57 @@
import SwiftUI

extension AxisLabels {
 public func setAxisYLabels(_ labels: [String]) -> AxisLabels {
 public func setAxisYLabels(_ labels: [String],
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 self.axisLabelsData.axisYLabels = labels
 self.axisLabelsStyle.axisLabelsYPosition = position
 return self
 }

 public func setAxisXLabels(_ labels: [String]) -> AxisLabels {
 self.axisLabelsData.axisXLabels = labels
 return self
 }

 public func setAxisYLabels(_ labels: [(Double, String)],
 range: ClosedRange<Int>,
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisYLabels = labelArray
 self.axisLabelsStyle.axisLabelsYPosition = position

 return self
 }

 public func setAxisXLabels(_ labels: [(Double, String)], range: ClosedRange<Int>) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisXLabels = labelArray
 return self
 }

 public func setColor(_ color: Color) -> AxisLabels {
 self.axisLabelsStyle.axisFontColor = color
 return self
 }

 public func setFont(_ font: Font) -> AxisLabels {
 self.axisLabelsStyle.axisFont = font
 return self
 }
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsPosition.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

public enum AxisLabelsYPosition {
 case leading
 case trailing
}

public enum AxisLabelsXPosition {
 case top
 case bottom
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsStyle.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import SwiftUI

public final class AxisLabelsStyle: ObservableObject {
 @Published public var axisFont: Font = .callout
 @Published public var axisFontColor: Color = .primary
 @Published var axisLabelsYPosition: AxisLabelsYPosition = .leading
 @Published var axisLabelsXPosition: AxisLabelsXPosition = .bottom
 public init() {
 // no-op
 }
}

10 changes: 10 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewGeometry.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import SwiftUI

public struct ViewGeometry<T>: View where T: PreferenceKey {
 public var body: some View {
 GeometryReader { geometry in
 Color.clear
 .preference(key: T.self, value: [ViewSizeData(size: geometry.size)] as! T.Value)
 }
 }
}

15 changes: 15 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewPreferenceKey.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import SwiftUI

public protocol ViewPreferenceKey: PreferenceKey {
 typealias Value = [ViewSizeData]
}

public extension ViewPreferenceKey {
 static var defaultValue: [ViewSizeData] {
 []
 }

 static func reduce(value: inout [ViewSizeData], nextValue: () -> [ViewSizeData]) {
 value.append(contentsOf: nextValue())
 }
}

14 changes: 14 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewSizeData.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import SwiftUI

public struct ViewSizeData: Identifiable, Equatable, Hashable {
 public let id: UUID = UUID()
 public let size: CGSize

 public static func == (lhs: Self, rhs: Self) -> Bool {
 return lhs.id == rhs.id
 }

 public func hash(into hasher: inout Hasher) {
 hasher.combine(id)
 }
}

7 changes: 7 additions & 0 deletions
Sources/SwiftUICharts/Base/Extensions/Array+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,3 +17,10 @@ extension Array where Element == ColorGradient {
 return self[index]
 }
}

extension Collection {
 /// Returns the element at the specified index if it is within bounds, otherwise nil.
 subscript (safe index: Index) -> Element? {
 return indices.contains(index) ? self[index] : nil
 }
}

12 changes: 7 additions & 5 deletions
Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,15 +150,17 @@ extension Path {

 static func drawChartMarkers(data: [(Double, Double)], in rect: CGRect) -> Path {
 var path = Path()
 if data.count < 1 {
 let filteredData = data.filter { $0.1 <= 1 && $0.1 >= 0 }

 if filteredData.count < 1 {
 return path
 }

 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }
 let convertedXValues = filteredData.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = filteredData.map { CGFloat($0.1) * rect.height }

 let markerSize = CGSize(width: 8, height: 8)
 for pointIndex in 0..<data.count {
 for pointIndex in 0..<filteredData.count {
 path.addRoundedRect(in: CGRect(origin: CGPoint(x: convertedXValues[pointIndex] - markerSize.width / 2,
 y: convertedYPoints[pointIndex] - markerSize.height / 2),
 size: markerSize),
Expand DownExpand Up@@ -199,7 +201,7 @@ extension Path {
 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }

 path.move(to: .zero)
 path.move(to: CGPoint(x: convertedXValues[0], y: 0))
 var point1 = CGPoint(x: convertedXValues[0], y: convertedYPoints[0])
 path.addLine(to: point1)
 for pointIndex in 1..<data.count {
Expand Down

7 changes: 4 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/Extension/LineChart+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,13 +6,14 @@ extension LineChart {
 return self
 }

 public func showBackground(_ show: Bool) -> LineChart {
 self.chartProperties.showBackground = show
 public func setBackground(colorGradient: ColorGradient) -> LineChart {
 self.chartProperties.backgroundGradient = colorGradient
 return self
 }

 public func showChartMarks(_ show: Bool) -> LineChart {
 public func showChartMarks(_ show: Bool, with color: ColorGradient? = nil) -> LineChart {
 self.chartProperties.showChartMarks = show
 self.chartProperties.customChartMarksColors = color
 return self
 }

Expand Down

34 changes: 15 additions & 19 deletions
Sources/SwiftUICharts/Charts/LineChart/Line.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import SwiftUI

/// A single line of data, a view in a `LineChart`
public struct Line: View {
 @EnvironmentObject var chartValue: ChartValue
 @ObservedObject var chartData: ChartData
 @ObservedObject var chartProperties: LineChartProperties

Expand All@@ -29,17 +28,17 @@ public struct Line: View {
 public var body: some View {
 GeometryReader { geometry in
 ZStack {
 if self.didCellAppear && self.chartProperties.showBackground {
 if self.didCellAppear, let backgroundColor = chartProperties.backgroundGradient {
 LineBackgroundShapeView(chartData: chartData,
 geometry: geometry,
style: style)
backgroundColor: backgroundColor)
 }
 LineShapeView(chartData: chartData,
 chartProperties: chartProperties,
 geometry: geometry,
 style: style,
 trimTo: didCellAppear ? 1.0 : 0.0)
.animation(.easeIn)
 .animation(Animation.easeIn(duration: 0.75))
 if self.showIndicator {
 IndicatorPoint()
 .position(self.getClosestPointOnPath(geometry: geometry,
Expand All@@ -54,20 +53,17 @@ public struct Line: View {
 .onDisappear() {
 didCellAppear = false
 }

 .gesture(DragGesture()
 .onChanged({ value in
 self.touchLocation = value.location
 self.showIndicator = true
 self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
 self.chartValue.interactionInProgress = true
 })
 .onEnded({ value in
 self.touchLocation = .zero
 self.showIndicator = false
 self.chartValue.interactionInProgress = false
 })
 )
// .gesture(DragGesture()
// .onChanged({ value in
// self.touchLocation = value.location
// self.showIndicator = true
// self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
// })
// .onEnded({ value in
// self.touchLocation = .zero
// self.showIndicator = false
// })
// )
 }
 }
}
Expand All@@ -94,7 +90,7 @@ extension Line {
 let geometryWidth = geometry.frame(in: .local).width
 let index = Int(round((touchLocation.x / geometryWidth) * CGFloat(chartData.points.count - 1)))
 if (index >= 0 && index < self.chartData.data.count){
 self.chartValue.currentValue = self.chartData.points[index]
// self.chartValue.currentValue = self.chartData.points[index]
 }
 }
}
Expand Down

6 changes: 3 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/LineBackgroundShapeView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@ import SwiftUI
struct LineBackgroundShapeView: View {
 var chartData: ChartData
 var geometry: GeometryProxy
 var style: ChartStyle
 var backgroundColor: ColorGradient

 var body: some View {
 LineBackgroundShape(data: chartData.normalisedData)
 .fill(LinearGradient(gradient: Gradient(colors: [style.backgroundColor.startColor,
style.foregroundColor.first?.startColor ?? .white]),
 .fill(LinearGradient(gradient: Gradient(colors: [backgroundColor.startColor,
backgroundColor.endColor]),
 startPoint: .bottom,
 endPoint: .top))
 .rotationEffect(.degrees(180), anchor: .center)
Expand Down
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: add new axis interface#253

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

Oct 24, 2022
 Merged


feat: add new axis interface
#253
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


104 changes: 81 additions & 23 deletions
Sources/SwiftUICharts/Base/Axis/AxisLabels.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,40 +1,98 @@
import SwiftUI

public struct AxisLabels<Content: View>: View {
 struct YAxisViewKey: ViewPreferenceKey { }
 struct ChartViewKey: ViewPreferenceKey { }

 var axisLabelsData = AxisLabelsData()
 var axisLabelsStyle = AxisLabelsStyle()

 @State private var yAxisWidth: CGFloat = 25
 @State private var chartWidth: CGFloat = 0
 @State private var chartHeight: CGFloat = 0

 let content: () -> Content
 // font
 // foregroundColor

 public init(@ViewBuilder content: @escaping () -> Content) {
 self.content = content
 }

 var yAxis: some View {
 VStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(height: getYHeight(index: index,
 chartHeight: chartHeight,
 count: axisLabelsData.axisYLabels.count),
 alignment: getYAlignment(index: index, count: axisLabelsData.axisYLabels.count))
 }
 }
 .padding([.leading, .trailing], 4.0)
 .background(ViewGeometry<YAxisViewKey>())
 .onPreferenceChange(YAxisViewKey.self) { value in
 yAxisWidth = value.first?.size.width ?? 0.0
 }
 }

 func xAxis(chartWidth: CGFloat) -> some View {
 HStack(spacing: 0.0) {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 .font(axisLabelsStyle.axisFont)
 .foregroundColor(axisLabelsStyle.axisFontColor)
 .frame(width: chartWidth / CGFloat(axisLabelsData.axisXLabels.count - 1))
 }
 }
 .frame(height: 24.0, alignment: .top)
 }

 var chart: some View {
 self.content()
 .background(ViewGeometry<ChartViewKey>())
 .onPreferenceChange(ChartViewKey.self) { value in
 chartWidth = value.first?.size.width ?? 0.0
 chartHeight = value.first?.size.height ?? 0.0
 }
 }

 public var body: some View {
 HStack {
 VStack {
 ForEach(Array(axisLabelsData.axisYLabels.reversed().enumerated()), id: \.element) { index, axisYData in
 Text(axisYData)
 if index != axisLabelsData.axisYLabels.count - 1 {
 Spacer()
 }
 VStack(spacing: 0.0) {
 HStack {
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 yAxis
 } else {
 Spacer(minLength: yAxisWidth)
 }
 }
 .padding([.trailing], 8.0)
 .padding([.bottom], axisLabelsData.axisXLabels.count > 0 ? 28.0 : 0)
 .frame(maxHeight: .infinity)
 VStack {
 self.content()
 HStack {
 ForEach(Array(axisLabelsData.axisXLabels.enumerated()), id: \.element) { index, axisXData in
 Text(axisXData)
 if index != axisLabelsData.axisXLabels.count - 1 {
 Spacer()
 }
 }
 chart
 if axisLabelsStyle.axisLabelsYPosition == .leading {
 Spacer(minLength: yAxisWidth)
 } else {
 yAxis
 }
 }
.padding([.top, .bottom], 10.0)
xAxis(chartWidth: chartWidth)
 }
 }

 private func getYHeight(index: Int, chartHeight: CGFloat, count: Int) -> CGFloat {
 if index == 0 || index == count - 1 {
 return chartHeight / (CGFloat(count - 1) * 2) + 10
 }

 return chartHeight / CGFloat(count - 1)
 }

 private func getYAlignment(index: Int, count: Int) -> Alignment {
 if index == 0 {
 return .top
 }

 if index == count - 1 {
 return .bottom
 }

 return .center
 }
}

46 changes: 45 additions & 1 deletion
Sources/SwiftUICharts/Base/Axis/Extension/AxisLabels+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,57 @@
import SwiftUI

extension AxisLabels {
 public func setAxisYLabels(_ labels: [String]) -> AxisLabels {
 public func setAxisYLabels(_ labels: [String],
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 self.axisLabelsData.axisYLabels = labels
 self.axisLabelsStyle.axisLabelsYPosition = position
 return self
 }

 public func setAxisXLabels(_ labels: [String]) -> AxisLabels {
 self.axisLabelsData.axisXLabels = labels
 return self
 }

 public func setAxisYLabels(_ labels: [(Double, String)],
 range: ClosedRange<Int>,
 position: AxisLabelsYPosition = .leading) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisYLabels = labelArray
 self.axisLabelsStyle.axisLabelsYPosition = position

 return self
 }

 public func setAxisXLabels(_ labels: [(Double, String)], range: ClosedRange<Int>) -> AxisLabels {
 let overreach = range.overreach + 1
 var labelArray = [String](repeating: "", count: overreach)
 labels.forEach {
 let index = Int($0.0) - range.lowerBound
 if labelArray[safe: index] != nil {
 labelArray[index] = $0.1
 }
 }

 self.axisLabelsData.axisXLabels = labelArray
 return self
 }

 public func setColor(_ color: Color) -> AxisLabels {
 self.axisLabelsStyle.axisFontColor = color
 return self
 }

 public func setFont(_ font: Font) -> AxisLabels {
 self.axisLabelsStyle.axisFont = font
 return self
 }
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsPosition.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import Foundation

public enum AxisLabelsYPosition {
 case leading
 case trailing
}

public enum AxisLabelsXPosition {
 case top
 case bottom
}

11 changes: 11 additions & 0 deletions
Sources/SwiftUICharts/Base/Axis/Model/AxisLabelsStyle.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import SwiftUI

public final class AxisLabelsStyle: ObservableObject {
 @Published public var axisFont: Font = .callout
 @Published public var axisFontColor: Color = .primary
 @Published var axisLabelsYPosition: AxisLabelsYPosition = .leading
 @Published var axisLabelsXPosition: AxisLabelsXPosition = .bottom
 public init() {
 // no-op
 }
}

10 changes: 10 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewGeometry.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
import SwiftUI

public struct ViewGeometry<T>: View where T: PreferenceKey {
 public var body: some View {
 GeometryReader { geometry in
 Color.clear
 .preference(key: T.self, value: [ViewSizeData(size: geometry.size)] as! T.Value)
 }
 }
}

15 changes: 15 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewPreferenceKey.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
import SwiftUI

public protocol ViewPreferenceKey: PreferenceKey {
 typealias Value = [ViewSizeData]
}

public extension ViewPreferenceKey {
 static var defaultValue: [ViewSizeData] {
 []
 }

 static func reduce(value: inout [ViewSizeData], nextValue: () -> [ViewSizeData]) {
 value.append(contentsOf: nextValue())
 }
}

14 changes: 14 additions & 0 deletions
Sources/SwiftUICharts/Base/Common/ViewSizeData.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
import SwiftUI

public struct ViewSizeData: Identifiable, Equatable, Hashable {
 public let id: UUID = UUID()
 public let size: CGSize

 public static func == (lhs: Self, rhs: Self) -> Bool {
 return lhs.id == rhs.id
 }

 public func hash(into hasher: inout Hasher) {
 hasher.combine(id)
 }
}

7 changes: 7 additions & 0 deletions
Sources/SwiftUICharts/Base/Extensions/Array+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,3 +17,10 @@ extension Array where Element == ColorGradient {
 return self[index]
 }
}

extension Collection {
 /// Returns the element at the specified index if it is within bounds, otherwise nil.
 subscript (safe index: Index) -> Element? {
 return indices.contains(index) ? self[index] : nil
 }
}

12 changes: 7 additions & 5 deletions
Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -150,15 +150,17 @@ extension Path {

 static func drawChartMarkers(data: [(Double, Double)], in rect: CGRect) -> Path {
 var path = Path()
 if data.count < 1 {
 let filteredData = data.filter { $0.1 <= 1 && $0.1 >= 0 }

 if filteredData.count < 1 {
 return path
 }

 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }
 let convertedXValues = filteredData.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = filteredData.map { CGFloat($0.1) * rect.height }

 let markerSize = CGSize(width: 8, height: 8)
 for pointIndex in 0..<data.count {
 for pointIndex in 0..<filteredData.count {
 path.addRoundedRect(in: CGRect(origin: CGPoint(x: convertedXValues[pointIndex] - markerSize.width / 2,
 y: convertedYPoints[pointIndex] - markerSize.height / 2),
 size: markerSize),
Expand DownExpand Up@@ -199,7 +201,7 @@ extension Path {
 let convertedXValues = data.map { CGFloat($0.0) * rect.width }
 let convertedYPoints = data.map { CGFloat($0.1) * rect.height }

 path.move(to: .zero)
 path.move(to: CGPoint(x: convertedXValues[0], y: 0))
 var point1 = CGPoint(x: convertedXValues[0], y: convertedYPoints[0])
 path.addLine(to: point1)
 for pointIndex in 1..<data.count {
Expand Down

7 changes: 4 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/Extension/LineChart+Extension.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,13 +6,14 @@ extension LineChart {
 return self
 }

 public func showBackground(_ show: Bool) -> LineChart {
 self.chartProperties.showBackground = show
 public func setBackground(colorGradient: ColorGradient) -> LineChart {
 self.chartProperties.backgroundGradient = colorGradient
 return self
 }

 public func showChartMarks(_ show: Bool) -> LineChart {
 public func showChartMarks(_ show: Bool, with color: ColorGradient? = nil) -> LineChart {
 self.chartProperties.showChartMarks = show
 self.chartProperties.customChartMarksColors = color
 return self
 }

Expand Down

34 changes: 15 additions & 19 deletions
Sources/SwiftUICharts/Charts/LineChart/Line.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,6 @@ import SwiftUI

/// A single line of data, a view in a `LineChart`
public struct Line: View {
 @EnvironmentObject var chartValue: ChartValue
 @ObservedObject var chartData: ChartData
 @ObservedObject var chartProperties: LineChartProperties

Expand All@@ -29,17 +28,17 @@ public struct Line: View {
 public var body: some View {
 GeometryReader { geometry in
 ZStack {
 if self.didCellAppear && self.chartProperties.showBackground {
 if self.didCellAppear, let backgroundColor = chartProperties.backgroundGradient {
 LineBackgroundShapeView(chartData: chartData,
 geometry: geometry,
style: style)
backgroundColor: backgroundColor)
 }
 LineShapeView(chartData: chartData,
 chartProperties: chartProperties,
 geometry: geometry,
 style: style,
 trimTo: didCellAppear ? 1.0 : 0.0)
.animation(.easeIn)
 .animation(Animation.easeIn(duration: 0.75))
 if self.showIndicator {
 IndicatorPoint()
 .position(self.getClosestPointOnPath(geometry: geometry,
Expand All@@ -54,20 +53,17 @@ public struct Line: View {
 .onDisappear() {
 didCellAppear = false
 }

 .gesture(DragGesture()
 .onChanged({ value in
 self.touchLocation = value.location
 self.showIndicator = true
 self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
 self.chartValue.interactionInProgress = true
 })
 .onEnded({ value in
 self.touchLocation = .zero
 self.showIndicator = false
 self.chartValue.interactionInProgress = false
 })
 )
// .gesture(DragGesture()
// .onChanged({ value in
// self.touchLocation = value.location
// self.showIndicator = true
// self.getClosestDataPoint(geometry: geometry, touchLocation: value.location)
// })
// .onEnded({ value in
// self.touchLocation = .zero
// self.showIndicator = false
// })
// )
 }
 }
}
Expand All@@ -94,7 +90,7 @@ extension Line {
 let geometryWidth = geometry.frame(in: .local).width
 let index = Int(round((touchLocation.x / geometryWidth) * CGFloat(chartData.points.count - 1)))
 if (index >= 0 && index < self.chartData.data.count){
 self.chartValue.currentValue = self.chartData.points[index]
// self.chartValue.currentValue = self.chartData.points[index]
 }
 }
}
Expand Down

6 changes: 3 additions & 3 deletions
Sources/SwiftUICharts/Charts/LineChart/LineBackgroundShapeView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,12 +3,12 @@ import SwiftUI
struct LineBackgroundShapeView: View {
 var chartData: ChartData
 var geometry: GeometryProxy
 var style: ChartStyle
 var backgroundColor: ColorGradient

 var body: some View {
 LineBackgroundShape(data: chartData.normalisedData)
 .fill(LinearGradient(gradient: Gradient(colors: [style.backgroundColor.startColor,
style.foregroundColor.first?.startColor ?? .white]),
 .fill(LinearGradient(gradient: Gradient(colors: [backgroundColor.startColor,
backgroundColor.endColor]),
 startPoint: .bottom,
 endPoint: .top))
 .rotationEffect(.degrees(180), anchor: .center)
Expand Down
Loading