diff --git a/app/build.gradle b/app/build.gradle index 758e8fb3..3da9bc75 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" } 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 bac8ab34..c795e299 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Report.kt @@ -439,7 +439,7 @@ class ComputedResults(group: ComputableGroup, shouldManageMultiGroupProgressValu } } - return DataSetFactory.barDataSetInstance(entries, stat.name, context) + return DataSetFactory.barDataSetInstance(entries, stat.name, context, colors) } val isEmpty: Boolean diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/DataSetFactory.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/DataSetFactory.kt index 4ca91b45..92da7ca9 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/DataSetFactory.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/DataSetFactory.kt @@ -24,10 +24,14 @@ class DataSetFactory { return lineDataSet } - fun barDataSetInstance(entries: List, label: String, context: Context) : BarDataSet { + fun barDataSetInstance(entries: List, label: String, context: Context, colors: MutableList? = 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