Graph style

feature/top10
Laurent 7 years ago
parent 221400ad32
commit 1f8cb4d8f3
  1. 2
      app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
  3. 13
      app/src/main/java/net/pokeranalytics/android/ui/graph/ChartDataSet.kt
  4. 2
      app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt
  5. 1
      app/src/main/res/values/colors.xml

@ -51,7 +51,7 @@ class PokerAnalyticsApplication : Application() {
} }
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
// this.createFakeSessions() this.createFakeSessions()
} }
} }

@ -9,7 +9,6 @@ import com.github.mikephil.charting.charts.BarLineChartBase
import com.github.mikephil.charting.charts.LineChart import com.github.mikephil.charting.charts.LineChart
import com.github.mikephil.charting.data.Entry import com.github.mikephil.charting.data.Entry
import com.github.mikephil.charting.data.LineData 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.highlight.Highlight
import com.github.mikephil.charting.listener.OnChartValueSelectedListener import com.github.mikephil.charting.listener.OnChartValueSelectedListener
import com.google.android.material.chip.Chip 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.calculus.Stat
import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment 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.graph.setStyle
import net.pokeranalytics.android.ui.view.LegendView import net.pokeranalytics.android.ui.view.LegendView
import net.pokeranalytics.android.util.extensions.ChipGroupExtension import net.pokeranalytics.android.util.extensions.ChipGroupExtension
@ -68,7 +68,7 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
this.legendContainer.addView(this.legendView) this.legendContainer.addView(this.legendView)
this.legendView.prepareWithStat(this.stat, this.entries.size) 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() val colors = arrayOf(R.color.green_light).toIntArray()
dataSet.setColors(colors, context) dataSet.setColors(colors, context)
dataSet.setDrawCircles(false) dataSet.setDrawCircles(false)

@ -1,2 +1,15 @@
package net.pokeranalytics.android.ui.graph 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<Entry>, label: String, context: Context) : LineDataSet(yVals, label) {
init {
this.highLightColor = context.getColor(R.color.chart_highlight_indicator)
}
}

@ -17,8 +17,6 @@ fun BarLineChartBase<*>.setStyle(small: Boolean, context: Context) {
this.xAxis.labelCount = 4 this.xAxis.labelCount = 4
this.xAxis.position = XAxis.XAxisPosition.BOTTOM 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.textColor = ContextCompat.getColor(context, R.color.chart_default)
this.xAxis.typeface = Typeface.DEFAULT this.xAxis.typeface = Typeface.DEFAULT
this.xAxis.labelCount = 4 this.xAxis.labelCount = 4

@ -38,5 +38,6 @@
<color name="purple">#8e35c8</color> <color name="purple">#8e35c8</color>
<color name="chart_default">#5c7258</color> <color name="chart_default">#5c7258</color>
<color name="chart_highlight_indicator">#f8ffe5</color>
</resources> </resources>

Loading…
Cancel
Save