Mirrors/Frost-for-Facebook
1
0
Fork 0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-08 12:02:33 +01:00
Code Issues Releases Activity

Allow currentFragment to be nullable

Browse Source
This commit is contained in:
Allan Wang 2020-02-23 18:01:22 -08:00
parent 654cc6b943
commit 0498f26dc6
No known key found for this signature in database
GPG Key ID: C93E3F9C679D7A56
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
View File

@ -791,7 +791,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
return true
}
}
if (currentFragment.onBackPressed()) return true
if (currentFragment?.onBackPressed() == true) return true
if (prefs.exitConfirmation) {
materialDialog {
title(R.string.kau_exit)
@ -807,10 +807,10 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
return false
}
inline val currentFragment: BaseFragment
inline val currentFragment: BaseFragment?
get() {
val viewpager = contentBinding.viewpager
return supportFragmentManager.findFragmentByTag("android:switcher:${viewpager.id}:${viewpager.currentItem}") as BaseFragment
return supportFragmentManager.findFragmentByTag("android:switcher:${viewpager.id}:${viewpager.currentItem}") as? BaseFragment
}
override fun reloadFragment(fragment: BaseFragment) {

2
app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt
View File

@ -82,7 +82,7 @@ class MainActivity : BaseMainActivity() {
tabs.addOnTabSelectedListener(object : TabLayout.ViewPagerOnTabSelectedListener(viewpager) {
override fun onTabReselected(tab: TabLayout.Tab) {
super.onTabReselected(tab)
currentFragment.onTabClick()
currentFragment?.onTabClick()
}
override fun onTabSelected(tab: TabLayout.Tab) {