[1.1.1/AN-REFACTOR] 타입, 배틀 화면 Koin 적용

android/app/src/main/java/poke/rogue/helper/di/ViewModelModule.kt

@@ -1,11 +1,30 @@
 package poke.rogue.helper.di
 
+import org.koin.core.module.dsl.viewModel
 import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
+import poke.rogue.helper.presentation.battle.BattleViewModel
+import poke.rogue.helper.presentation.battle.selection.BattleSelectionViewModel
+import poke.rogue.helper.presentation.battle.selection.pokemon.PokemonSelectionViewModel
+import poke.rogue.helper.presentation.battle.selection.skill.SkillSelectionViewModel
 import poke.rogue.helper.presentation.dex.PokemonListViewModel
+import poke.rogue.helper.presentation.type.TypeViewModel
 
 val viewModelModule
     get() =
         module {
             viewModelOf(::PokemonListViewModel)
+            viewModel<BattleViewModel> { params ->
+                BattleViewModel(get(), get(), get(), params.getOrNull(), params.getOrNull())
+            }
+            viewModel<BattleSelectionViewModel> { params ->
+                BattleSelectionViewModel(params.get(), params.get(), get())
+            }
+            viewModel { params ->
+                PokemonSelectionViewModel(get(), params.getOrNull(), get())
+            }
+            viewModel { params ->
+                SkillSelectionViewModel(get(), params.getOrNull(), get())
+            }
+            viewModelOf(::TypeViewModel)
         }

android/app/src/main/java/poke/rogue/helper/presentation/battle/BattleActivity.kt

@@ -6,11 +6,10 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.viewModels
 import androidx.appcompat.widget.Toolbar
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 import poke.rogue.helper.R
-import poke.rogue.helper.data.repository.DefaultBattleRepository
-import poke.rogue.helper.data.repository.DefaultDexRepository
 import poke.rogue.helper.databinding.ActivityBattleBinding
 import poke.rogue.helper.presentation.base.toolbar.ToolbarActivity
 import poke.rogue.helper.presentation.battle.model.SelectionData
@@ -25,15 +24,12 @@ import poke.rogue.helper.presentation.util.view.setImage
 import timber.log.Timber
 
 class BattleActivity : ToolbarActivity<ActivityBattleBinding>(R.layout.activity_battle) {
-    private val viewModel by viewModels<BattleViewModel> {
-        BattleViewModel.factory(
+    private val viewModel by viewModel<BattleViewModel> {
+        parametersOf(
             intent.getStringExtra(POKEMON_ID),
             intent.serializable(SELECTION_TYPE),
-            DefaultBattleRepository.instance(applicationContext),
-            DefaultDexRepository.instance(),
         )
     }
-
     private val weatherAdapter by lazy {
         WeatherSpinnerAdapter(this)
     }

android/app/src/main/java/poke/rogue/helper/presentation/battle/BattleViewModel.kt

@@ -1,6 +1,5 @@
 package poke.rogue.helper.presentation.battle
 
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -19,7 +18,6 @@ import poke.rogue.helper.analytics.AnalyticsLogger
 import poke.rogue.helper.analytics.analyticsLogger
 import poke.rogue.helper.data.repository.BattleRepository
 import poke.rogue.helper.data.repository.DexRepository
-import poke.rogue.helper.presentation.base.BaseViewModelFactory
 import poke.rogue.helper.presentation.base.error.ErrorHandleViewModel
 import poke.rogue.helper.presentation.battle.model.BattlePredictionUiModel
 import poke.rogue.helper.presentation.battle.model.PokemonSelectionUiModel
@@ -246,23 +244,6 @@ class BattleViewModel(
         } else {
             SelectionData.WithoutSkill(previousPokemonSelection)
         }
-
-    companion object {
-        fun factory(
-            pokemonId: String?,
-            selectionType: SelectionType?,
-            battleRepository: BattleRepository,
-            pokemonRepository: DexRepository,
-        ): ViewModelProvider.Factory =
-            BaseViewModelFactory {
-                BattleViewModel(
-                    battleRepository = battleRepository,
-                    pokemonId = pokemonId,
-                    selectionType = selectionType,
-                    pokemonRepository = pokemonRepository,
-                )
-            }
-    }
 }
 
 data class SelectionNavigationData(

android/app/src/main/java/poke/rogue/helper/presentation/battle/selection/BattleSelectionActivity.kt

@@ -3,8 +3,9 @@ package poke.rogue.helper.presentation.battle.selection
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.appcompat.widget.Toolbar
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 import poke.rogue.helper.R
 import poke.rogue.helper.databinding.ActivityBattleSelectionBinding
 import poke.rogue.helper.presentation.base.error.ErrorHandleActivity
@@ -20,8 +21,8 @@ import poke.rogue.helper.presentation.util.view.setImage
 
 class BattleSelectionActivity :
     ErrorHandleActivity<ActivityBattleSelectionBinding>(R.layout.activity_battle_selection) {
-    private val viewModel by viewModels<BattleSelectionViewModel> {
-        BattleSelectionViewModel.factory(selectionMode, previousSelection)
+    private val viewModel by viewModel<BattleSelectionViewModel> {
+        parametersOf(selectionMode, previousSelection)
     }
     private val previousSelection by lazy {
         intent.parcelable<SelectionData>(KEY_PREVIOUS_SELECTION) ?: error("잘못된 선택 데이터")
@@ -93,8 +94,8 @@ class BattleSelectionActivity :
     }
 
     companion object {
-        private const val KEY_SELECTION_MODE = "selectionMode"
-        private const val KEY_PREVIOUS_SELECTION = "previousSelection"
+        const val KEY_SELECTION_MODE = "selectionMode"
+        const val KEY_PREVIOUS_SELECTION = "previousSelection"
         const val KEY_SELECTION_RESULT = "selectionResult"
 
         fun intent(

android/app/src/main/java/poke/rogue/helper/presentation/battle/selection/BattleSelectionViewModel.kt

@@ -1,6 +1,5 @@
 package poke.rogue.helper.presentation.battle.selection
 
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -14,7 +13,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import poke.rogue.helper.analytics.AnalyticsLogger
 import poke.rogue.helper.analytics.analyticsLogger
-import poke.rogue.helper.presentation.base.BaseViewModelFactory
 import poke.rogue.helper.presentation.base.error.ErrorHandleViewModel
 import poke.rogue.helper.presentation.battle.BattleSelectionUiState
 import poke.rogue.helper.presentation.battle.isSelected
@@ -84,17 +82,17 @@ class BattleSelectionViewModel(
         }
     }
 
-    private fun initialStep(selectionMode: SelectionMode): SelectionStep {
-        return when {
+    private fun initialStep(selectionMode: SelectionMode): SelectionStep =
+        when {
             selectionMode == SelectionMode.SKILL_FIRST && previousSelection != SelectionData.NoSelection -> {
-                val selected = requireNotNull(previousSelection.selectedPokemon()) { "포켓몬이 선택되지 않았습니다." }
+                val selected =
+                    requireNotNull(previousSelection.selectedPokemon()) { "포켓몬이 선택되지 않았습니다." }
                 updateDexNumberForSkills(selected.dexNumber)
                 SelectionStep.SKILL_SELECTION
             }
 
             else -> SelectionStep.POKEMON_SELECTION
         }
-    }
 
     fun selectPokemon(pokemon: PokemonSelectionUiModel) {
         _selectedPokemon.value = BattleSelectionUiState.Selected(pokemon)
@@ -149,11 +147,4 @@ class BattleSelectionViewModel(
             _currentStep.value = prevPage
         }
     }
-
-    companion object {
-        fun factory(
-            selectionMode: SelectionMode,
-            previousSelection: SelectionData,
-        ): ViewModelProvider.Factory = BaseViewModelFactory { BattleSelectionViewModel(selectionMode, previousSelection) }
-    }
 }

android/app/src/main/java/poke/rogue/helper/presentation/battle/selection/pokemon/PokemonSelectionFragment.kt

@@ -4,10 +4,10 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
-import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 import poke.rogue.helper.R
-import poke.rogue.helper.data.repository.DefaultDexRepository
 import poke.rogue.helper.databinding.FragmentPokemonSelectionBinding
 import poke.rogue.helper.presentation.base.error.ErrorHandleFragment
 import poke.rogue.helper.presentation.base.error.ErrorHandleViewModel
@@ -19,13 +19,11 @@ import poke.rogue.helper.presentation.util.view.LinearSpacingItemDecoration
 import poke.rogue.helper.presentation.util.view.dp
 import poke.rogue.helper.presentation.util.view.setOnSearchAction
 
-class PokemonSelectionFragment : ErrorHandleFragment<FragmentPokemonSelectionBinding>(R.layout.fragment_pokemon_selection) {
-    private val sharedViewModel: BattleSelectionViewModel by activityViewModels()
-    private val viewModel: PokemonSelectionViewModel by viewModels<PokemonSelectionViewModel> {
-        PokemonSelectionViewModel.factory(
-            DefaultDexRepository.instance(),
-            sharedViewModel.previousSelection.selectedPokemon(),
-        )
+class PokemonSelectionFragment :
+    ErrorHandleFragment<FragmentPokemonSelectionBinding>(R.layout.fragment_pokemon_selection) {
+    private val sharedViewModel: BattleSelectionViewModel by activityViewModel()
+    private val viewModel: PokemonSelectionViewModel by viewModel<PokemonSelectionViewModel> {
+        parametersOf(sharedViewModel.previousSelection.selectedPokemon())
     }
     private val pokemonAdapter: PokemonSelectionAdapter by lazy {
         PokemonSelectionAdapter(viewModel)

android/app/src/main/java/poke/rogue/helper/presentation/battle/selection/pokemon/PokemonSelectionViewModel.kt

@@ -1,6 +1,5 @@
 package poke.rogue.helper.presentation.battle.selection.pokemon
 
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
@@ -18,7 +17,6 @@ import kotlinx.coroutines.launch
 import poke.rogue.helper.analytics.AnalyticsLogger
 import poke.rogue.helper.analytics.analyticsLogger
 import poke.rogue.helper.data.repository.DexRepository
-import poke.rogue.helper.presentation.base.BaseViewModelFactory
 import poke.rogue.helper.presentation.base.error.ErrorHandleViewModel
 import poke.rogue.helper.presentation.battle.model.PokemonSelectionUiModel
 import poke.rogue.helper.presentation.battle.model.toSelectionUi
@@ -82,11 +80,4 @@ class PokemonSelectionViewModel(
             searchQuery.emit(name)
         }
     }
-
-    companion object {
-        fun factory(
-            dexRepository: DexRepository,
-            previousSelection: PokemonSelectionUiModel?,
-        ): ViewModelProvider.Factory = BaseViewModelFactory { PokemonSelectionViewModel(dexRepository, previousSelection) }
-    }
 }

android/app/src/main/java/poke/rogue/helper/presentation/battle/selection/skill/SkillSelectionFragment.kt

@@ -4,10 +4,10 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.widget.Toolbar
-import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 import poke.rogue.helper.R
-import poke.rogue.helper.data.repository.DefaultBattleRepository
 import poke.rogue.helper.databinding.FragmentSkillSelectionBinding
 import poke.rogue.helper.presentation.base.error.ErrorHandleFragment
 import poke.rogue.helper.presentation.base.error.ErrorHandleViewModel
@@ -21,12 +21,9 @@ import poke.rogue.helper.presentation.util.view.setOnSearchAction
 
 class SkillSelectionFragment :
     ErrorHandleFragment<FragmentSkillSelectionBinding>(R.layout.fragment_skill_selection) {
-    private val sharedViewModel: BattleSelectionViewModel by activityViewModels()
-    private val viewModel: SkillSelectionViewModel by viewModels<SkillSelectionViewModel> {
-        SkillSelectionViewModel.factory(
-            DefaultBattleRepository.instance(requireContext().applicationContext),
-            sharedViewModel.previousSelection as? SelectionData.WithSkill,
-        )
+    private val sharedViewModel: BattleSelectionViewModel by activityViewModel()
+    private val viewModel: SkillSelectionViewModel by viewModel<SkillSelectionViewModel> {
+        parametersOf(sharedViewModel.previousSelection as? SelectionData.WithSkill)
     }
     private val skillAdapter: SkillSelectionAdapter by lazy {
         SkillSelectionAdapter(viewModel)

android/app/src/main/java/poke/rogue/helper/presentation/battle/selection/skill/SkillSelectionViewModel.kt

@@ -1,6 +1,5 @@
 package poke.rogue.helper.presentation.battle.selection.skill
 
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
@@ -18,7 +17,6 @@ import kotlinx.coroutines.launch
 import poke.rogue.helper.analytics.AnalyticsLogger
 import poke.rogue.helper.analytics.analyticsLogger
 import poke.rogue.helper.data.repository.BattleRepository
-import poke.rogue.helper.presentation.base.BaseViewModelFactory
 import poke.rogue.helper.presentation.base.error.ErrorHandleViewModel
 import poke.rogue.helper.presentation.battle.model.SelectionData
 import poke.rogue.helper.presentation.battle.model.SkillSelectionUiModel
@@ -79,7 +77,8 @@ class SkillSelectionViewModel(
         previousPokemonDexNumber = pokemonDexNumber
         viewModelScope.launch(errorHandler) {
             _skills.value = emptyList()
-            val availableSkills = battleRepository.availableSkills(pokemonDexNumber).map { it.toUi() }
+            val availableSkills =
+                battleRepository.availableSkills(pokemonDexNumber).map { it.toUi() }
             _skills.value = availableSkills.initialized()
         }
     }
@@ -99,11 +98,4 @@ class SkillSelectionViewModel(
             searchQuery.emit(name)
         }
     }
-
-    companion object {
-        fun factory(
-            battleRepository: BattleRepository,
-            previousSelection: SelectionData.WithSkill?,
-        ): ViewModelProvider.Factory = BaseViewModelFactory { SkillSelectionViewModel(battleRepository, previousSelection) }
-    }
 }

android/app/src/main/java/poke/rogue/helper/presentation/type/TypeActivity.kt

@@ -3,8 +3,8 @@ package poke.rogue.helper.presentation.type
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.appcompat.widget.Toolbar
+import org.koin.androidx.viewmodel.ext.android.viewModel
 import poke.rogue.helper.R
 import poke.rogue.helper.databinding.ActivityTypeBinding
 import poke.rogue.helper.presentation.base.toolbar.ToolbarActivity
@@ -15,9 +15,7 @@ import poke.rogue.helper.presentation.type.selection.TypeSelectionBottomSheetFra
 import poke.rogue.helper.presentation.util.repeatOnStarted
 
 class TypeActivity : ToolbarActivity<ActivityTypeBinding>(R.layout.activity_type) {
-    private val viewModel: TypeViewModel by viewModels {
-        TypeViewModel.factory()
-    }
+    private val viewModel by viewModel<TypeViewModel>()
     private val typeResultAdapter by lazy { TypeResultAdapter() }
 
     override val toolbar: Toolbar
@@ -94,8 +92,6 @@ class TypeActivity : ToolbarActivity<ActivityTypeBinding>(R.layout.activity_type
     }
 
     companion object {
-        fun intent(context: Context): Intent {
-            return Intent(context, TypeActivity::class.java)
-        }
+        fun intent(context: Context): Intent = Intent(context, TypeActivity::class.java)
     }
 }

android/app/src/main/java/poke/rogue/helper/presentation/type/TypeViewModel.kt

@@ -11,10 +11,7 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
-import poke.rogue.helper.data.datasource.LocalTypeDataSource
-import poke.rogue.helper.data.repository.DefaultTypeRepository
 import poke.rogue.helper.data.repository.TypeRepository
-import poke.rogue.helper.presentation.base.BaseViewModelFactory
 import poke.rogue.helper.presentation.type.model.MatchedTypesUiModel
 import poke.rogue.helper.presentation.type.model.MatchedTypesUiModelComparator
 import poke.rogue.helper.presentation.type.model.SelectorType
@@ -53,9 +50,10 @@ class TypeViewModel(
             }.sortedWith(MatchedTypesUiModelComparator)
         }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000L), emptyList())
 
-    private fun matchedTypesAgainstOpponents(opponents: List<TypeSelectionUiState.Selected>): List<MatchedTypesUiModel> {
-        return opponents.flatMap { matchedTypesAgainstOpponent(it) }
-    }
+    private fun matchedTypesAgainstOpponents(opponents: List<TypeSelectionUiState.Selected>): List<MatchedTypesUiModel> =
+        opponents.flatMap {
+            matchedTypesAgainstOpponent(it)
+        }
 
     private fun matchedTypesAgainstOpponent(opponent: TypeSelectionUiState.Selected): List<MatchedTypesUiModel> {
         val selectedTypeId = opponent.selectedType.id
@@ -127,8 +125,4 @@ class TypeViewModel(
                 opponentType2 = TypeSelectionUiState.Empty,
             )
     }
-
-    companion object {
-        fun factory() = BaseViewModelFactory { TypeViewModel(DefaultTypeRepository(LocalTypeDataSource())) }
-    }
 }