Use getSharedViewModel() for sharing an instance of the MainViewModel

skydoves · Aug 29, 2020 · fbf60b1 · fbf60b1
1 parent 5265aab
commit fbf60b1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/app/src/main/java/com/skydoves/disneymotions/view/ui/main/HomeFragment.kt b/app/src/main/java/com/skydoves/disneymotions/view/ui/main/HomeFragment.kt
@@ -30,7 +30,7 @@ import com.skydoves.disneymotions.databinding.FragmentHomeBinding
 import com.skydoves.disneymotions.extensions.gone
 import com.skydoves.disneymotions.extensions.visible
 import com.skydoves.disneymotions.view.adapter.PosterAdapter
-import org.koin.android.viewmodel.ext.android.getViewModel
+import org.koin.android.viewmodel.ext.android.getSharedViewModel
 
 class HomeFragment : DatabindingFragment() {
 
@@ -42,7 +42,7 @@ class HomeFragment : DatabindingFragment() {
     savedInstanceState: Bundle?
   ): View? {
     binding = binding<FragmentHomeBinding>(inflater, R.layout.fragment_home, container).apply {
-      viewModel = getViewModel<MainViewModel>().apply { fetchDisneyPosterList() }
+      viewModel = getSharedViewModel<MainViewModel>().apply { fetchDisneyPosterList() }
       lifecycleOwner = this@HomeFragment
       adapter = PosterAdapter()
     }

diff --git a/app/src/main/java/com/skydoves/disneymotions/view/ui/main/LibraryFragment.kt b/app/src/main/java/com/skydoves/disneymotions/view/ui/main/LibraryFragment.kt
@@ -24,7 +24,7 @@ import com.skydoves.disneymotions.R
 import com.skydoves.disneymotions.base.DatabindingFragment
 import com.skydoves.disneymotions.databinding.FragmentLibraryBinding
 import com.skydoves.disneymotions.view.adapter.PosterLineAdapter
-import org.koin.android.viewmodel.ext.android.getViewModel
+import org.koin.android.viewmodel.ext.android.getSharedViewModel
 
 class LibraryFragment : DatabindingFragment() {
 
@@ -34,7 +34,7 @@ class LibraryFragment : DatabindingFragment() {
     savedInstanceState: Bundle?
   ): View? {
     return binding<FragmentLibraryBinding>(inflater, R.layout.fragment_library, container).apply {
-      viewModel = getViewModel<MainViewModel>().apply { fetchDisneyPosterList() }
+      viewModel = getSharedViewModel<MainViewModel>().apply { fetchDisneyPosterList() }
       lifecycleOwner = this@LibraryFragment
       adapter = PosterLineAdapter()
     }.root

diff --git a/app/src/main/java/com/skydoves/disneymotions/view/ui/main/RadioFragment.kt b/app/src/main/java/com/skydoves/disneymotions/view/ui/main/RadioFragment.kt
@@ -24,7 +24,7 @@ import com.skydoves.disneymotions.R
 import com.skydoves.disneymotions.base.DatabindingFragment
 import com.skydoves.disneymotions.databinding.FragmentRadioBinding
 import com.skydoves.disneymotions.view.adapter.PosterCircleAdapter
-import org.koin.android.viewmodel.ext.android.getViewModel
+import org.koin.android.viewmodel.ext.android.getSharedViewModel
 
 class RadioFragment : DatabindingFragment() {
 
@@ -34,7 +34,7 @@ class RadioFragment : DatabindingFragment() {
     savedInstanceState: Bundle?
   ): View? {
     return binding<FragmentRadioBinding>(inflater, R.layout.fragment_radio, container).apply {
-      viewModel = getViewModel<MainViewModel>().apply { fetchDisneyPosterList() }
+      viewModel = getSharedViewModel<MainViewModel>().apply { fetchDisneyPosterList() }
       lifecycleOwner = this@RadioFragment
       adapter = PosterCircleAdapter()
     }.root

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -68,9 +68,10 @@
       app:layout_constraintStart_toStartOf="parent" />
 
     <ProgressBar
+      android:id="@+id/progress"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      app:gone="@{!vm.isLoading()}"
+      app:gone="@{!vm.loading}"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/test/java/com/skydoves/disneymotions/repository/MainRepositoryTest.kt b/app/src/test/java/com/skydoves/disneymotions/repository/MainRepositoryTest.kt
@@ -66,7 +66,8 @@ class MainRepositoryTest {
       ApiResponse.of { Response.success(mockData) })
 
     repository.loadDisneyPosters(
-      error = {}
+      onSuccess = {},
+      onError = {}
     ).collect {
       assertThat(it[0].id, `is`(0L))
       assertThat(it[0].name, `is`("Frozen II"))

diff --git a/app/src/test/java/com/skydoves/disneymotions/viewmodel/MainViewModelTest.kt b/app/src/test/java/com/skydoves/disneymotions/viewmodel/MainViewModelTest.kt
@@ -64,7 +64,11 @@ class MainViewModelTest {
     val mockData = MockTestUtil.mockPosterList()
     whenever(posterDao.getPosterList()).thenReturn(mockData)
 
-    val fetchedData = mainRepository.loadDisneyPosters { }.asLiveData()
+    val fetchedData = mainRepository.loadDisneyPosters(
+      onSuccess = {},
+      onError = {}
+    ).asLiveData()
+
     val observer: Observer<List<Poster>> = mock()
     fetchedData.observeForever(observer)