From 9d2233667f2cf2521f3d4d2558a583be9180d233 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 12:38:27 +0900 Subject: [PATCH 01/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=EB=90=9C=20=ED=83=AD=EA=B3=BC=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=85=9C=20=EB=AA=A9=EB=A1=9D=20=EA=B0=84=EA=B2=A9=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/twix/stats/component/EndStatsContent.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/main/src/main/java/com/twix/stats/component/EndStatsContent.kt b/feature/main/src/main/java/com/twix/stats/component/EndStatsContent.kt index 13d71dd9..0c34a6b7 100644 --- a/feature/main/src/main/java/com/twix/stats/component/EndStatsContent.kt +++ b/feature/main/src/main/java/com/twix/stats/component/EndStatsContent.kt @@ -38,7 +38,7 @@ fun EndStatsContent( ) } } else { - item { Spacer(Modifier.height(12.dp)) } + item { Spacer(Modifier.height(20.dp)) } items( items = statsGoals, From 208ffa1334993e3e4d83aaec9ab4838a09793098 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 12:40:46 +0900 Subject: [PATCH 02/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20?= =?UTF-8?q?=EC=B9=B4=EB=93=9C=20=EB=8B=89=EB=84=A4=EC=9E=84,=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20=ED=9A=9F=EC=88=98=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=83=89=EC=83=81=20400=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/twix/designsystem/components/stats/StampCell.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/design-system/src/main/java/com/twix/designsystem/components/stats/StampCell.kt b/core/design-system/src/main/java/com/twix/designsystem/components/stats/StampCell.kt index a7a6480e..6524f88b 100644 --- a/core/design-system/src/main/java/com/twix/designsystem/components/stats/StampCell.kt +++ b/core/design-system/src/main/java/com/twix/designsystem/components/stats/StampCell.kt @@ -31,7 +31,7 @@ fun StampCell( AppText( text = stats.nickname, style = AppTextStyle.B4, - color = GrayColor.C500, + color = GrayColor.C400, ) Spacer(modifier = Modifier.weight(1f)) @@ -39,7 +39,7 @@ fun StampCell( AppText( text = stringResource(R.string.stats_stamp_end_count).format(stats.completedCount), style = AppTextStyle.B4, - color = GrayColor.C500, + color = GrayColor.C400, ) } From 6a71856399cb86d4ab3ef59d1cfdd34a35f7c8a2 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 14:07:05 +0900 Subject: [PATCH 03/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20?= =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=BA=98=EB=A6=B0=EB=8D=94=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/twix/designsystem/components/stats/PictureDayCell.kt | 2 +- .../com/twix/designsystem/components/stats/StatsCalendar.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt b/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt index b24069f5..ece7f086 100644 --- a/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt +++ b/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt @@ -104,7 +104,7 @@ fun PictureDayCell( AppText( text = date.dayOfMonth.toString(), - style = AppTextStyle.B1, + style = AppTextStyle.B3, color = textColor, textAlign = TextAlign.Center, ) diff --git a/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt b/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt index 5c463607..71d410e2 100644 --- a/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt +++ b/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.size import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource @@ -84,7 +83,7 @@ private fun DayOfWeekHeader() { days.forEach { day -> AppText( text = day, - style = AppTextStyle.B2, + style = AppTextStyle.C1, color = GrayColor.C300, modifier = Modifier From 173ed08108d3fded2071933080e14101793a942f Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 14:07:49 +0900 Subject: [PATCH 04/14] =?UTF-8?q?=E2=9C=A8=20Feat:=20`StatsCalendar`=20?= =?UTF-8?q?=EC=9A=94=EC=9D=BC=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=20=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 요일 표시 `AppText`를 `Box`로 감싸고 `contentAlignment = Alignment.Center`를 적용하여 텍스트 정렬 최적화 --- .../components/stats/StatsCalendar.kt | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt b/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt index 71d410e2..21ae53ab 100644 --- a/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt +++ b/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign @@ -81,16 +82,19 @@ private fun DayOfWeekHeader() { modifier = Modifier.fillMaxWidth(), ) { days.forEach { day -> - AppText( - text = day, - style = AppTextStyle.C1, - color = GrayColor.C300, - modifier = - Modifier - .weight(1f) - .height(24.dp), - textAlign = TextAlign.Center, - ) + Box( + modifier = Modifier + .weight(1f) + .height(24.dp), + contentAlignment = Alignment.Center + ) { + AppText( + text = day, + style = AppTextStyle.C1, + color = GrayColor.C300, + textAlign = TextAlign.Center, + ) + } } } } From 9eaa319bb41b119489525b35413bf42f35a72aa2 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 14:16:51 +0900 Subject: [PATCH 05/14] =?UTF-8?q?=E2=9C=A8=20Feat:=20=EC=82=AC=EC=A7=84=20?= =?UTF-8?q?=ED=95=98=EB=82=98=EB=A7=8C=20=EC=9E=88=EC=9D=84=20=EB=95=8C=20?= =?UTF-8?q?border=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/twix/designsystem/components/stats/PictureDayCell.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt b/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt index ece7f086..ee64fde2 100644 --- a/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt +++ b/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt @@ -68,8 +68,8 @@ fun PictureDayCell( .size(36.dp) .clip(cornerShape) .then( - if (showBackgroundCard) { - Modifier.border(1.dp, borderColor, cornerShape) + if (hasImage) { + Modifier.border((1.2).dp, borderColor, cornerShape) } else { Modifier }, From e6884d26f58a7baa7d2757263c72166beffd7700 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 14:19:57 +0900 Subject: [PATCH 06/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20?= =?UTF-8?q?=EC=82=AC=EC=A7=84=20=EB=91=90=EC=9E=A5=EC=9D=BC=20=EB=95=8C=20?= =?UTF-8?q?=EB=92=A4=EC=97=90=20=EC=9E=88=EB=8A=94=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=ED=9A=8C=EC=A0=84=20=EB=B0=A9=ED=96=A5=EC=9D=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/twix/designsystem/components/stats/PictureDayCell.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt b/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt index ee64fde2..75ed9b3d 100644 --- a/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt +++ b/core/design-system/src/main/java/com/twix/designsystem/components/stats/PictureDayCell.kt @@ -56,7 +56,7 @@ fun PictureDayCell( modifier = Modifier .size(36.dp) - .rotate(-16f) + .rotate(16f) .border(1.dp, GrayColor.C400, cornerShape) .background(CommonColor.White, cornerShape), ) From 38f7089c73510bef6fc4f6b95c68761660e8848b Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 14:33:17 +0900 Subject: [PATCH 07/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20?= =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=83=81=EC=84=B8=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=82=A0=EC=A7=9C=20=ED=8F=AC=EB=A7=B7=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/design-system/src/main/res/values/strings.xml | 5 ++++- .../java/com/twix/stats/detail/component/SummaryContent.kt | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/design-system/src/main/res/values/strings.xml b/core/design-system/src/main/res/values/strings.xml index abf6eb67..ec401207 100644 --- a/core/design-system/src/main/res/values/strings.xml +++ b/core/design-system/src/main/res/values/strings.xml @@ -39,6 +39,10 @@ 금 토 + + %s년 %02d월 %02d일 + %1$d년 %2$d월 %3$d일 + 수정하기 삭제하기 @@ -73,7 +77,6 @@ 지난 우리 목표 오늘 우리 목표 다음 우리 목표 - %s년 %02d월 %02d일 아직 목표가 없어요! diff --git a/feature/stats/detail/src/main/java/com/twix/stats/detail/component/SummaryContent.kt b/feature/stats/detail/src/main/java/com/twix/stats/detail/component/SummaryContent.kt index b6f649fa..273ec55e 100644 --- a/feature/stats/detail/src/main/java/com/twix/stats/detail/component/SummaryContent.kt +++ b/feature/stats/detail/src/main/java/com/twix/stats/detail/component/SummaryContent.kt @@ -105,7 +105,7 @@ fun SummaryContent( label = stringResource(R.string.word_start_date), value = stringResource( - R.string.date_year_month_day, + R.string.date_year_month_day_no_padding, statsSummary.startDate.year, statsSummary.startDate.monthValue, statsSummary.startDate.dayOfMonth, @@ -116,7 +116,7 @@ fun SummaryContent( value = statsSummary.endDate?.let { stringResource( - R.string.date_year_month_day, + R.string.date_year_month_day_no_padding, it.year, it.monthValue, it.dayOfMonth, @@ -170,7 +170,7 @@ private fun SummaryContentPreview() { partnerCompletedCount = 8, totalCount = 20, repeatCycle = RepeatCycle.DAILY, - startDate = LocalDate.now(), + startDate = LocalDate.of(2025, 11, 12), endDate = LocalDate.now(), ), ) From f6c9d363e26b7348c95563046f40af6899ec6223 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 14:46:05 +0900 Subject: [PATCH 08/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20?= =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=83=81=EC=84=B8=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=ED=9A=9F=EC=88=98=20=ED=8F=AC=EB=A7=B7=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/design-system/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/design-system/src/main/res/values/strings.xml b/core/design-system/src/main/res/values/strings.xml index ec401207..02a06b9d 100644 --- a/core/design-system/src/main/res/values/strings.xml +++ b/core/design-system/src/main/res/values/strings.xml @@ -95,7 +95,7 @@ 종료 - %1$s %2$d/%3$d + %1$s - %2$d/%3$d 최근 14일 From 809ef914dc3cdc841fc882e80323bf8842680327 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 14:49:41 +0900 Subject: [PATCH 09/14] =?UTF-8?q?=E2=9C=A8=20Feat:=20=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=EC=83=B7=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=84=B1=EA=B3=B5=20?= =?UTF-8?q?=EC=8B=9C=20=ED=86=B5=EA=B3=84=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EA=B0=B1=EC=8B=A0=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../twix/photolog/capture/PhotologCaptureViewModel.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/feature/photolog/capture/src/main/java/com/twix/photolog/capture/PhotologCaptureViewModel.kt b/feature/photolog/capture/src/main/java/com/twix/photolog/capture/PhotologCaptureViewModel.kt index da1c8d1e..72d86354 100644 --- a/feature/photolog/capture/src/main/java/com/twix/photolog/capture/PhotologCaptureViewModel.kt +++ b/feature/photolog/capture/src/main/java/com/twix/photolog/capture/PhotologCaptureViewModel.kt @@ -20,6 +20,7 @@ import com.twix.ui.image.ImageGenerator import com.twix.util.bus.GoalRefreshBus import com.twix.util.bus.PhotologRefreshBus import com.twix.util.bus.StatsDetailRefreshBus +import com.twix.util.bus.StatsRefreshBus import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -32,6 +33,7 @@ class PhotologCaptureViewModel( private val detailRefreshBus: PhotologRefreshBus, private val goalRefreshBus: GoalRefreshBus, private val statsDetailRefreshBus: StatsDetailRefreshBus, + private val statsRefreshBus: StatsRefreshBus, savedStateHandle: SavedStateHandle, ) : BaseViewModel( PhotologCaptureUiState(), @@ -176,11 +178,16 @@ class PhotologCaptureViewModel( private fun handleUploadPhotologSuccess() { when (navArgs.from) { - NavRoutes.PhotologRoute.From.HOME -> + NavRoutes.PhotologRoute.From.HOME -> { goalRefreshBus.notifyGoalListChanged() + statsRefreshBus.notifyChanged(StatsRefreshBus.Target.All) + } - NavRoutes.PhotologRoute.From.DETAIL -> + NavRoutes.PhotologRoute.From.DETAIL -> { detailRefreshBus.notifyChanged(PhotologRefreshBus.Publisher.PHOTOLOG) + statsDetailRefreshBus.notifyChanged() + statsRefreshBus.notifyChanged(StatsRefreshBus.Target.All) + } NavRoutes.PhotologRoute.From.EDITOR -> Unit } From 660e554075769b0735b7ee7b96b70f1e8a7d3536 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 14:55:09 +0900 Subject: [PATCH 10/14] =?UTF-8?q?=F0=9F=9A=9A=20Chore:=20.gitkeep=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20StatsCalendar=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=ED=8F=AC=EB=A7=B7=ED=8C=85=20=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../twix/designsystem/components/stats/StatsCalendar.kt | 9 +++++---- core/util/src/main/java/com/twix/util/.gitkeep | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 core/util/src/main/java/com/twix/util/.gitkeep diff --git a/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt b/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt index 21ae53ab..b49c613c 100644 --- a/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt +++ b/core/design-system/src/main/java/com/twix/designsystem/components/stats/StatsCalendar.kt @@ -83,10 +83,11 @@ private fun DayOfWeekHeader() { ) { days.forEach { day -> Box( - modifier = Modifier - .weight(1f) - .height(24.dp), - contentAlignment = Alignment.Center + modifier = + Modifier + .weight(1f) + .height(24.dp), + contentAlignment = Alignment.Center, ) { AppText( text = day, diff --git a/core/util/src/main/java/com/twix/util/.gitkeep b/core/util/src/main/java/com/twix/util/.gitkeep deleted file mode 100644 index 379ad9b7..00000000 --- a/core/util/src/main/java/com/twix/util/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -# This file ensures the directory is tracked by git From fc8e49d430d80571967dfa3b4876c9b27f4aaf5f Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Mon, 9 Mar 2026 15:20:54 +0900 Subject: [PATCH 11/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20StatsDet?= =?UTF-8?q?ailScreen=20=ED=8C=A8=EB=94=A9=20=EB=B0=8F=20=EA=B0=84=EA=B2=A9?= =?UTF-8?q?=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/twix/stats/detail/StatsDetailScreen.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt b/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt index 35996205..0c876e7a 100644 --- a/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt +++ b/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt @@ -158,6 +158,7 @@ fun StatsDetailScreen( modifier = Modifier .fillMaxWidth() + .padding(top = 32.dp) .verticalScroll(scrollState), ) { Image( @@ -166,18 +167,17 @@ fun StatsDetailScreen( modifier = Modifier .align(Alignment.TopStart) - .padding(start = 20.dp, top = 30.dp), + .padding(start = 20.dp), ) Column( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 20.dp), + .padding(horizontal = 20.dp) + .padding(top = 4.dp), horizontalAlignment = Alignment.CenterHorizontally, ) { - Spacer(Modifier.height(32.dp)) - CalendarNavigator( currentDate = uiState.detail.currentDate, onPreviousMonth = onPreviousMonth, @@ -210,7 +210,7 @@ fun StatsDetailScreen( modifier = Modifier .align(Alignment.TopEnd) - .padding(end = 27.dp, top = 30.dp), + .padding(end = 27.dp), ) } From cd6e395c1e13748d5dc7661c2232632c383a60c2 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Wed, 11 Mar 2026 17:39:21 +0900 Subject: [PATCH 12/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20`StatsDe?= =?UTF-8?q?tailScreen`=20=EC=A0=84=EC=B2=B4=20=EC=8A=A4=ED=81=AC=EB=A1=A4?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `verticalScroll` 위치를 내부 Column에서 최상위 컨테이너로 이동하여 화면 전체가 스크롤되도록 수정 --- .../src/main/java/com/twix/stats/detail/StatsDetailScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt b/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt index 0c876e7a..f198121a 100644 --- a/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt +++ b/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt @@ -125,6 +125,7 @@ fun StatsDetailScreen( modifier = Modifier .fillMaxSize() + .verticalScroll(scrollState) .background(GrayColor.C050), ) { StatsDetailTopbar( @@ -159,7 +160,6 @@ fun StatsDetailScreen( Modifier .fillMaxWidth() .padding(top = 32.dp) - .verticalScroll(scrollState), ) { Image( imageVector = ImageVector.vectorResource(R.drawable.ic_hug), From dc95cbb153dd06cc67722546db2ab673c435272e Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Wed, 11 Mar 2026 19:03:04 +0900 Subject: [PATCH 13/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20ktlintFo?= =?UTF-8?q?rmat=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/twix/stats/detail/StatsDetailScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt b/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt index f198121a..07419af7 100644 --- a/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt +++ b/feature/stats/detail/src/main/java/com/twix/stats/detail/StatsDetailScreen.kt @@ -159,7 +159,7 @@ fun StatsDetailScreen( modifier = Modifier .fillMaxWidth() - .padding(top = 32.dp) + .padding(top = 32.dp), ) { Image( imageVector = ImageVector.vectorResource(R.drawable.ic_hug), From a7774b4228be46bd08c2cc06d2c03853104fc9a5 Mon Sep 17 00:00:00 2001 From: chanho0908 Date: Wed, 11 Mar 2026 23:25:45 +0900 Subject: [PATCH 14/14] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor:=20`monthCh?= =?UTF-8?q?angeFlow`=20`collectMonthChange()`=20=ED=95=A8=EC=88=98?= =?UTF-8?q?=EB=A1=9C=20=EC=B6=94=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/twix/stats/StatsViewModel.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/feature/main/src/main/java/com/twix/stats/StatsViewModel.kt b/feature/main/src/main/java/com/twix/stats/StatsViewModel.kt index bb2fb9d7..a67a297f 100644 --- a/feature/main/src/main/java/com/twix/stats/StatsViewModel.kt +++ b/feature/main/src/main/java/com/twix/stats/StatsViewModel.kt @@ -44,6 +44,13 @@ class StatsViewModel( ) init { + collectMonthChange() + fetchInProgressStats(YearMonth.from(currentState.currentDate)) + fetchCompletedStats() + collectEventBus() + } + + private fun collectMonthChange() { viewModelScope.launch { monthChangeFlow .distinctUntilChanged() @@ -52,10 +59,6 @@ class StatsViewModel( fetchInProgressStats(yearMonth) } } - - fetchInProgressStats(YearMonth.from(currentState.currentDate)) - fetchCompletedStats() - collectEventBus() } override suspend fun handleIntent(intent: StatsIntent) {