Improved code and exceptions

split
Laurent 5 years ago
parent 0c7793aa54
commit c3cc059973
  1. 6
      app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
  2. 6
      app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt
  3. 14
      app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt

@ -61,6 +61,9 @@ class HomeActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityHomeBinding.inflate(layoutInflater)
setContentView(binding.root)
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
setShowWhenLocked(true) setShowWhenLocked(true)
@ -70,9 +73,6 @@ class HomeActivity : BaseActivity() {
} }
} }
binding = ActivityHomeBinding.inflate(layoutInflater)
setContentView(binding.root)
observeRealmObjects() observeRealmObjects()
initUI() initUI()
checkFirstLaunch() checkFirstLaunch()

@ -6,11 +6,11 @@ import android.view.ViewGroup
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentStatePagerAdapter import androidx.fragment.app.FragmentStatePagerAdapter
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment import net.pokeranalytics.android.exceptions.PAIllegalStateException
import net.pokeranalytics.android.ui.modules.feed.FeedFragment
import net.pokeranalytics.android.ui.fragment.GraphFragment import net.pokeranalytics.android.ui.fragment.GraphFragment
import net.pokeranalytics.android.ui.fragment.components.BaseFragment import net.pokeranalytics.android.ui.fragment.components.BaseFragment
import net.pokeranalytics.android.ui.graph.Graph import net.pokeranalytics.android.ui.graph.Graph
import net.pokeranalytics.android.ui.modules.calendar.CalendarFragment
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
/** /**
@ -25,7 +25,7 @@ class ComparisonChartPagerAdapter(val context: Context, fragmentManager: Fragmen
0 -> GraphFragment.newInstance(Graph.Style.BAR) 0 -> GraphFragment.newInstance(Graph.Style.BAR)
1 -> GraphFragment.newInstance(Graph.Style.MULTILINE) 1 -> GraphFragment.newInstance(Graph.Style.MULTILINE)
2 -> CalendarFragment.newInstance() 2 -> CalendarFragment.newInstance()
else -> FeedFragment.newInstance() else -> throw PAIllegalStateException("There should not be more than $count items, position = $position")
} }
} }

@ -28,7 +28,7 @@ class HomePagerAdapter(fragmentManager: FragmentManager) :
2 -> CalendarFragment.newInstance() 2 -> CalendarFragment.newInstance()
3 -> ReportsFragment.newInstance() 3 -> ReportsFragment.newInstance()
4 -> SettingsFragment.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 { override fun getItemPosition(obj: Any): Int {
return when (obj) { return when (obj) {
FeedFragment::class.java -> 0 is FeedFragment -> 0
StatisticsFragment::class.java -> 1 is StatisticsFragment -> 1
CalendarFragment::class.java -> 2 is CalendarFragment -> 2
ReportsFragment::class.java -> 3 is ReportsFragment -> 3
SettingsFragment::class.java -> 4 is SettingsFragment -> 4
else -> throw PAIllegalStateException("Should not happen") else -> throw PAIllegalStateException("Should not happen for object $obj")
} }
} }

Loading…
Cancel
Save