From 1f8cb4d8f3f83513b80dc22905e34d9a154e877e Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 12 Apr 2019 14:54:43 +0200 Subject: [PATCH] Graph style --- .../android/PokerAnalyticsApplication.kt | 2 +- .../android/ui/fragment/GraphFragment.kt | 4 ++-- .../pokeranalytics/android/ui/graph/ChartDataSet.kt | 13 +++++++++++++ .../android/ui/graph/GraphExtensions.kt | 2 -- app/src/main/res/values/colors.xml | 1 + 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt index a92e3af4..62539914 100644 --- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -51,7 +51,7 @@ class PokerAnalyticsApplication : Application() { } if (BuildConfig.DEBUG) { - // this.createFakeSessions() + this.createFakeSessions() } } 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 7873db89..474e6a34 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 @@ -9,7 +9,6 @@ import com.github.mikephil.charting.charts.BarLineChartBase import com.github.mikephil.charting.charts.LineChart import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.data.LineData -import com.github.mikephil.charting.data.LineDataSet import com.github.mikephil.charting.highlight.Highlight import com.github.mikephil.charting.listener.OnChartValueSelectedListener import com.google.android.material.chip.Chip @@ -21,6 +20,7 @@ import net.pokeranalytics.android.calculus.ObjectIdentifier import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment +import net.pokeranalytics.android.ui.graph.PALineDataSet import net.pokeranalytics.android.ui.graph.setStyle import net.pokeranalytics.android.ui.view.LegendView import net.pokeranalytics.android.util.extensions.ChipGroupExtension @@ -68,7 +68,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener { this.legendContainer.addView(this.legendView) this.legendView.prepareWithStat(this.stat, this.entries.size) - val dataSet = LineDataSet(this.entries, this.stat.name) + val dataSet = PALineDataSet(this.entries, this.stat.name, requireContext()) val colors = arrayOf(R.color.green_light).toIntArray() dataSet.setColors(colors, context) dataSet.setDrawCircles(false) 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 626bbe2b..df878d24 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 @@ -1,2 +1,15 @@ package net.pokeranalytics.android.ui.graph +import android.content.Context +import com.github.mikephil.charting.data.Entry +import com.github.mikephil.charting.data.LineDataSet +import net.pokeranalytics.android.R + +class PALineDataSet(yVals: List, label: String, context: Context) : LineDataSet(yVals, label) { + + init { + this.highLightColor = context.getColor(R.color.chart_highlight_indicator) + } + + +} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt index d5c5dfcc..12f82a12 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt @@ -17,8 +17,6 @@ fun BarLineChartBase<*>.setStyle(small: Boolean, context: Context) { this.xAxis.labelCount = 4 this.xAxis.position = XAxis.XAxisPosition.BOTTOM - this.xAxis.enableGridDashedLine(3.0f.px, 5.0f.px, 1.0f.px) - this.xAxis.textColor = ContextCompat.getColor(context, R.color.chart_default) this.xAxis.typeface = Typeface.DEFAULT this.xAxis.labelCount = 4 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 65d61cb7..16a219a4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -38,5 +38,6 @@ #8e35c8 #5c7258 + #f8ffe5