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

Add mapping for valueColors on data sets #75

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

Add mapping for valueColors on data sets #75

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
5 changes: 5 additions & 0 deletions RNiOSCharts/RNHorizontalBarChart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ class RNHorizontalBarChart : HorizontalBarChartView {
if tmp["valueTextColor"].exists() {
dataSet.valueTextColor = RCTConvert.uiColor(tmp["valueTextColor"].intValue);
}

if tmp["valueColors"].exists() {
let arrColors = tmp["colors"].arrayObject as! [Int];
dataSet.valueColors = arrColors.map({return RCTConvert.uiColor($0)});
}

if json["valueFormatter"].exists() {
if json["valueFormatter"]["minimumDecimalPlaces"].exists() {
Expand Down
7 changes: 6 additions & 1 deletion RNiOSCharts/RNPieChart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,12 @@ class RNPieChart : PieChartView {
if tmp["valueTextColor"].exists() {
dataSet.valueTextColor = RCTConvert.uiColor(tmp["valueTextColor"].intValue);
}


if tmp["valueColors"].exists() {
let arrColors = tmp["colors"].arrayObject as! [Int];
dataSet.valueColors = arrColors.map({return RCTConvert.uiColor($0)});
}

if json["valueFormatter"].exists() {
if json["valueFormatter"]["minimumDecimalPlaces"].exists() {
minimumDecimalPlaces = json["valueFormatter"]["minimumDecimalPlaces"].intValue;
Expand Down
7 changes: 6 additions & 1 deletion RNiOSCharts/RNRadarChart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,12 @@ class RNRadarChart : RadarChartView {
if tmp["valueTextColor"].exists() {
dataSet.valueTextColor = RCTConvert.uiColor(tmp["valueTextColor"].intValue);
}


if tmp["valueColors"].exists() {
let arrColors = tmp["colors"].arrayObject as! [Int];
dataSet.valueColors = arrColors.map({return RCTConvert.uiColor($0)});
}

if json["valueFormatter"].exists() {
if json["valueFormatter"]["minimumDecimalPlaces"].exists() {
minimumDecimalPlaces = json["valueFormatter"]["minimumDecimalPlaces"].intValue;
Expand Down
25 changes: 25 additions & 0 deletions RNiOSCharts/chartDataHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ func getLineData(_ labels: [String], json: JSON!) -> LineChartData {
dataSet.valueTextColor = RCTConvert.uiColor(tmp["valueTextColor"].intValue);
}

if tmp["valueColors"].exists() {
let arrColors = tmp["colors"].arrayObject as! [Int];
dataSet.valueColors = arrColors.map({return RCTConvert.uiColor($0)});
}

if json["valueFormatter"].exists() {
if json["valueFormatter"]["minimumDecimalPlaces"].exists() {
minimumDecimalPlaces = json["valueFormatter"]["minimumDecimalPlaces"].intValue;
Expand Down Expand Up @@ -313,6 +318,11 @@ func getBarData(_ labels: [String], json: JSON!) -> BarChartData {
dataSet.valueTextColor = RCTConvert.uiColor(tmp["valueTextColor"].intValue);
}

if tmp["valueColors"].exists() {
let arrColors = tmp["colors"].arrayObject as! [Int];
dataSet.valueColors = arrColors.map({return RCTConvert.uiColor($0)});
}

if tmp["axisDependency"].exists() {
let value = tmp["axisDependency"].stringValue;
if value == "left" {
Expand Down Expand Up @@ -468,6 +478,11 @@ func getBubbleData(_ labels: [String], json: JSON!) -> BubbleChartData {
dataSet.valueTextColor = RCTConvert.uiColor(tmp["valueTextColor"].intValue);
}

if tmp["valueColors"].exists() {
let arrColors = tmp["colors"].arrayObject as! [Int];
dataSet.valueColors = arrColors.map({return RCTConvert.uiColor($0)});
}

if json["valueFormatter"].exists() {
if json["valueFormatter"]["minimumDecimalPlaces"].exists() {
minimumDecimalPlaces = json["valueFormatter"]["minimumDecimalPlaces"].intValue;
Expand Down Expand Up @@ -630,6 +645,11 @@ func getScatterData(_ labels: [String], json: JSON!) -> ScatterChartData {
dataSet.valueTextColor = RCTConvert.uiColor(tmp["valueTextColor"].intValue);
}

if tmp["valueColors"].exists() {
let arrColors = tmp["colors"].arrayObject as! [Int];
dataSet.valueColors = arrColors.map({return RCTConvert.uiColor($0)});
}

if tmp["axisDependency"].exists() {
let value = tmp["axisDependency"].stringValue;
if value == "left" {
Expand Down Expand Up @@ -773,6 +793,11 @@ func getCandleStickData(_ labels: [String], json: JSON!) -> CandleChartData {
dataSet.valueTextColor = RCTConvert.uiColor(tmp["valueTextColor"].intValue);
}

if tmp["valueColors"].exists() {
let arrColors = tmp["colors"].arrayObject as! [Int];
dataSet.valueColors = arrColors.map({return RCTConvert.uiColor($0)});
}

if tmp["axisDependency"].exists() {
let value = tmp["axisDependency"].stringValue;
if value == "left" {
Expand Down