Skip to content
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

Jump to bottom

Bug fix LineChart, Button added #248

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug fix LineChart, Button added #248

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sources/SwiftUICharts/BarChart/BarChartView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public struct BarChartView : View {
public var darkModeStyle: ChartStyle
public var formSize:CGSize
public var dropShadow: Bool
public var cornerImage: Image?
public var cornerButton: Button<AnyView>?
public var valueSpecifier:String
public var animatedToBack: Bool

Expand All @@ -34,15 +34,15 @@ public struct BarChartView : View {
var isFullWidth:Bool {
return self.formSize == ChartForm.large
}
public init(data:ChartData, title: String, legend: String? = nil, style: ChartStyle = Styles.barChartStyleOrangeLight, form: CGSize? = ChartForm.medium, dropShadow: Bool? = true, cornerImage:Image? = Image(systemName: "waveform.path.ecg"), valueSpecifier: String? = "%.1f", animatedToBack: Bool = false){
public init(data:ChartData, title: String, legend: String? = nil, style: ChartStyle = Styles.barChartStyleOrangeLight, form: CGSize? = ChartForm.medium, dropShadow: Bool? = true, cornerButton: Button<AnyView>? = nil, valueSpecifier: String? = "%.1f", animatedToBack: Bool = false){
self.data = data
self.title = title
self.legend = legend
self.style = style
self.darkModeStyle = style.darkModeStyle != nil ? style.darkModeStyle! : Styles.barChartStyleOrangeDark
self.formSize = form!
self.dropShadow = dropShadow!
self.cornerImage = cornerImage
self.cornerButton = cornerButton
self.valueSpecifier = valueSpecifier!
self.animatedToBack = animatedToBack
}
Expand Down Expand Up @@ -72,7 +72,7 @@ public struct BarChartView : View {
.animation(.easeOut)
}
Spacer()
self.cornerImage
self.cornerButton
.imageScale(.large)
.foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.legendTextColor : self.style.legendTextColor)
}.padding()
Expand Down
6 changes: 3 additions & 3 deletions Sources/SwiftUICharts/LineChart/LineChartView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public struct LineChartView: View {
legend: String? = nil,
style: ChartStyle = Styles.lineChartStyleOne,
form: CGSize? = ChartForm.medium,
rateValue: Int?,
rateValue: Int? = nil,
dropShadow: Bool? = true,
valueSpecifier: String? = "%.1f") {

Expand Down Expand Up @@ -76,12 +76,12 @@ public struct LineChartView: View {

if let rateValue = self.rateValue
{
if (rateValue ?? 0 >= 0){
if (rateValue >= 0){
Image(systemName: "arrow.up")
}else{
Image(systemName: "arrow.down")
}
Text("\(rateValue!)%")
Text("\(rateValue)%")
}
}
}
Expand Down