Fixes Custom Table report that was empty

split
Laurent 5 years ago
parent 972c73500c
commit c460acd631
  1. 9
      app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
  2. 5
      app/src/main/java/net/pokeranalytics/android/ui/fragment/report/TableReportFragment.kt

@ -78,8 +78,7 @@ class Calculator {
TABLE, TABLE,
PROGRESS, PROGRESS,
COMPARISON, COMPARISON,
MAP, MAP;
POLYNOMIAL;
override val resId: Int? override val resId: Int?
get() { get() {
@ -88,7 +87,6 @@ class Calculator {
PROGRESS -> R.string.progress PROGRESS -> R.string.progress
COMPARISON -> R.string.comparison COMPARISON -> R.string.comparison
MAP -> R.string.map MAP -> R.string.map
POLYNOMIAL -> null
} }
} }
@ -99,9 +97,6 @@ class Calculator {
PROGRESS -> ProgressReportActivity::class.java PROGRESS -> ProgressReportActivity::class.java
COMPARISON -> ComparisonReportActivity::class.java COMPARISON -> ComparisonReportActivity::class.java
else -> throw PAIllegalStateException("undefined activity for report display") else -> throw PAIllegalStateException("undefined activity for report display")
// MAP -> R.string.map
// POLYNOMIAL -> null
} }
} }
} }
@ -135,6 +130,7 @@ class Calculator {
get() { get() {
return this.stats.contains(LONGEST_STREAKS) return this.stats.contains(LONGEST_STREAKS)
} }
/** /**
* Whether the values should be sorted * Whether the values should be sorted
*/ */
@ -142,6 +138,7 @@ class Calculator {
get() { get() {
return this.progressValues != ProgressValues.NONE || this.computeLongestStreak return this.progressValues != ProgressValues.NONE || this.computeLongestStreak
} }
/** /**
* Whether the number of locations played should be computed * Whether the number of locations played should be computed
*/ */

@ -6,6 +6,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.databinding.FragmentTableReportBinding import net.pokeranalytics.android.databinding.FragmentTableReportBinding
import net.pokeranalytics.android.ui.activity.components.ReportActivity
class TableReportFragment : AbstractReportFragment() { class TableReportFragment : AbstractReportFragment() {
@ -45,7 +46,9 @@ class TableReportFragment : AbstractReportFragment() {
private fun initUI() { private fun initUI() {
val fragmentTransaction = parentActivity?.supportFragmentManager?.beginTransaction() 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?.add(R.id.tableReportContainer, fragment)
fragmentTransaction?.commit() fragmentTransaction?.commit()

Loading…
Cancel
Save