Skip to content

Commit

Permalink
Add lifecycle events to activity/presenters
Browse files Browse the repository at this point in the history
  • Loading branch information
Serchinastico committed Mar 15, 2019
1 parent 80c9265 commit 5eee482
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 42 deletions.
Original file line number Diff line number Diff line change
@@ -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)
}
Original file line number Diff line number Diff line change
@@ -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()
}
Original file line number Diff line number Diff line change
@@ -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)
}
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -11,7 +15,7 @@ class EditSuperHeroPresenter(
private val getSuperHeroById: GetSuperHeroById,
private val saveSuperHero: SaveSuperHero,
private val executor: ExecutorService
) {
) : LifecycleObserver {

private val view: View? by weak(view)
private lateinit var id: String
Expand All @@ -25,11 +29,13 @@ class EditSuperHeroPresenter(
}
}

@OnLifecycleEvent(ON_RESUME)
fun onResume() {
view?.showLoading()
refreshSuperHero()
}

@OnLifecycleEvent(ON_DESTROY)
fun onDestroy() {
executor.shutdownNow()
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -9,7 +13,7 @@ class SuperHeroDetailPresenter(
view: View,
private val getSuperHeroById: GetSuperHeroById,
private val executor: ExecutorService
) {
) : LifecycleObserver {

private val view: View? by weak(view)

Expand All @@ -23,11 +27,13 @@ class SuperHeroDetailPresenter(
}
}

@OnLifecycleEvent(ON_RESUME)
fun onResume() {
view?.showLoading()
refreshSuperHero()
}

@OnLifecycleEvent(ON_DESTROY)
fun onDestroy() {
executor.shutdownNow()
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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?) {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 5eee482

Please sign in to comment.