Skip to content

Commit a7be3e8

Browse files
committed
Refactor DetailActivity using extensions
1 parent c1f21ed commit a7be3e8

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

app/src/main/java/com/skydoves/pokedex/ui/details/DetailActivity.kt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import androidx.annotation.VisibleForTesting
2424
import com.skydoves.pokedex.R
2525
import com.skydoves.pokedex.base.DataBindingActivity
2626
import com.skydoves.pokedex.databinding.ActivityDetailBinding
27+
import com.skydoves.pokedex.extensions.argument
2728
import com.skydoves.pokedex.extensions.onTransformationEndContainerApplyParams
2829
import com.skydoves.pokedex.model.Pokemon
2930
import com.skydoves.transformationlayout.TransformationCompat
@@ -39,29 +40,25 @@ class DetailActivity : DataBindingActivity() {
3940

4041
@VisibleForTesting
4142
val viewModel: DetailViewModel by viewModels {
42-
DetailViewModel.provideFactory(
43-
detailViewModelFactory,
44-
pokemonItem.name
45-
)
43+
DetailViewModel.provideFactory(detailViewModelFactory, pokemonItem.name)
4644
}
4745

4846
private val binding: ActivityDetailBinding by binding(R.layout.activity_detail)
49-
50-
private val pokemonItem: Pokemon
51-
get() = requireNotNull(intent.getParcelableExtra(EXTRA_POKEMON))
47+
private val pokemonItem: Pokemon by argument(EXTRA_POKEMON)
5248

5349
override fun onCreate(savedInstanceState: Bundle?) {
5450
onTransformationEndContainerApplyParams()
5551
super.onCreate(savedInstanceState)
5652
binding.apply {
57-
pokemon = pokemonItem
5853
lifecycleOwner = this@DetailActivity
54+
pokemon = pokemonItem
5955
vm = viewModel
6056
}
6157
}
6258

6359
companion object {
64-
@VisibleForTesting const val EXTRA_POKEMON = "EXTRA_POKEMON"
60+
@VisibleForTesting
61+
const val EXTRA_POKEMON = "EXTRA_POKEMON"
6562

6663
fun startActivity(transformationLayout: TransformationLayout, pokemon: Pokemon) {
6764
val context = transformationLayout.context

0 commit comments

Comments
 (0)