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 69fe9938..2492ed13 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 @@ -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.setStyle import net.pokeranalytics.android.ui.view.LegendView -import timber.log.Timber import kotlin.coroutines.CoroutineContext @@ -97,7 +96,6 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co * Init UI */ private fun initUI() { - Timber.d("initUI") parentActivity = activity as PokerAnalyticsActivity parentActivity.title = stat.localizedTitle(requireContext()) @@ -118,7 +116,6 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co * Load graph */ private fun loadGraph() { - Timber.d("loadGraph") val graphEntries = when (aggregationType) { AggregationType.SESSION, AggregationType.DURATION -> selectedReport.results.firstOrNull()?.defaultStatEntries(stat) @@ -167,12 +164,11 @@ class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener, Co /** * Set data */ - fun setData(report: Report, aggregationType: AggregationType) { - Timber.d("setData") + fun setData(report: Report, stat: Stat, aggregationType: AggregationType) { this.selectedReport = report this.aggregationType = aggregationType - this.stat = report.options.displayedStats.first() + this.stat = stat if (isAdded && !isDetached) { loadGraph() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt index 37ac6e25..0170bef7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticDetailsFragment.kt @@ -75,10 +75,9 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() { fragmentTransaction.add(R.id.graphContainer, graphFragment) fragmentTransaction.commit() - stat.aggregationTypes.firstOrNull()?.let { aggregationType -> reports[aggregationType]?.let { report -> - graphFragment.setData(report, aggregationType) + graphFragment.setData(report, stat, aggregationType) } } @@ -103,7 +102,7 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() { val aggregationType = aggregationTypes[checkedId] reports[aggregationType]?.let { report -> - graphFragment.setData(report, aggregationType) + graphFragment.setData(report, stat, aggregationType) } ?: run { launchStatComputation(aggregationType) } @@ -140,7 +139,7 @@ class StatisticDetailsFragment : PokerAnalyticsFragment() { Timber.d(">>> ended in $duration seconds") launch(Dispatchers.Main) { - graphFragment.setData(report, aggregationType) + graphFragment.setData(report, stat, aggregationType) progressBar.hideWithAnimation() graphContainer.showWithAnimation() }