From 1977e213638199eb3a70b4ca7a0929b41dabe912 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Sun, 18 Dec 2016 16:59:06 +0100
Subject: [PATCH] Fix method conflicts

---
 .../eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt    | 6 +++---
 .../eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt  | 6 +++---
 .../main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
index cb3662947..bcdabb823 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
+++ b/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()
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt
index 0b480cd41..3c8be8693 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseRxActivity.kt
+++ b/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()
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index c184c0b62..062df386f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/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 {