Add stat for graph

feature/top10
Aurelien Hubert 7 years ago
parent 55d6151663
commit 421a5ddb08
  1. 8
      app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
  2. 7
      app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt

@ -20,7 +20,6 @@ import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.graph.PALineDataSet 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 timber.log.Timber
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
@ -97,7 +96,6 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co
* Init UI * Init UI
*/ */
private fun initUI() { private fun initUI() {
Timber.d("initUI")
parentActivity = activity as PokerAnalyticsActivity parentActivity = activity as PokerAnalyticsActivity
parentActivity.title = stat.localizedTitle(requireContext()) parentActivity.title = stat.localizedTitle(requireContext())
@ -118,7 +116,6 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co
* Load graph * Load graph
*/ */
private fun loadGraph() { private fun loadGraph() {
Timber.d("loadGraph")
val graphEntries = when (aggregationType) { val graphEntries = when (aggregationType) {
AggregationType.SESSION, AggregationType.DURATION -> selectedReport.results.firstOrNull()?.defaultStatEntries(stat) AggregationType.SESSION, AggregationType.DURATION -> selectedReport.results.firstOrNull()?.defaultStatEntries(stat)
@ -167,12 +164,11 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co
/** /**
* Set data * Set data
*/ */
fun setData(report: Report, aggregationType: AggregationType) { fun setData(report: Report, stat: Stat, aggregationType: AggregationType) {
Timber.d("setData")
this.selectedReport = report this.selectedReport = report
this.aggregationType = aggregationType this.aggregationType = aggregationType
this.stat = report.options.displayedStats.first() this.stat = stat
if (isAdded && !isDetached) { if (isAdded && !isDetached) {
loadGraph() loadGraph()

@ -75,10 +75,9 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() {
fragmentTransaction.add(R.id.graphContainer, graphFragment) fragmentTransaction.add(R.id.graphContainer, graphFragment)
fragmentTransaction.commit() fragmentTransaction.commit()
stat.aggregationTypes.firstOrNull()?.let { aggregationType -> stat.aggregationTypes.firstOrNull()?.let { aggregationType ->
reports[aggregationType]?.let { report -> reports[aggregationType]?.let { report ->
graphFragment.setData(report, aggregationType) graphFragment.setData(report, stat, aggregationType)
} }
} }
@ -103,7 +102,7 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() {
val aggregationType = aggregationTypes[checkedId] val aggregationType = aggregationTypes[checkedId]
reports[aggregationType]?.let { report -> reports[aggregationType]?.let { report ->
graphFragment.setData(report, aggregationType) graphFragment.setData(report, stat, aggregationType)
} ?: run { } ?: run {
launchStatComputation(aggregationType) launchStatComputation(aggregationType)
} }
@ -140,7 +139,7 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() {
Timber.d(">>> ended in $duration seconds") Timber.d(">>> ended in $duration seconds")
launch(Dispatchers.Main) { launch(Dispatchers.Main) {
graphFragment.setData(report, aggregationType) graphFragment.setData(report, stat, aggregationType)
progressBar.hideWithAnimation() progressBar.hideWithAnimation()
graphContainer.showWithAnimation() graphContainer.showWithAnimation()
} }

Loading…
Cancel
Save