refactoring

Author: aykuttasil

app/src/main/kotlin/com/aykuttasil/modernapp/ui/user/UserActivity.kt

@@ -18,14 +18,16 @@ package com.aykuttasil.modernapp.ui.user
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.viewModels
-import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
+import com.aykuttasil.domain.util.logd
 import com.aykuttasil.modernapp.R
 import com.aykuttasil.modernapp.databinding.ActivityUserBinding
 import com.aykuttasil.modernapp.ui.common.BaseActivity
 import com.aykuttasil.modernapp.util.delegates.contentView
-import com.aykuttasil.domain.util.logd
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 @ExperimentalCoroutinesApi
 @AndroidEntryPoint
@@ -39,18 +41,20 @@ class UserActivity : BaseActivity() {
     super.onCreate(savedInstanceState)
     logd { "onCreate" }
 
-    viewModel.viewState.observe(this, Observer {
-      if (it.isLoading) {
-        Toast.makeText(this, "Lütfen Bekleyiniz", Toast.LENGTH_SHORT).show()
-      } else if (it.userEntity != null) {
-        Toast.makeText(this, "İşlem Tamamlandı", Toast.LENGTH_SHORT).show()
-        Toast.makeText(this, it.userEntity?.userName, Toast.LENGTH_SHORT).show()
+    viewModel.viewState.onEach {
+      when (it) {
+        is UserViewModel.ViewState.Loading -> {
+          Toast.makeText(this, "Lütfen Bekleyiniz", Toast.LENGTH_SHORT).show()
+        }
+        is UserViewModel.ViewState.Success -> {
+          Toast.makeText(this, "İşlem Tamamlandı", Toast.LENGTH_SHORT).show()
+          Toast.makeText(this, it.user.userName, Toast.LENGTH_SHORT).show()
+        }
+        is UserViewModel.ViewState.Error -> {
+          Toast.makeText(this, it.err.message, Toast.LENGTH_SHORT).show()
+        }
       }
-    })
-
-    viewModel.errorState.observe(this, Observer {
-      Toast.makeText(this, it?.message, Toast.LENGTH_SHORT).show()
-    })
+    }.launchIn(lifecycleScope)
 
     viewModel.getUser()
 

app/src/main/kotlin/com/aykuttasil/modernapp/ui/user/UserViewModel.kt

@@ -2,53 +2,47 @@ package com.aykuttasil.modernapp.ui.user
 
 import androidx.hilt.Assisted
 import androidx.hilt.lifecycle.ViewModelInject
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import com.aykuttasil.domain.entities.UserEntity
 import com.aykuttasil.domain.usecases.user.GetUserUseCase
 import com.aykuttasil.domain.util.Resource
 import com.aykuttasil.modernapp.App
 import com.aykuttasil.modernapp.ui.common.BaseViewModel
-import com.aykuttasil.modernapp.util.SingleLiveEvent
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 
-data class UserActivityViewState(
-  var isLoading: Boolean = true,
-  var userEntity: UserEntity? = null,
-  var error: String? = null
-)
-
 @ExperimentalCoroutinesApi
 class UserViewModel @ViewModelInject constructor(
   @Assisted private val savedStateHandle: SavedStateHandle,
   private val app: App,
   private val getUserUseCase: GetUserUseCase
 ) : BaseViewModel(app) {
 
-  val viewState = MutableLiveData<UserActivityViewState>()
-  var errorState: SingleLiveEvent<Throwable?> = SingleLiveEvent()
-
-  init {
-    viewState.value = UserActivityViewState()
+  sealed class ViewState {
+    object Loading : ViewState()
+    data class Success(val user: UserEntity) : ViewState()
+    data class Error(val err: Throwable) : ViewState()
   }
 
+  val viewState = MutableStateFlow<ViewState>(ViewState.Loading)
+
   fun getUser() {
     viewModelScope.launch {
       getUserUseCase("aykuttasil") { state ->
         state.onEach {
           when (it) {
             is Resource.Loading -> {
-              viewState.value = viewState.value?.copy(isLoading = true)
+              viewState.value = ViewState.Loading
             }
             is Resource.Success -> {
-              viewState.value = viewState.value?.copy(isLoading = false, userEntity = it.data)
+              viewState.value = ViewState.Success(it.data!!)
             }
             is Resource.Error -> {
-              errorState.value = it.error
+              viewState.value = ViewState.Error(it.error ?: Exception("Error!"))
             }
           }
         }.launchIn(viewModelScope)