From c460acd6310dd426aabd9726a715bdd0546580a8 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 11 Dec 2020 15:58:29 +0100 Subject: [PATCH] Fixes Custom Table report that was empty --- .../net/pokeranalytics/android/calculus/Calculator.kt | 9 +++------ .../android/ui/fragment/report/TableReportFragment.kt | 5 ++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt index 2fe75bc1..01768170 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt @@ -78,8 +78,7 @@ class Calculator { TABLE, PROGRESS, COMPARISON, - MAP, - POLYNOMIAL; + MAP; override val resId: Int? get() { @@ -88,7 +87,6 @@ class Calculator { PROGRESS -> R.string.progress COMPARISON -> R.string.comparison MAP -> R.string.map - POLYNOMIAL -> null } } @@ -99,9 +97,6 @@ class Calculator { PROGRESS -> ProgressReportActivity::class.java COMPARISON -> ComparisonReportActivity::class.java else -> throw PAIllegalStateException("undefined activity for report display") -// MAP -> R.string.map -// POLYNOMIAL -> null - } } } @@ -135,6 +130,7 @@ class Calculator { get() { return this.stats.contains(LONGEST_STREAKS) } + /** * Whether the values should be sorted */ @@ -142,6 +138,7 @@ class Calculator { get() { return this.progressValues != ProgressValues.NONE || this.computeLongestStreak } + /** * Whether the number of locations played should be computed */ diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/TableReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/TableReportFragment.kt index caf16361..bdfd86c8 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/TableReportFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/TableReportFragment.kt @@ -6,6 +6,7 @@ import android.view.View import android.view.ViewGroup import net.pokeranalytics.android.R import net.pokeranalytics.android.databinding.FragmentTableReportBinding +import net.pokeranalytics.android.ui.activity.components.ReportActivity class TableReportFragment : AbstractReportFragment() { @@ -45,7 +46,9 @@ class TableReportFragment : AbstractReportFragment() { private fun initUI() { val fragmentTransaction = parentActivity?.supportFragmentManager?.beginTransaction() - val fragment = ComposableTableReportFragment.newInstance() + + val report = (activity as ReportActivity).model.report + val fragment = ComposableTableReportFragment.newInstance(report) fragmentTransaction?.add(R.id.tableReportContainer, fragment) fragmentTransaction?.commit()