external/tachiyomi
1
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-11 21:20:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix method conflicts

Browse source
This commit is contained in:
len 2016-12-18 16:59:06 +01:00
parent e1a3ee1b81
commit 1977e21363
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
View file

@ -11,15 +11,15 @@ abstract class BaseActivity : AppCompatActivity(), ActivityMixin {
override fun getActivity() = this override fun getActivity() = this
var isResumed = false var resumed = false
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
isResumed = true resumed = true
} }
override fun onPause() { override fun onPause() {
isResumed = false resumed = false
super.onPause() super.onPause()
} }

6
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt
View file

@ -25,15 +25,15 @@ abstract class BaseRxActivity<P : BasePresenter<*>> : NucleusAppCompatActivity<P
override fun getActivity() = this override fun getActivity() = this
var isResumed = false var resumed = false
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
isResumed = true resumed = true
} }
override fun onPause() { override fun onPause() {
isResumed = false resumed = false
super.onPause() super.onPause()
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View file

@ -94,7 +94,7 @@ class MainActivity : BaseActivity() {
override fun onBackPressed() { override fun onBackPressed() {
val fragment = supportFragmentManager.findFragmentById(R.id.frame_container) val fragment = supportFragmentManager.findFragmentById(R.id.frame_container)
if (fragment != null && fragment.tag.toInt() != startScreenId) { if (fragment != null && fragment.tag.toInt() != startScreenId) {
if (isResumed) { if (resumed) {
setSelectedDrawerItem(startScreenId) setSelectedDrawerItem(startScreenId)
} }
} else { } else {