Refactor ContributorsViewModel

Ivy-Apps · Sep 20, 2023 · 492ffb9 · 492ffb9
1 parent 332c696
commit 492ffb9
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/screen-contributors/src/main/java/com/ivy/contributors/ContributorsViewModel.kt b/screen-contributors/src/main/java/com/ivy/contributors/ContributorsViewModel.kt
@@ -3,6 +3,7 @@ package com.ivy.contributors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.lifecycle.viewModelScope
 import com.ivy.core.ComposeViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -15,11 +16,12 @@ class ContributorsViewModel @Inject constructor(
     private val contributorsDataSource: ContributorsDataSource
 ) : ComposeViewModel<ContributorsState, ContributorsEvent>() {
 
-    private val contributors = mutableStateOf<List<Contributor>?>(null)
     private val contributorsState = mutableStateOf<ContributorsState>(ContributorsState.Loading)
 
     @Composable
     override fun uiState(): ContributorsState {
+        val contributors = remember { mutableStateOf<List<Contributor>?>(null) }
+
         LaunchedEffect(Unit) {
             contributors.value = contributorsDataSource.fetchContributors()?.map {
                 Contributor(
@@ -30,10 +32,12 @@ class ContributorsViewModel @Inject constructor(
                 )
             }
 
-            val contributors = contributors.value
+            val contributorsList = contributors.value
 
-            if (contributors != null) {
-                contributorsState.value = ContributorsState.Success(contributors.toImmutableList())
+            if (contributorsList != null) {
+                contributorsState.value = ContributorsState.Success(
+                    contributorsList.toImmutableList()
+                )
             } else {
                 contributorsState.value = ContributorsState.Error("Error. Try again.")
             }
@@ -49,15 +53,25 @@ class ContributorsViewModel @Inject constructor(
     }
 
     private fun onTryAgainButtonClicked() {
+        contributorsState.value = ContributorsState.Loading
+
         viewModelScope.launch {
-            contributors.value = contributorsDataSource.fetchContributors()?.map {
+            val contributors = contributorsDataSource.fetchContributors()?.map {
                 Contributor(
                     name = it.login,
                     photo = it.avatarUrl,
                     contributions = it.contributions.toString(),
                     link = it.link
                 )
             }
+
+            if (contributors != null) {
+                contributorsState.value = ContributorsState.Success(
+                    contributors.toImmutableList()
+                )
+            } else {
+                contributorsState.value = ContributorsState.Error("Error. Try again.")
+            }
         }
     }
 }