From c3cc059973208b09b2208b1b4be64c7ba820b627 Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 14 Dec 2020 14:13:20 +0100 Subject: [PATCH] Improved code and exceptions --- .../android/ui/activity/HomeActivity.kt | 6 +++--- .../ui/adapter/ComparisonChartPagerAdapter.kt | 6 +++--- .../android/ui/adapter/HomePagerAdapter.kt | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt index 0177821f..bb29ca09 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt @@ -61,6 +61,9 @@ class HomeActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityHomeBinding.inflate(layoutInflater) + setContentView(binding.root) + if (BuildConfig.DEBUG) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { setShowWhenLocked(true) @@ -70,9 +73,6 @@ class HomeActivity : BaseActivity() { } } - binding = ActivityHomeBinding.inflate(layoutInflater) - setContentView(binding.root) - observeRealmObjects() initUI() checkFirstLaunch() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt index 469a2767..3654d936 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt @@ -6,11 +6,11 @@ import android.view.ViewGroup import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentStatePagerAdapter import net.pokeranalytics.android.R -import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment -import net.pokeranalytics.android.ui.modules.feed.FeedFragment +import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.ui.fragment.GraphFragment import net.pokeranalytics.android.ui.fragment.components.BaseFragment import net.pokeranalytics.android.ui.graph.Graph +import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment import java.lang.ref.WeakReference /** @@ -25,7 +25,7 @@ class ComparisonChartPagerAdapter(val context: Context, fragmentManager: Fragmen 0 -> GraphFragment.newInstance(Graph.Style.BAR) 1 -> GraphFragment.newInstance(Graph.Style.MULTILINE) 2 -> CalendarFragment.newInstance() - else -> FeedFragment.newInstance() + else -> throw PAIllegalStateException("There should not be more than $count items, position = $position") } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt index 7e9dfb7b..d8f6d311 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt @@ -28,7 +28,7 @@ class HomePagerAdapter(fragmentManager: FragmentManager) : 2 -> CalendarFragment.newInstance() 3 -> ReportsFragment.newInstance() 4 -> SettingsFragment.newInstance() - else -> throw PAIllegalStateException("Should not happen") + else -> throw PAIllegalStateException("Should not happen, position = $position") } } @@ -49,12 +49,12 @@ class HomePagerAdapter(fragmentManager: FragmentManager) : override fun getItemPosition(obj: Any): Int { return when (obj) { - FeedFragment::class.java -> 0 - StatisticsFragment::class.java -> 1 - CalendarFragment::class.java -> 2 - ReportsFragment::class.java -> 3 - SettingsFragment::class.java -> 4 - else -> throw PAIllegalStateException("Should not happen") + is FeedFragment -> 0 + is StatisticsFragment -> 1 + is CalendarFragment -> 2 + is ReportsFragment -> 3 + is SettingsFragment -> 4 + else -> throw PAIllegalStateException("Should not happen for object $obj") } }