Merge pull request #49 from develop-playground/feature/use-constructo…

…r-parameter ViewModel의 livedata로 값을 전달하지 않고 생성자 주입을 통해 id 전달
develop-playground · Jun 8, 2022 · 901ff2f · 901ff2f
2 parents fdc3d40 + f3f758e
commit 901ff2f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/...entation/src/main/java/github/dev_playground/jeju_road/presentation/di/ViewModelModule.kt b/...entation/src/main/java/github/dev_playground/jeju_road/presentation/di/ViewModelModule.kt
@@ -7,5 +7,5 @@ import org.koin.dsl.module
 
 val viewModelModule = module {
     viewModel { RestaurantListViewModel(getRestaurantListUseCase = get())}
-    viewModel { RestaurantDetailViewModel(get()) }
+    viewModel { (id: Long) -> RestaurantDetailViewModel(id, get()) }
 }
diff --git a/...ain/java/github/dev_playground/jeju_road/presentation/ui/page/RestaurantDetailActivity.kt b/...ain/java/github/dev_playground/jeju_road/presentation/ui/page/RestaurantDetailActivity.kt
@@ -10,18 +10,23 @@ import github.dev_playground.jeju_road.presentation.model.RestaurantDetailInform
 import github.dev_playground.jeju_road.presentation.model.RestaurantIntroductionModel
 import github.dev_playground.jeju_road.presentation.ui.base.BaseActivity
 import github.dev_playground.jeju_road.presentation.ui.list.RestaurantListItemDecoration
-import github.dev_playground.jeju_road.presentation.util.*
+import github.dev_playground.jeju_road.presentation.util.addEnterMaterialSharedElementCallback
+import github.dev_playground.jeju_road.presentation.util.addMaterialSharedElementEnterTransition
+import github.dev_playground.jeju_road.presentation.util.addMaterialSharedElementReturnTransition
+import github.dev_playground.jeju_road.presentation.util.onSuccess
 import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 
 class RestaurantDetailActivity : BaseActivity<ActivityRestaurantDetailBinding>(
     R.layout.activity_restaurant_detail
 ) {
 
-    private val viewModel by viewModel<RestaurantDetailViewModel>()
+    private val viewModel by viewModel<RestaurantDetailViewModel> {
+        parametersOf(intent.getLongExtra(KEY_RESTAURANT_ID, 0))
+    }
     private val adapter: RestaurantDetailListAdapter by lazy { RestaurantDetailListAdapter() }
 
     private val transitionName: String? by lazy { intent.getStringExtra(KEY_TRANSITION_NAME) }
-    private val id: Long by lazy { intent.getLongExtra(KEY_RESTAURANT_ID, 0) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         makeTransition()
@@ -42,18 +47,14 @@ class RestaurantDetailActivity : BaseActivity<ActivityRestaurantDetailBinding>(
             )
         }
 
-        with(viewModel) {
-            id.value = this@RestaurantDetailActivity.id
-
-            detailInformationState.observe { state ->
-                state.onSuccess {
-                    adapter.submitList(
-                        listOf(
-                            RestaurantIntroductionModel.toPresentation(it),
-                            RestaurantDetailInformationModel.toPresentation(it)
-                        )
+        viewModel.detailInformationState.observe { state ->
+            state.onSuccess {
+                adapter.submitList(
+                    listOf(
+                        RestaurantIntroductionModel.toPresentation(it),
+                        RestaurantDetailInformationModel.toPresentation(it)
                     )
-                }
+                )
             }
         }
     }

diff --git a/...in/java/github/dev_playground/jeju_road/presentation/ui/page/RestaurantDetailViewModel.kt b/...in/java/github/dev_playground/jeju_road/presentation/ui/page/RestaurantDetailViewModel.kt
@@ -1,22 +1,21 @@
 package github.dev_playground.jeju_road.presentation.ui.page
 
-import androidx.lifecycle.*
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.liveData
 import github.dev_playground.jeju_road.domain.model.DetailInformation
 import github.dev_playground.jeju_road.domain.usecase.GetRestaurantDetailUseCase
 import github.dev_playground.jeju_road.presentation.util.UiState
 import github.dev_playground.jeju_road.presentation.util.toUiState
-import kotlinx.coroutines.*
 
 class RestaurantDetailViewModel(
+    id: Long,
     private val getRestaurantPageUseCase: GetRestaurantDetailUseCase
 ) : ViewModel() {
 
-    val id: MutableLiveData<Long> = MutableLiveData<Long>()
-
-    val detailInformationState: LiveData<UiState<DetailInformation>> = id.switchMap {
+    val detailInformationState: LiveData<UiState<DetailInformation>> =
         liveData {
             emit(UiState.loading())
-            emit(getRestaurantPageUseCase.invoke(it).toUiState())
+            emit(getRestaurantPageUseCase.invoke(id).toUiState())
         }
-    }
 }