Fixing graph colors

feature/top10
Laurent 7 years ago
parent f0d6628840
commit e319a4e374
  1. 3
      app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt
  3. 2
      app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt
  4. 4
      app/src/main/java/net/pokeranalytics/android/ui/graph/AxisFormatter.kt

@ -52,7 +52,7 @@ class Report(var options: Calculator.Options) {
return PALineDataSet(entries, statName, context) return PALineDataSet(entries, statName, context)
} }
fun barEntries(stat: Stat? = null): BarDataSet { fun barEntries(stat: Stat? = null, context: Context): BarDataSet {
val entries = mutableListOf<BarEntry>() val entries = mutableListOf<BarEntry>()
val statToUse = stat ?: options.displayedStats.firstOrNull() val statToUse = stat ?: options.displayedStats.firstOrNull()
@ -67,6 +67,7 @@ class Report(var options: Calculator.Options) {
} }
val barDataSet = BarDataSet(entries, statToUse?.name) val barDataSet = BarDataSet(entries, statToUse?.name)
barDataSet.color = context.getColor(R.color.green)
barDataSet.setDrawValues(false) barDataSet.setDrawValues(false)
return barDataSet return barDataSet
} }

@ -23,7 +23,7 @@ class ReportPagerAdapter(val context: Context, val fragmentManager: FragmentMana
override fun getItem(position: Int): PokerAnalyticsFragment { override fun getItem(position: Int): PokerAnalyticsFragment {
return when (position) { return when (position) {
0 -> { 0 -> {
val dataSetList = listOf(report.barEntries()) val dataSetList = listOf(report.barEntries(null, context))
GraphFragment.newInstance(dataSetList) GraphFragment.newInstance(dataSetList)
} }
1 -> { 1 -> {

@ -159,7 +159,7 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() {
} }
AggregationType.MONTH, AggregationType.YEAR -> { AggregationType.MONTH, AggregationType.YEAR -> {
when (this.stat) { 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()) else -> report.lineEntries(this.stat, requireContext())
} }
} }

@ -3,6 +3,7 @@ package net.pokeranalytics.android.ui.graph
import com.github.mikephil.charting.components.AxisBase import com.github.mikephil.charting.components.AxisBase
import com.github.mikephil.charting.formatter.ValueFormatter import com.github.mikephil.charting.formatter.ValueFormatter
import net.pokeranalytics.android.util.extensions.kmbFormatted import net.pokeranalytics.android.util.extensions.kmbFormatted
import kotlin.math.roundToInt
class LargeNumberFormatter : ValueFormatter() { class LargeNumberFormatter : ValueFormatter() {
@ -11,8 +12,7 @@ class LargeNumberFormatter : ValueFormatter() {
} }
override fun getAxisLabel(value: Float, axis: AxisBase?): String { override fun getAxisLabel(value: Float, axis: AxisBase?): String {
val test = value.kmbFormatted return value.roundToInt().kmbFormatted
return test
} }
} }

Loading…
Cancel
Save