From 50bbdffc8d02c98e190a961b287c2f9cb4fc34cd Mon Sep 17 00:00:00 2001 From: Laurent Date: Tue, 26 May 2020 11:44:59 +0200 Subject: [PATCH] Removes warnings --- .../android/model/realm/handhistory/HandHistory.kt | 7 +++---- .../android/ui/adapter/ReportPagerAdapter.kt | 12 ++++-------- .../android/ui/modules/filter/FiltersFragment.kt | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt index c84fe1b1..b2f926bc 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/handhistory/HandHistory.kt @@ -169,14 +169,13 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable, this.session = handSetup.session this.date = this.session?.handHistoryAutomaticDate ?: Date() - this.createActions(handSetup.straddlePositions) + this.createActions() } /*** - * Creates the initial actions of the hand history using the number of players, - * and the optional [straddlePositions] + * Creates the initial actions of the hand history */ - private fun createActions(straddlePositions: List) { + private fun createActions() { this.actions.clear() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt index c6c12033..38527de1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt @@ -14,17 +14,13 @@ import net.pokeranalytics.android.ui.viewmodel.ReportHolder * Home Adapter */ class ReportPagerAdapter(private val context: Context, - val fragmentManager: FragmentManager, - private val reportHolder: ReportHolder) : FragmentPagerAdapter(fragmentManager) { + fragmentManager: FragmentManager, + private val reportHolder: ReportHolder) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { override fun getItem(position: Int): BaseFragment { return when (position) { - 0 -> { - GraphFragment.newInstance(style = GraphFragment.Style.BAR) - } - 1 -> { - GraphFragment.newInstance(style = GraphFragment.Style.MULTILINE) - } + 0 -> GraphFragment.newInstance(style = GraphFragment.Style.BAR) + 1 -> GraphFragment.newInstance(style = GraphFragment.Style.MULTILINE) 2 -> { val report = this.reportHolder.report ComposableTableReportFragment.newInstance(report) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt index f0b11422..019b78f1 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/filter/FiltersFragment.kt @@ -150,7 +150,7 @@ open class FiltersFragment : RealmFragment(), RowRepresentableDelegate { super.onRowSelected(position, row, tag) this.model.selectedCategoryRow = row - this.model.currentFilter?.id?.let { filterId -> + this.model.currentFilter?.id?.let { _ -> (activity as FiltersActivity).showDetailsFragment()