[Fix] 일정화면 에러상태 새로고침 불가 문제 해결

app/src/main/java/com/daedan/festabook/presentation/common/component/ErrorStateScreen.kt

@@ -0,0 +1,46 @@
+package com.daedan.festabook.presentation.common.component
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.daedan.festabook.R
+import com.daedan.festabook.presentation.theme.FestabookTypography
+import com.daedan.festabook.presentation.theme.festabookSpacing
+
+@Composable
+fun ErrorStateScreen(modifier: Modifier = Modifier) {
+    Column(
+        modifier = modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_fail_load),
+            contentDescription = stringResource(R.string.content_description_iv_fail_load),
+            modifier = Modifier.size(48.dp),
+        )
+        Spacer(modifier = Modifier.height(festabookSpacing.paddingBody2))
+        Text(
+            text = stringResource(R.string.error_fail_to_load_info),
+            style = FestabookTypography.bodyLarge,
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun ErrorStateScreenPreview() {
+    ErrorStateScreen()
+}

app/src/main/java/com/daedan/festabook/presentation/common/component/LoadingStateScreen.kt

@@ -12,11 +12,15 @@ import com.airbnb.lottie.compose.rememberLottieComposition
 import com.daedan.festabook.R
 
 @Composable
-fun LoadingStateScreen(modifier: Modifier = Modifier) {
+fun LoadingStateScreen(
+    modifier: Modifier = Modifier,
+    isPlaying: Boolean = true,
+) {
     val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.loading))
     val progress by animateLottieCompositionAsState(
         composition = composition,
         iterations = LottieConstants.IterateForever,
+        isPlaying = isPlaying,
     )
     LottieAnimation(
         composition = composition,

app/src/main/java/com/daedan/festabook/presentation/home/component/HomeScreen.kt

@@ -17,9 +17,11 @@ import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.daedan.festabook.R
 import com.daedan.festabook.domain.model.Festival
 import com.daedan.festabook.domain.model.Organization
 import com.daedan.festabook.domain.model.Poster
@@ -64,7 +66,7 @@ fun HomeScreen(
         is FestivalUiState.Error -> {
             Box(modifier = modifier.fillMaxSize()) {
                 Text(
-                    text = "데이터를 불러오는데 실패했습니다.",
+                    text = stringResource(R.string.error_fail_to_load_info),
                     modifier = Modifier.align(Alignment.Center),
                 )
             }

app/src/main/java/com/daedan/festabook/presentation/schedule/ScheduleEventsUiState.kt

@@ -2,19 +2,22 @@ package com.daedan.festabook.presentation.schedule
 
 import com.daedan.festabook.presentation.schedule.model.ScheduleEventUiModel
 
-sealed interface ScheduleEventsUiState {
-    data object InitialLoading : ScheduleEventsUiState
+data class ScheduleEventsUiState(
+    val content: Content,
+    val isRefreshing: Boolean = false,
+) {
+    sealed interface Content {
+        data object InitialLoading : Content
 
-    data class Refreshing(
-        val oldEvents: List<ScheduleEventUiModel>,
-    ) : ScheduleEventsUiState
+        data class Success(
+            val events: List<ScheduleEventUiModel>,
+            val currentEventPosition: Int,
+        ) : Content {
+            val isEventsEmpty get() = events.isEmpty()
+        }
 
-    data class Success(
-        val events: List<ScheduleEventUiModel>,
-        val currentEventPosition: Int,
-    ) : ScheduleEventsUiState
-
-    data class Error(
-        val throwable: Throwable,
-    ) : ScheduleEventsUiState
+        data class Error(
+            val throwable: Throwable,
+        ) : Content
+    }
 }

app/src/main/java/com/daedan/festabook/presentation/schedule/ScheduleUiState.kt

@@ -2,22 +2,22 @@ package com.daedan.festabook.presentation.schedule
 
 import com.daedan.festabook.presentation.schedule.model.ScheduleDateUiModel
 
-sealed interface ScheduleUiState {
-    data object InitialLoading : ScheduleUiState
+data class ScheduleUiState(
+    val content: Content,
+) {
+    sealed interface Content {
+        data object InitialLoading : Content
 
-    data class Refreshing(
-        val lastSuccessState: Success,
-    ) : ScheduleUiState
+        data class Success(
+            val dates: List<ScheduleDateUiModel>,
+            val currentDatePosition: Int,
+            val eventsUiStateByPosition: Map<Int, ScheduleEventsUiState> = emptyMap(),
+        ) : Content
 
-    data class Success(
-        val dates: List<ScheduleDateUiModel>,
-        val currentDatePosition: Int,
-        val eventsUiStateByPosition: Map<Int, ScheduleEventsUiState> = emptyMap(),
-    ) : ScheduleUiState
-
-    data class Error(
-        val throwable: Throwable,
-    ) : ScheduleUiState
+        data class Error(
+            val throwable: Throwable,
+        ) : Content
+    }
 
     companion object {
         const val DEFAULT_POSITION: Int = 0

app/src/main/java/com/daedan/festabook/presentation/schedule/ScheduleViewModel.kt

@@ -16,7 +16,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.supervisorScope
 import java.time.LocalDate
 
 @ContributesIntoMap(AppScope::class)
@@ -26,16 +25,18 @@ class ScheduleViewModel(
     private val scheduleRepository: ScheduleRepository,
 ) : ViewModel() {
     private val _scheduleUiState: MutableStateFlow<ScheduleUiState> =
-        MutableStateFlow(ScheduleUiState.InitialLoading)
+        MutableStateFlow(
+            ScheduleUiState(content = ScheduleUiState.Content.InitialLoading),
+        )
     val scheduleUiState: StateFlow<ScheduleUiState> = _scheduleUiState.asStateFlow()
 
     init {
         loadSchedules()
     }
 
     fun loadSchedules(
-        scheduleUiState: ScheduleUiState = ScheduleUiState.InitialLoading,
-        scheduleEventUiState: ScheduleEventsUiState = ScheduleEventsUiState.InitialLoading,
+        scheduleUiState: ScheduleUiState = ScheduleUiState(content = ScheduleUiState.Content.InitialLoading),
+        scheduleEventUiState: ScheduleEventsUiState = ScheduleEventsUiState(ScheduleEventsUiState.Content.InitialLoading),
         selectedDatePosition: Int? = null,
         preloadCount: Int = PRELOAD_PAGE_COUNT,
     ) {
@@ -44,7 +45,7 @@ class ScheduleViewModel(
 
             if (datesResult.isSuccess) {
                 val currentPosition =
-                    (_scheduleUiState.value as ScheduleUiState.Success).currentDatePosition
+                    (_scheduleUiState.value.content as ScheduleUiState.Content.Success).currentDatePosition
                 loadEventsInRange(currentPosition, scheduleEventUiState, preloadCount)
             }
         }
@@ -64,45 +65,47 @@ class ScheduleViewModel(
                     selectedDatePosition ?: getCurrentDatePosition(scheduleDates)
 
                 _scheduleUiState.value =
-                    ScheduleUiState.Success(
-                        dates = scheduleDateUiModels,
-                        currentDatePosition = currentDatePosition,
+                    ScheduleUiState(
+                        content =
+                            ScheduleUiState.Content.Success(
+                                dates = scheduleDateUiModels,
+                                currentDatePosition = currentDatePosition,
+                            ),
                     )
 
                 Result.success(scheduleDateUiModels)
             },
             onFailure = { throwable ->
-                _scheduleUiState.value = ScheduleUiState.Error(throwable)
+                _scheduleUiState.value =
+                    ScheduleUiState(content = ScheduleUiState.Content.Error(throwable))
                 Result.failure(throwable)
             },
         )
     }
 
     fun loadEventsInRange(
         currentPosition: Int,
-        scheduleEventUiState: ScheduleEventsUiState = ScheduleEventsUiState.InitialLoading,
+        scheduleEventUiState: ScheduleEventsUiState = ScheduleEventsUiState(ScheduleEventsUiState.Content.InitialLoading),
         preloadCount: Int = PRELOAD_PAGE_COUNT,
     ) {
-        (_scheduleUiState.value as? ScheduleUiState.Success)?.dates?.let { scheduleDates ->
+        (_scheduleUiState.value.content as? ScheduleUiState.Content.Success)?.dates?.let { scheduleDates ->
             val range =
                 getPreloadRange(
                     totalPageSize = scheduleDates.size,
                     currentPosition = currentPosition,
                     preloadCount = preloadCount,
                 )
             viewModelScope.launch {
-                supervisorScope {
-                    range.forEach { position ->
-                        if (isEventLoaded(position)) return@forEach
-
-                        val scheduleDateUiModel = scheduleDates[position]
-                        launch {
-                            loadEventsByPosition(
-                                position = position,
-                                scheduleDateUiModel = scheduleDateUiModel,
-                                scheduleEventsUiState = scheduleEventUiState,
-                            )
-                        }
+                range.forEach { position ->
+                    if (isEventLoaded(position)) return@forEach
+
+                    val scheduleDateUiModel = scheduleDates[position]
+                    launch {
+                        loadEventsByPosition(
+                            position = position,
+                            scheduleDateUiModel = scheduleDateUiModel,
+                            scheduleEventsUiState = scheduleEventUiState,
+                        )
                     }
                 }
             }
@@ -125,27 +128,38 @@ class ScheduleViewModel(
                 updateEventUiState(
                     position = position,
                     scheduleEventsUiState =
-                        ScheduleEventsUiState.Success(
-                            events = uiModels,
-                            currentEventPosition = getCurrentEventPosition(uiModels),
+                        ScheduleEventsUiState(
+                            content =
+                                ScheduleEventsUiState.Content.Success(
+                                    events = uiModels,
+                                    currentEventPosition = getCurrentEventPosition(uiModels),
+                                ),
                         ),
                 )
             }.onFailure {
-                updateEventUiState(position, ScheduleEventsUiState.Error(it))
+                updateEventUiState(
+                    position,
+                    ScheduleEventsUiState(
+                        content = ScheduleEventsUiState.Content.Error(it),
+                    ),
+                )
             }
     }
 
     private fun updateEventUiState(
         position: Int,
         scheduleEventsUiState: ScheduleEventsUiState,
     ) {
-        val currentUiState = _scheduleUiState.value
-        if (currentUiState !is ScheduleUiState.Success) return
+        val currentState = _scheduleUiState.value
+        val content = currentState.content as? ScheduleUiState.Content.Success ?: return
 
         _scheduleUiState.value =
-            currentUiState.copy(
-                eventsUiStateByPosition =
-                    currentUiState.eventsUiStateByPosition + (position to scheduleEventsUiState),
+            currentState.copy(
+                content =
+                    content
+                        .copy(
+                            eventsUiStateByPosition = content.eventsUiStateByPosition + (position to scheduleEventsUiState),
+                        ),
             )
     }
 
@@ -180,9 +194,13 @@ class ScheduleViewModel(
     }
 
     private fun isEventLoaded(position: Int): Boolean {
-        val currentScheduleUiState = _scheduleUiState.value
-        if (currentScheduleUiState !is ScheduleUiState.Success) return false
-        return currentScheduleUiState.eventsUiStateByPosition[position] is ScheduleEventsUiState.Success
+        val currentScheduleUiStateContent = _scheduleUiState.value.content
+        if (currentScheduleUiStateContent !is ScheduleUiState.Content.Success) return false
+
+        val currentScheduleEventsUiStateContent =
+            currentScheduleUiStateContent.eventsUiStateByPosition[position]?.content ?: return false
+
+        return currentScheduleEventsUiStateContent is ScheduleEventsUiState.Content.Success
     }
 
     companion object {