From a72a716deeb29feef91c5e3972823a6412191a8e Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 19 Apr 2019 17:29:36 +0200 Subject: [PATCH] Bugfix --- .../net/pokeranalytics/android/PokerAnalyticsApplication.kt | 2 +- .../android/ui/fragment/StatisticsFragment.kt | 5 +---- .../android/ui/fragment/TableReportFragment.kt | 6 +++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt index 1c9b7d94..75c03014 100644 --- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -52,7 +52,7 @@ class PokerAnalyticsApplication : Application() { if (BuildConfig.DEBUG) { Timber.d("UserPreferences.defaultCurrency: ${UserDefaults.currency.symbol}") - //this.createFakeSessions() + this.createFakeSessions() } Patcher.patchBreaks() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt index d74f9532..285f76f5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt @@ -13,7 +13,6 @@ import net.pokeranalytics.android.calculus.ComputableGroup import net.pokeranalytics.android.calculus.Report import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.model.filter.QueryCondition -import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.StatRow @@ -26,8 +25,6 @@ class StatisticsFragment : TableReportFragment() { override val coroutineContext: CoroutineContext get() = Dispatchers.Main - private lateinit var statsAdapter: RowRepresentableAdapter - private var stringAll = "" private var stringCashGame = "" private var stringTournament = "" @@ -57,7 +54,7 @@ class StatisticsFragment : TableReportFragment() { override fun sessionsChanged() { this.launchStatComputation() - this.statsAdapter.notifyDataSetChanged() + this.statsAdapter?.notifyDataSetChanged() } override fun initData() { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/TableReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/TableReportFragment.kt index eb9d41bd..07cdc63c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/TableReportFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/TableReportFragment.kt @@ -32,7 +32,7 @@ open class TableReportFragment : SessionObserverFragment(), StaticRowRepresentab private var rowRepresentables: ArrayList = ArrayList() - private lateinit var statsAdapter: RowRepresentableAdapter + var statsAdapter: RowRepresentableAdapter? = null var report : Report? = null companion object { @@ -97,7 +97,7 @@ open class TableReportFragment : SessionObserverFragment(), StaticRowRepresentab override fun onResume() { super.onResume() - statsAdapter.notifyDataSetChanged() + statsAdapter?.notifyDataSetChanged() } // Business @@ -127,7 +127,7 @@ open class TableReportFragment : SessionObserverFragment(), StaticRowRepresentab fun showResults() { report?.let { this.rowRepresentables = this.convertReportIntoRepresentables(it) - statsAdapter.notifyDataSetChanged() + statsAdapter?.notifyDataSetChanged() } }