From b376ad2547410b709d14f8275435cfbc484df8fa Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 19 Apr 2019 14:01:10 +0200 Subject: [PATCH] Correctly set chart color --- .../net/pokeranalytics/android/ui/fragment/GraphFragment.kt | 4 ++-- .../net/pokeranalytics/android/ui/graph/ChartDataSet.kt | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt index 44b8b4cd..b094b4f8 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt @@ -124,8 +124,8 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co when (dataSet) { is LineDataSet -> { val lineChart: LineChart = this.chartView as LineChart - val colors = arrayOf(R.color.green_light).toIntArray() - dataSet.setColors(colors, context) +// val colors = arrayOf(R.color.green_light).toIntArray() +// dataSet.setColors(colors, context) val lineData = LineData(listOf(dataSet)) lineChart.data = lineData } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt index 9e2762e7..2338ad35 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt @@ -11,10 +11,16 @@ class PALineDataSet(yVals: List, label: String, context: Context) : LineD this.highLightColor = context.getColor(R.color.chart_highlight_indicator) this.setDrawValues(false) this.setDrawCircles(false) + + val colors = arrayOf(R.color.green_light).toIntArray() + this.setColors(colors, context) + } } + + //class PABarDataSet(yVals: List, label: String, context: Context) : BarDataSet(yVals, label) { // // init {