Fixing distribution chart bar colors

feature/top10
Laurent 7 years ago
parent b824aa9aaf
commit 01cbd460fd
  1. 2
      app/build.gradle
  2. 2
      app/src/main/java/net/pokeranalytics/android/calculus/Report.kt
  3. 8
      app/src/main/java/net/pokeranalytics/android/ui/graph/DataSetFactory.kt

@ -28,7 +28,7 @@ android {
applicationId "net.pokeranalytics.android"
minSdkVersion 23
targetSdkVersion 28
versionCode 19
versionCode 22
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

@ -441,7 +441,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu
}
}
return DataSetFactory.barDataSetInstance(entries, stat.name, context)
return DataSetFactory.barDataSetInstance(entries, stat.name, context, colors)
}
val isEmpty: Boolean

@ -24,10 +24,14 @@ class DataSetFactory {
return lineDataSet
}
fun barDataSetInstance(entries: List<BarEntry>, label: String, context: Context) : BarDataSet {
fun barDataSetInstance(entries: List<BarEntry>, label: String, context: Context, colors: MutableList<Int>? = null) : BarDataSet {
val barDataSet = BarDataSet(entries, label)
barDataSet.color = context.getColor(R.color.chart_bar)
if (colors != null) {
barDataSet.colors = colors
} else {
barDataSet.color = context.getColor(R.color.chart_bar)
}
barDataSet.highLightColor = context.getColor(R.color.chart_selected_bar)
barDataSet.setDrawValues(false)
return barDataSet

Loading…
Cancel
Save