feat: add uiState to ListScreen

shinhyo · shinhyo · commit 542f981fcb3b · 2022-05-15T10:02:53.000+09:00
diff --git a/data/src/main/java/io/github/shinhyo/brba/data/repository/CharactersRepositoryImpl.kt b/data/src/main/java/io/github/shinhyo/brba/data/repository/CharactersRepositoryImpl.kt
@@ -22,20 +22,50 @@ import io.github.shinhyo.brba.data.mapper.toCharacterEntity
 import io.github.shinhyo.brba.data.remote.api.BaBrApi
 import io.github.shinhyo.brba.domain.model.Character
 import io.github.shinhyo.brba.domain.repository.CharactersRepository
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.map
+import io.github.shinhyo.brba.domain.result.Result
+import kotlinx.coroutines.flow.*
+import java.util.*
 import javax.inject.Inject
+import kotlin.random.Random
 
 open class CharactersRepositoryImpl @Inject constructor(
     private val api: BaBrApi,
     private val db: AppDatabase
 ) : CharactersRepository {
 
-    override fun getCharacterList(): Flow<List<Character>> = flow { emit(api.getCharacters()) }
-        .map { it.map { r -> r.toCharacter() } }
+    companion object {
+        const val MIN_RATIO = 1.2f
+    }
+
+    private val random: Random by lazy { Random(Calendar.getInstance().timeInMillis) }
+
+    override fun getCharacterList(): Flow<Result<List<Character>>> {
+
+        fun changeRatio(list: List<Character>) =
+            list.map { c ->
+                val nextInt = random.nextInt(4) * 0.15f
+                c.copy(ratio = MIN_RATIO + nextInt)
+            }
+
+        fun addFavoriteToList(list: List<Character>) =
+            db.characterDao().getAll()
+                .map { dblist ->
+                    list.toMutableList().map {
+                        it.copy(
+                            favorite = dblist.find { i ->
+                                it.charId == i.charId
+                            }?.favorite ?: false
+                        )
+                    }
+                }
+
+        return flow { emit(api.getCharacters()) }
+            .map { it.map { r -> r.toCharacter() } }
+            .map { changeRatio(it) }
+            .flatMapConcat { addFavoriteToList(it) }
+            .map { Result.Success(it) }
+    }
+
 
     override fun getFavoriteList(isAsc: Boolean): Flow<List<Character>> =
         db.characterDao().getFavorite(isAsc = isAsc)
@@ -51,16 +81,6 @@ open class CharactersRepositoryImpl @Inject constructor(
                 res.copy(favorite = entity?.favorite ?: false)
             }
 
-    override fun addFavoriteStatus(listCharacter: List<Character>): Flow<List<Character>> =
-        flowOf(listCharacter)
-            .combine(
-                db.characterDao().getAll()
-            ) { list: List<Character>, db: List<CharacterEntity> ->
-                list.toMutableList().map {
-                    it.copy(favorite = db.find { i -> it.charId == i.charId }?.favorite ?: false)
-                }
-            }
-
     override fun updateFavorite(character: Character): Flow<Boolean> = flowOf(character)
         .map { it.toCharacterEntity().copy(favorite = !character.favorite) }
         .map { db.characterDao().insert(it) }
diff --git a/domain/src/main/java/io/github/shinhyo/brba/domain/repository/CharactersRepository.kt b/domain/src/main/java/io/github/shinhyo/brba/domain/repository/CharactersRepository.kt
@@ -16,12 +16,12 @@
 package io.github.shinhyo.brba.domain.repository
 
 import io.github.shinhyo.brba.domain.model.Character
+import io.github.shinhyo.brba.domain.result.Result
 import kotlinx.coroutines.flow.Flow
 
 interface CharactersRepository {
-    fun getCharacterList(): Flow<List<Character>>
+    fun getCharacterList(): Flow<Result<List<Character>>>
     fun getFavoriteList(isAsc: Boolean = false): Flow<List<Character>>
     fun getCharacterById(id: Long): Flow<Character>
-    fun addFavoriteStatus(listCharacter: List<Character>): Flow<List<Character>>
     fun updateFavorite(character: Character): Flow<Boolean>
 }
diff --git a/domain/src/main/java/io/github/shinhyo/brba/domain/usecase/GetCharacterListUseCase.kt b/domain/src/main/java/io/github/shinhyo/brba/domain/usecase/GetCharacterListUseCase.kt
@@ -0,0 +1,19 @@
+package io.github.shinhyo.brba.domain.usecase
+
+import io.github.shinhyo.brba.domain.di.IoDispatcher
+import io.github.shinhyo.brba.domain.model.Character
+import io.github.shinhyo.brba.domain.repository.CharactersRepository
+import io.github.shinhyo.brba.domain.result.Result
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class GetCharacterListUseCase @Inject constructor(
+    private val charactersRepository: CharactersRepository,
+    @IoDispatcher dispatcher: CoroutineDispatcher,
+) : FlowUseCase<Unit, List<Character>>(dispatcher) {
+
+    override fun execute(parameters: Unit): Flow<Result<List<Character>>> =
+        charactersRepository.getCharacterList()
+
+}
diff --git a/presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/list/ListScreen.kt b/presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/list/ListScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
@@ -49,14 +48,14 @@ fun ListScreen(
     state: ScrollState,
     modifier: Modifier = Modifier
 ) {
-    val list = viewModel.list.collectAsState()
+    val uiState = viewModel.uiState.collectAsState()
     val clickFavorite: (Character) -> Unit = viewModel::upsertFavorite
-    Body(list, select, clickFavorite, state, modifier)
+    Body(uiState.value.list, select, clickFavorite, state, modifier)
 }
 
 @Composable
 private fun Body(
-    list: State<List<Character>>,
+    list: List<Character>,
     select: (Character) -> Unit,
     clickFavorite: (Character) -> Unit,
     state: ScrollState,
@@ -79,7 +78,7 @@ private fun Body(
             maxColumnWidth = 160.dp,
             modifier = Modifier.padding(4.dp)
         ) {
-            list.value.forEach {
+            list.forEach {
                 FeaturedList(
                     character = it, select = select,
                     clickFavorite = clickFavorite
diff --git a/presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/list/ListViewModel.kt b/presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/list/ListViewModel.kt
@@ -15,45 +15,64 @@
  */
 package io.github.shinhyo.brba.presentation.ui.list
 
+import androidx.annotation.StringRes
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import io.github.shinhyo.brba.domain.model.Character
-import io.github.shinhyo.brba.domain.usecase.AddFavoriteToListUseCase
+import io.github.shinhyo.brba.domain.result.Result
 import io.github.shinhyo.brba.domain.usecase.GetCharacterListUseCase
 import io.github.shinhyo.brba.domain.usecase.UpdateFavoriteUseCase
+import io.github.shinhyo.brba.presentation.R
 import io.github.shinhyo.brba.presentation.ui.BaseFavoriteViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.flatMapConcat
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.*
 import javax.inject.Inject
 
+
+data class ListUiState(
+    val isLoading: Boolean = false,
+    @StringRes val errorMessages: Int? = null,
+    val list: List<Character> = emptyList()
+)
+
 @HiltViewModel
 class ListViewModel
 @Inject constructor(
     private val getCharacterListUseCase: GetCharacterListUseCase,
-    private val addFavoriteToListUseCase: AddFavoriteToListUseCase,
     updateFavoriteUseCase: UpdateFavoriteUseCase,
 ) : BaseFavoriteViewModel(updateFavoriteUseCase) {
 
-    private val _list = MutableStateFlow(emptyList<Character>())
-    val list: StateFlow<List<Character>> get() = _list
+    private val _uiState = MutableStateFlow(ListUiState())
+    val uiState = _uiState.asStateFlow()
+
 
     init {
         getCharacterList()
     }
 
     private fun getCharacterList() {
-        getCharacterListUseCase.execute()
-            .onEach { _list.value = it }
-            .flatMapConcat { addFavoriteToListUseCase.execute(it) }
-            .onEach { _list.value = it }
-            .flowOn(Dispatchers.IO)
-            .catch { e -> e.printStackTrace() }
+        _uiState.update { it.copy(isLoading = true) }
+
+        getCharacterListUseCase(Unit)
+            .onEach { result ->
+                when (result) {
+                    is Result.Success -> {
+                        _uiState.update {
+                            it.copy(
+                                isLoading = true,
+                                list = result.data
+                            )
+                        }
+                    }
+                    is Result.Error -> {
+                        _uiState.update {
+                            it.copy(
+                                isLoading = true,
+                                errorMessages = R.string.error_load
+                            )
+                        }
+                    }
+                }
+            }
             .launchIn(viewModelScope)
     }
 }
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -2,4 +2,5 @@
     <string name="app_name">BrBa-Compose</string>
     <string name="brba">BrBa</string>
     <string name="empty">Empty</string>
+    <string name="error_load">Can\'t update</string>
 </resources>
