Fix method conflicts

2016-12-18 16:59:06 +01:00
parent e1a3ee1b81
commit 1977e21363
3 changed files with 7 additions and 7 deletions
@@ -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()
    }

@@ -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()
    }