From 3f2db5386cbb5cb19c2bb0dcfadf1de06cffbcc0 Mon Sep 17 00:00:00 2001 From: soyeonLee <109227292+soyeonLee126@users.noreply.github.com> Date: Fri, 6 Nov 2026 14:34:40 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EB=B3=B4=EA=B4=80=ED=95=A8=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EC=97=90=EC=84=9C=20=EC=B9=B4=EB=93=9C?= =?UTF-8?q?=EA=B0=80=20=EC=97=86=EB=8A=94=20=EB=8B=AC=EC=97=90=EB=8A=94=20?= =?UTF-8?q?=EB=B9=84=EC=9A=B0=EA=B8=B0=EB=A5=BC=20=EB=B9=84=ED=99=9C?= =?UTF-8?q?=EC=84=B1=ED=99=94=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/archive/ArchiveDetailScreen.kt | 6 +- .../feature/archive/ArchiveDetailState.kt | 6 +- .../feature/archive/ArchiveDetailViewModel.kt | 1 + .../archive/ArchiveDetailViewModelTest.kt | 61 +++++++++++++++++++ 4 files changed, 71 insertions(+), 3 deletions(-) diff --git a/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailScreen.kt b/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailScreen.kt index 7f3183eb..4e98569b 100644 --- a/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailScreen.kt +++ b/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailScreen.kt @@ -146,6 +146,7 @@ private fun ArchiveDetailFrame( topBar = { ArchiveDetailTopBar( emotion = emotion, + isClearEnabled = state.isClearable, onBackClick = onBackClick, onClearClick = onClearClick, ) @@ -253,6 +254,7 @@ private fun ClearConfirmDialog( @Composable private fun ArchiveDetailTopBar( emotion: EmotionCharacter, + isClearEnabled: Boolean, onBackClick: () -> Unit, onClearClick: () -> Unit, ) { @@ -282,10 +284,10 @@ private fun ArchiveDetailTopBar( Text( text = stringResource(R.string.archive_clear), style = GamssTheme.typography.body4Medium, - color = GamssTheme.colors.gray900, + color = if (isClearEnabled) GamssTheme.colors.gray900 else GamssTheme.colors.gray300, modifier = Modifier .clip(RoundedCornerShape(ClearRippleRadius)) - .clickable(role = Role.Button, onClick = onClearClick) + .clickable(enabled = isClearEnabled, role = Role.Button, onClick = onClearClick) .padding(ClearHitPadding), ) }, diff --git a/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailState.kt b/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailState.kt index 34774c03..e82db2bf 100644 --- a/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailState.kt +++ b/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailState.kt @@ -15,7 +15,11 @@ data class ArchiveDetailState( val selectedCard: Card? = null, val conversationCard: ConversationCard? = null, val isConversationLoading: Boolean = false, -) +) { + /** 감정 칸 전체 카드 수는 알 수 없어, 보고 있는 달에 카드가 있을 때만 비울 수 있다. */ + val isClearable: Boolean + get() = cards is ArchiveCards.Loaded && cards.cards.isNotEmpty() +} /** 종이 더미 자리가 가질 수 있는 상태. 셋이 겹칠 수 없어 플래그 조합 대신 하나로 든다. */ sealed interface ArchiveCards { diff --git a/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailViewModel.kt b/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailViewModel.kt index 865415af..ddfd0aca 100644 --- a/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailViewModel.kt +++ b/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailViewModel.kt @@ -50,6 +50,7 @@ class ArchiveDetailViewModel @Inject constructor( } fun showClearDialog() = intent { + if (!state.isClearable) return@intent reduce { state.copy(isClearDialogVisible = true) } } diff --git a/feature/archive/src/test/java/com/gamss/android/feature/archive/ArchiveDetailViewModelTest.kt b/feature/archive/src/test/java/com/gamss/android/feature/archive/ArchiveDetailViewModelTest.kt index 788ff223..39d76c91 100644 --- a/feature/archive/src/test/java/com/gamss/android/feature/archive/ArchiveDetailViewModelTest.kt +++ b/feature/archive/src/test/java/com/gamss/android/feature/archive/ArchiveDetailViewModelTest.kt @@ -456,6 +456,67 @@ class ArchiveDetailViewModelTest { } } + @Test + fun `보고 있는 달에 카드가 없으면 비우기 다이얼로그를 띄우지 않는다`() = runTest { + val viewModel = viewModel(FakeCardRepository(AppResult.Success(emptyList()))) + val testScope = this + + viewModel.test(this) { + containerHost.load(EmotionCharacter.ANGER) + expectState { copy(emotion = EmotionCharacter.ANGER) } + expectState { copy(cards = ArchiveCards.Loaded(emptyList())) } + + containerHost.showClearDialog() + testScope.runCurrent() + expectNoItems() + } + } + + @Test + fun `카드 조회에 실패하면 비우기 다이얼로그를 띄우지 않는다`() = runTest { + val viewModel = viewModel(FakeCardRepository(AppResult.Failure(IllegalStateException("network")))) + val testScope = this + + viewModel.test(this) { + containerHost.load(EmotionCharacter.ANGER) + expectState { copy(emotion = EmotionCharacter.ANGER) } + expectState { copy(cards = ArchiveCards.LoadFailed) } + + containerHost.showClearDialog() + testScope.runCurrent() + expectNoItems() + } + } + + @Test + fun `다른 달 카드를 받아 오는 중에는 비우기 다이얼로그를 띄우지 않는다`() = runTest { + val slowMonth = YearMonth.now(KoreanTimeZone).minusMonths(1) + val slowMonthGate = CompletableDeferred() + val repository = FakeCardRepository( + monthResult = AppResult.Success(listOf(angerCard)), + monthGates = mapOf(slowMonth to slowMonthGate), + ) + val viewModel = viewModel(repository) + val testScope = this + + viewModel.test(this) { + containerHost.load(EmotionCharacter.ANGER) + expectState { copy(emotion = EmotionCharacter.ANGER) } + expectState { copy(cards = ArchiveCards.Loaded(listOf(angerCard))) } + + // 직전 달에 카드가 있었어도 새 달 목록이 오기 전에는 비울 수 없다. + containerHost.selectMonth(slowMonth) + expectState { copy(yearMonth = slowMonth, cards = ArchiveCards.Loading) } + + containerHost.showClearDialog() + testScope.runCurrent() + expectNoItems() + + slowMonthGate.complete(Unit) + expectState { copy(cards = ArchiveCards.Loaded(listOf(angerCard))) } + } + } + private fun viewModel( repository: FakeCardRepository, conversationRepository: FakeConversationRepository = FakeConversationRepository(), From f95368cddb2163bbd4654a54422249bb91055464 Mon Sep 17 00:00:00 2001 From: soyeonLee <109227292+soyeonLee126@users.noreply.github.com> Date: Fri, 6 Nov 2026 17:29:03 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=B3=B4=EA=B4=80=ED=95=A8=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EC=97=90=EC=84=9C=20=EC=B9=B4=EB=93=9C?= =?UTF-8?q?=EA=B0=80=20=EC=97=86=EB=8A=94=20=EB=8B=AC=EC=97=90=20=EB=B9=88?= =?UTF-8?q?=20=EC=83=81=ED=83=9C=20=EB=AC=B8=EA=B5=AC=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit iOS와 맞추기 위해 4ca95574에서 제거한 문구를 다시 표시함 --- .../feature/archive/ArchiveDetailScreen.kt | 17 +++++++++++++---- feature/archive/src/main/res/values/strings.xml | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailScreen.kt b/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailScreen.kt index 4e98569b..780f9661 100644 --- a/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailScreen.kt +++ b/feature/archive/src/main/java/com/gamss/android/feature/archive/ArchiveDetailScreen.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -304,8 +305,10 @@ private fun ArchiveDetailCards( Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { when (cardsState) { ArchiveCards.Loading -> CircularProgressIndicator(color = GamssTheme.colors.gray700) - ArchiveCards.LoadFailed -> EmptyMessage(textRes = R.string.archive_cards_load_failed) - // 카드가 없으면 아무것도 그리지 않는다. 빈 종이판이 그대로 보이는 것이 이 화면의 빈 상태다. + ArchiveCards.LoadFailed -> EmptyMessage( + textRes = R.string.archive_cards_load_failed, + style = GamssTheme.typography.body4Medium, + ) is ArchiveCards.Loaded -> if (cardsState.cards.isNotEmpty()) { PaperPile( cards = cardsState.cards, @@ -313,16 +316,22 @@ private fun ArchiveDetailCards( onDropConsumed = onDropConsumed, onPaperClick = onPaperClick, ) + } else { + // 조회 실패 문구와 구분되도록 iOS 와 같은 스타일을 쓴다. + EmptyMessage( + textRes = R.string.archive_cards_empty, + style = GamssTheme.typography.body3Regular, + ) } } } } @Composable -private fun EmptyMessage(@StringRes textRes: Int) { +private fun EmptyMessage(@StringRes textRes: Int, style: TextStyle) { Text( text = stringResource(textRes), - style = GamssTheme.typography.body4Medium, + style = style, color = GamssTheme.colors.gray500, ) } diff --git a/feature/archive/src/main/res/values/strings.xml b/feature/archive/src/main/res/values/strings.xml index f6e736b0..8b3ee9fe 100644 --- a/feature/archive/src/main/res/values/strings.xml +++ b/feature/archive/src/main/res/values/strings.xml @@ -8,6 +8,7 @@ 뒤로 가기 %1$d월 %2$d일 카드 이야기를 불러오지 못했어요. + 아직 남겨둔 이야기가 없어요. 비우기 %1$s 기록 비우기