Add lifecycle events to activity/presenters

Karumi · May 21, 2019 · bf67467 · bf67467
1 parent 9ed5642
commit bf67467
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 42 deletions.
diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/domain/usecase/GetSuperHeroById.kt b/app/src/main/java/com/karumi/jetpack/superheroes/domain/usecase/GetSuperHeroById.kt
@@ -1,10 +1,8 @@
 package com.karumi.jetpack.superheroes.domain.usecase
 
-import androidx.annotation.WorkerThread
 import com.karumi.jetpack.superheroes.data.repository.SuperHeroRepository
 import com.karumi.jetpack.superheroes.domain.model.SuperHero
 
 class GetSuperHeroById(private val superHeroesRepository: SuperHeroRepository) {
-    @WorkerThread
     operator fun invoke(id: String): SuperHero? = superHeroesRepository.get(id)
 }
diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/domain/usecase/GetSuperHeroes.kt b/app/src/main/java/com/karumi/jetpack/superheroes/domain/usecase/GetSuperHeroes.kt
@@ -1,10 +1,8 @@
 package com.karumi.jetpack.superheroes.domain.usecase
 
-import androidx.annotation.WorkerThread
 import com.karumi.jetpack.superheroes.data.repository.SuperHeroRepository
 import com.karumi.jetpack.superheroes.domain.model.SuperHero
 
 class GetSuperHeroes(private val superHeroesRepository: SuperHeroRepository) {
-    @WorkerThread
     operator fun invoke(): List<SuperHero> = superHeroesRepository.getAllSuperHeroes()
 }
diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/domain/usecase/SaveSuperHero.kt b/app/src/main/java/com/karumi/jetpack/superheroes/domain/usecase/SaveSuperHero.kt
@@ -1,11 +1,9 @@
 package com.karumi.jetpack.superheroes.domain.usecase
 
-import androidx.annotation.WorkerThread
 import com.karumi.jetpack.superheroes.data.repository.SuperHeroRepository
 import com.karumi.jetpack.superheroes.domain.model.SuperHero
 
 class SaveSuperHero(private val superHeroesRepository: SuperHeroRepository) {
-    @WorkerThread
     operator fun invoke(superHero: SuperHero): SuperHero? =
         superHeroesRepository.save(superHero)
 }
diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/ui/presenter/EditSuperHeroPresenter.kt b/app/src/main/java/com/karumi/jetpack/superheroes/ui/presenter/EditSuperHeroPresenter.kt
@@ -1,5 +1,9 @@
 package com.karumi.jetpack.superheroes.ui.presenter
 
+import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
+import androidx.lifecycle.Lifecycle.Event.ON_RESUME
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
 import com.karumi.jetpack.superheroes.common.weak
 import com.karumi.jetpack.superheroes.domain.model.SuperHero
 import com.karumi.jetpack.superheroes.domain.usecase.GetSuperHeroById
@@ -11,7 +15,7 @@ class EditSuperHeroPresenter(
     private val getSuperHeroById: GetSuperHeroById,
     private val saveSuperHero: SaveSuperHero,
     private val executor: ExecutorService
-) : EditSuperHeroListener {
+) : EditSuperHeroListener, LifecycleObserver {
 
     private val view: View? by weak(view)
     private lateinit var id: String
@@ -25,11 +29,13 @@ class EditSuperHeroPresenter(
         }
     }
 
+    @OnLifecycleEvent(ON_RESUME)
     fun onResume() {
         view?.showLoading()
         refreshSuperHero()
     }
 
+    @OnLifecycleEvent(ON_DESTROY)
     fun onDestroy() {
         executor.shutdownNow()
     }

diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/ui/presenter/SuperHeroDetailPresenter.kt b/app/src/main/java/com/karumi/jetpack/superheroes/ui/presenter/SuperHeroDetailPresenter.kt
@@ -1,5 +1,9 @@
 package com.karumi.jetpack.superheroes.ui.presenter
 
+import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
+import androidx.lifecycle.Lifecycle.Event.ON_RESUME
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
 import com.karumi.jetpack.superheroes.common.weak
 import com.karumi.jetpack.superheroes.domain.model.SuperHero
 import com.karumi.jetpack.superheroes.domain.usecase.GetSuperHeroById
@@ -9,7 +13,7 @@ class SuperHeroDetailPresenter(
     view: View,
     private val getSuperHeroById: GetSuperHeroById,
     private val executor: ExecutorService
-) : SuperHeroDetailListener {
+) : SuperHeroDetailListener, LifecycleObserver {
 
     private val view: View? by weak(view)
 
@@ -23,11 +27,13 @@ class SuperHeroDetailPresenter(
         }
     }
 
+    @OnLifecycleEvent(ON_RESUME)
     fun onResume() {
         view?.showLoading()
         refreshSuperHero()
     }
 
+    @OnLifecycleEvent(ON_DESTROY)
     fun onDestroy() {
         executor.shutdownNow()
     }

diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/ui/presenter/SuperHeroesPresenter.kt b/app/src/main/java/com/karumi/jetpack/superheroes/ui/presenter/SuperHeroesPresenter.kt
@@ -1,5 +1,9 @@
 package com.karumi.jetpack.superheroes.ui.presenter
 
+import androidx.lifecycle.Lifecycle.Event.ON_DESTROY
+import androidx.lifecycle.Lifecycle.Event.ON_RESUME
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
 import com.karumi.jetpack.superheroes.common.weak
 import com.karumi.jetpack.superheroes.domain.model.SuperHero
 import com.karumi.jetpack.superheroes.domain.usecase.GetSuperHeroes
@@ -9,15 +13,17 @@ class SuperHeroesPresenter(
     view: View,
     private val getSuperHeroes: GetSuperHeroes,
     private val executor: ExecutorService
-) {
+) : LifecycleObserver {
 
     private val view: View? by weak(view)
 
+    @OnLifecycleEvent(ON_RESUME)
     fun onResume() {
         view?.showLoading()
         refreshSuperHeroes()
     }
 
+    @OnLifecycleEvent(ON_DESTROY)
     fun onDestroy() {
         executor.shutdownNow()
     }

diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/BaseActivity.kt b/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/BaseActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.lifecycle.LifecycleObserver
 import org.kodein.di.Kodein
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.closestKodein
@@ -15,16 +16,23 @@ abstract class BaseActivity : AppCompatActivity(), KodeinAware {
         extend(appKodein)
         import(activityModules)
     }
+    abstract val presenter: LifecycleObserver
     abstract val layoutId: Int
     abstract val toolbarView: Toolbar
     abstract val activityModules: Kodein.Module
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        lifecycle.addObserver(presenter)
         setContentView(layoutId)
         setSupportActionBar(toolbarView)
         prepare(intent)
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        lifecycle.removeObserver(presenter)
+    }
+
     open fun prepare(intent: Intent?) {}
 }
diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/EditSuperHeroActivity.kt b/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/EditSuperHeroActivity.kt
@@ -28,7 +28,7 @@ class EditSuperHeroActivity : BaseActivity(), EditSuperHeroPresenter.View {
         }
     }
 
-    private val presenter: EditSuperHeroPresenter by instance()
+    override val presenter: EditSuperHeroPresenter by instance()
     override val layoutId = R.layout.edit_super_hero_activity
     override val toolbarView: Toolbar
         get() = toolbar
@@ -45,16 +45,6 @@ class EditSuperHeroActivity : BaseActivity(), EditSuperHeroPresenter.View {
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        presenter.onResume()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        presenter.onDestroy()
-    }
-
     override fun prepare(intent: Intent?) {
         title = superHeroId
         presenter.preparePresenter(superHeroId)

diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/MainActivity.kt b/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/MainActivity.kt
@@ -17,7 +17,7 @@ import org.kodein.di.erased.provider
 
 class MainActivity : BaseActivity(), SuperHeroesPresenter.View {
 
-    private val presenter: SuperHeroesPresenter by instance()
+    override val presenter: SuperHeroesPresenter by instance()
     private lateinit var adapter: SuperHeroesAdapter
     override val layoutId: Int = R.layout.main_activity
     override val toolbarView: Toolbar
@@ -29,16 +29,6 @@ class MainActivity : BaseActivity(), SuperHeroesPresenter.View {
         initializeRecyclerView()
     }
 
-    override fun onResume() {
-        super.onResume()
-        presenter.onResume()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        presenter.onDestroy()
-    }
-
     private fun initializeAdapter() {
         adapter = SuperHeroesAdapter(presenter)
     }

diff --git a/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/SuperHeroDetailActivity.kt b/app/src/main/java/com/karumi/jetpack/superheroes/ui/view/SuperHeroDetailActivity.kt
@@ -28,7 +28,7 @@ class SuperHeroDetailActivity : BaseActivity(), SuperHeroDetailPresenter.View {
         }
     }
 
-    private val presenter: SuperHeroDetailPresenter by instance()
+    override val presenter: SuperHeroDetailPresenter by instance()
     override val layoutId: Int = R.layout.super_hero_detail_activity
     override val toolbarView: Toolbar
         get() = toolbar
@@ -39,16 +39,6 @@ class SuperHeroDetailActivity : BaseActivity(), SuperHeroDetailPresenter.View {
         edit_super_hero.setOnClickListener { presenter.onEditSelected() }
     }
 
-    override fun onResume() {
-        super.onResume()
-        presenter.onResume()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        presenter.onDestroy()
-    }
-
     override fun prepare(intent: Intent?) {
         title = superHeroId
         presenter.preparePresenter(superHeroId)