From e319a4e374a27831ec111d38d85a8992521711cd Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 22 Apr 2019 11:58:53 +0200 Subject: [PATCH] Fixing graph colors --- .../main/java/net/pokeranalytics/android/calculus/Report.kt | 3 ++- .../pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt | 2 +- .../android/ui/fragment/StatisticDetailsFragment.kt | 2 +- .../java/net/pokeranalytics/android/ui/graph/AxisFormatter.kt | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt index 5f716c59..ad923e71 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt @@ -52,7 +52,7 @@ class Report(var options: Calculator.Options) { return PALineDataSet(entries, statName, context) } - fun barEntries(stat: Stat? = null): BarDataSet { + fun barEntries(stat: Stat? = null, context: Context): BarDataSet { val entries = mutableListOf() val statToUse = stat ?: options.displayedStats.firstOrNull() @@ -67,6 +67,7 @@ class Report(var options: Calculator.Options) { } val barDataSet = BarDataSet(entries, statToUse?.name) + barDataSet.color = context.getColor(R.color.green) barDataSet.setDrawValues(false) return barDataSet } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt index ce2e3941..71c6e377 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt @@ -23,7 +23,7 @@ class ReportPagerAdapter(val context: Context, val fragmentManager: FragmentMana override fun getItem(position: Int): PokerAnalyticsFragment { return when (position) { 0 -> { - val dataSetList = listOf(report.barEntries()) + val dataSetList = listOf(report.barEntries(null, context)) GraphFragment.newInstance(dataSetList) } 1 -> { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt index 34b2fdfd..bf6229e0 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt @@ -159,7 +159,7 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() { } AggregationType.MONTH, AggregationType.YEAR -> { when (this.stat) { - Stat.NUMBER_OF_GAMES, Stat.NUMBER_OF_SETS -> report.barEntries(this.stat) + Stat.NUMBER_OF_GAMES, Stat.NUMBER_OF_SETS -> report.barEntries(this.stat, requireContext()) else -> report.lineEntries(this.stat, requireContext()) } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/AxisFormatter.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/AxisFormatter.kt index 9c6fa0f3..8b9673c9 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/AxisFormatter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/AxisFormatter.kt @@ -3,6 +3,7 @@ package net.pokeranalytics.android.ui.graph import com.github.mikephil.charting.components.AxisBase import com.github.mikephil.charting.formatter.ValueFormatter import net.pokeranalytics.android.util.extensions.kmbFormatted +import kotlin.math.roundToInt class LargeNumberFormatter : ValueFormatter() { @@ -11,8 +12,7 @@ class LargeNumberFormatter : ValueFormatter() { } override fun getAxisLabel(value: Float, axis: AxisBase?): String { - val test = value.kmbFormatted - return test + return value.roundToInt().kmbFormatted } }