Forráskód Böngészése

Fix method conflicts

len 8 éve
szülő
commit
1977e21363

+ 3 - 3
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt

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

+ 3 - 3
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt

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

+ 1 - 1
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

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