fix my page ui events

Author: dosukoi-android

ui/view/src/main/java/jp/dosukoi/ui/view/myPage/MyPageScreen.kt

@@ -3,23 +3,31 @@ package jp.dosukoi.ui.view.myPage
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.LocalContext
 import jp.dosukoi.data.entity.myPage.UserStatus
 import jp.dosukoi.ui.view.common.LoadingAndErrorScreen
+import jp.dosukoi.ui.view.common.showErrorToast
 import jp.dosukoi.ui.viewmodel.myPage.MyPageViewModel
 
 @Composable
 fun MyPageScreen(
     viewModel: MyPageViewModel,
 ) {
     val myPageUiState by viewModel.myPageState.collectAsState()
+    if (myPageUiState.errors.isNotEmpty()) {
+        val context = LocalContext.current
+        val throwable = myPageUiState.errors.first()
+        context.showErrorToast(throwable)
+        viewModel.onConsumeErrors(throwable)
+    }
     LoadingAndErrorScreen(
-        state = myPageUiState,
+        state = myPageUiState.screenState,
         loadedContent = { data ->
             when (val state = data.userStatus) {
                 is UserStatus.Authenticated -> MyPageComponent(
                     state.user,
                     data.repositoryList,
-                    data.isRefreshing,
+                    myPageUiState.isRefreshing,
                     viewModel::onRefresh
                 )
                 UserStatus.UnAuthenticated -> UnAuthenticatedUserComponent()

ui/view/src/main/java/jp/dosukoi/ui/view/top/MainActivity.kt

@@ -11,24 +11,16 @@ import coil.compose.LocalImageLoader
 import dagger.hilt.android.AndroidEntryPoint
 import jp.dosukoi.ui.view.common.CompositionLocalProvider
 import jp.dosukoi.ui.view.common.appColors
-import jp.dosukoi.ui.view.common.produceViewModels
 import jp.dosukoi.ui.view.common.showErrorToast
 import jp.dosukoi.ui.viewmodel.myPage.MyPageViewModel
 import jp.dosukoi.ui.viewmodel.search.SearchViewModel
-import jp.dosukoi.ui.viewmodel.top.MainViewModel
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
-    private val viewModel: MainViewModel by viewModels()
+    private val myPageViewModel: MyPageViewModel by viewModels()
 
-    @Inject
-    lateinit var myPageViewModelFactory: MyPageViewModel.Factory
-    private val myPageViewModel: MyPageViewModel by produceViewModels {
-        myPageViewModelFactory.create(viewModel)
-    }
-    
     private val searchViewModel: SearchViewModel by viewModels()
 
     @Inject
@@ -53,7 +45,6 @@ class MainActivity : AppCompatActivity() {
         }
 
         myPageViewModel.init()
-        viewModel.onEvent.observe(this, ::handleEvent)
     }
 
     private fun handleEvent(event: MainViewModel.Event) {
@@ -75,6 +66,6 @@ class MainActivity : AppCompatActivity() {
         }
         val uri = intent.data ?: return
         val code = uri.getQueryParameter("code")
-        viewModel.onGetCode(code)
+        myPageViewModel.onGetCode(code)
     }
 }

ui/viewModel/src/main/java/jp/dosukoi/ui/viewmodel/myPage/MyPageUiState.kt

@@ -2,9 +2,15 @@ package jp.dosukoi.ui.viewmodel.myPage
 
 import jp.dosukoi.data.entity.myPage.Repository
 import jp.dosukoi.data.entity.myPage.UserStatus
+import jp.dosukoi.ui.viewmodel.common.LoadState
 
 data class MyPageUiState(
+    val screenState: LoadState<MyPageScreenState> = LoadState.Loading,
+    val isRefreshing: Boolean = false,
+    val errors: List<Throwable> = emptyList()
+)
+
+data class MyPageScreenState(
     val userStatus: UserStatus,
-    val repositoryList: List<Repository>,
-    val isRefreshing: Boolean
+    val repositoryList: List<Repository>
 )

ui/viewModel/src/main/java/jp/dosukoi/ui/viewmodel/myPage/MyPageViewModel.kt

@@ -2,37 +2,29 @@ package jp.dosukoi.ui.viewmodel.myPage
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import jp.dosukoi.data.entity.common.UnAuthorizeException
 import jp.dosukoi.data.entity.myPage.UserStatus
+import jp.dosukoi.data.usecase.auth.GetAccessTokenUseCase
 import jp.dosukoi.data.usecase.myPage.GetRepositoriesUseCase
 import jp.dosukoi.data.usecase.myPage.GetUserStatusUseCase
 import jp.dosukoi.ui.viewmodel.common.LoadState
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import javax.inject.Inject
 
-interface MyPageListener {
-    fun onGetCode(code: String?)
-}
-
-class MyPageViewModel @AssistedInject constructor(
+@HiltViewModel
+class MyPageViewModel @Inject constructor(
     private val getUserStatusUseCase: GetUserStatusUseCase,
     private val getRepositoriesUseCase: GetRepositoriesUseCase,
-    @Assisted private val myPageListener: MyPageListener
-) : ViewModel(), MyPageListener by myPageListener {
-
-    @AssistedFactory
-    interface Factory {
-        fun create(myPageListener: MyPageListener): MyPageViewModel
-    }
+    private val getAccessTokenUseCase: GetAccessTokenUseCase,
+) : ViewModel() {
 
-    private val _myPageState: MutableStateFlow<LoadState<MyPageUiState>> =
-        MutableStateFlow(LoadState.Loading)
-    val myPageState: StateFlow<LoadState<MyPageUiState>> = _myPageState
+    private val _myPageState: MutableStateFlow<MyPageUiState> =
+        MutableStateFlow(MyPageUiState())
+    val myPageState: StateFlow<MyPageUiState> = _myPageState
 
     fun init() {
         refresh()
@@ -41,44 +33,77 @@ class MyPageViewModel @AssistedInject constructor(
     private fun refresh() {
         viewModelScope.launch {
             runCatching {
-                MyPageUiState(
+                MyPageScreenState(
                     getUserStatusUseCase.execute(),
                     getRepositoriesUseCase.execute(),
-                    false
                 )
-            }.onSuccess {
-                _myPageState.value = LoadState.Loaded(it)
+            }.onSuccess { screenState ->
+                _myPageState.update {
+                    it.copy(screenState = LoadState.Loaded(screenState))
+                }
             }.onFailure {
                 when (it) {
                     is UnAuthorizeException -> {
-                        _myPageState.value = LoadState.Loaded(
-                            MyPageUiState(
-                                UserStatus.UnAuthenticated,
-                                emptyList(),
+                        _myPageState.update {
+                            it.copy(
+                                screenState = LoadState.Loaded(
+                                    MyPageScreenState(
+                                        UserStatus.UnAuthenticated,
+                                        emptyList()
+                                    )
+                                ),
                                 isRefreshing = false
                             )
-                        )
+                        }
                     }
                     else -> {
-                        _myPageState.value = LoadState.Error("error")
+                        _myPageState.update {
+                            it.copy(screenState = LoadState.Error("Error"))
+                        }
                     }
                 }
             }
         }
     }
 
     fun onRetryClick() {
-        _myPageState.value = LoadState.Loading
+        _myPageState.update {
+            it.copy(screenState = LoadState.Loading)
+        }
         refresh()
     }
 
     fun onRefresh() {
         _myPageState.update {
-            when (it) {
-                is LoadState.Loaded -> it.copy(data = it.data.copy(isRefreshing = true))
+            when (it.screenState) {
+                is LoadState.Loaded -> it.copy(isRefreshing = true)
                 else -> it
             }
         }
         refresh()
     }
+
+    fun onGetCode(code: String?) {
+        code ?: return
+        viewModelScope.launch {
+            runCatching {
+                getAccessTokenUseCase.execute(code)
+            }.onSuccess {
+                _myPageState.update {
+                    it.copy(screenState = LoadState.Loading)
+                }
+                refresh()
+            }.onFailure { throwable ->
+                _myPageState.update {
+                    it.copy(errors = it.errors.plus(throwable))
+                }
+            }
+        }
+    }
+
+    fun onConsumeErrors(throwable: Throwable) {
+        _myPageState.update {
+            it.copy(errors = it.errors.minus(throwable))
+        }
+    }
 }