From 13964a6083b2a99f093fd40b3b10a326f8d0cb1c Mon Sep 17 00:00:00 2001 From: MoonsuKang Date: Sat, 7 Jun 2025 18:09:49 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[REFACTOR/#276]=20.trim()=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=ED=95=B4=EC=84=9C=20=EC=8B=A4=EC=A0=9C=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EB=B9=84=EA=B5=90=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/writediary/screen/WriteDiaryViewModel.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryViewModel.kt b/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryViewModel.kt index 5b27cbc1..a63ee74d 100644 --- a/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryViewModel.kt +++ b/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryViewModel.kt @@ -179,7 +179,10 @@ class WriteDiaryViewModel @Inject constructor( } fun hasChangedFromInitial(): Boolean { - return entries != initialEntries + if (initialEntries.isEmpty()) return false + val current = entries.map { it.trim() } + val initial = initialEntries.map { it.trim() } + return current != initial } fun fetchDraftDiary(year: Int, month: Int, day: Int) { From b170393ea87cfcde8b74e56b0c804698b7e438d2 Mon Sep 17 00:00:00 2001 From: MoonsuKang Date: Sat, 7 Jun 2025 18:11:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[REFACTOR/#276]=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=EC=9D=B4=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EC=97=90=EB=A7=8C=20=EC=A2=85=EB=A3=8C=20?= =?UTF-8?q?=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20=EB=85=B8?= =?UTF-8?q?=EC=B6=9C,=20=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=EB=8A=94=20=ED=95=AD=EC=83=81=20=ED=8A=B8?= =?UTF-8?q?=EB=9E=98=ED=82=B9=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 --- .../presentation/ui/writediary/screen/WriteDiaryScreen.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt b/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt index 3af5e77e..7ce2e175 100644 --- a/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt +++ b/app/src/main/java/com/sopt/clody/presentation/ui/writediary/screen/WriteDiaryScreen.kt @@ -114,11 +114,11 @@ fun WriteDiaryRoute( failureMessage = failureMessage, showExitDialog = showExitDialog, onClickBack = { - if (viewModel.hasChangedFromInitial()) { - AmplitudeUtils.trackEvent(AmplitudeConstraints.WRITING_DIARY_BACK) - viewModel.updateShowExitDialog(true) - } else { + AmplitudeUtils.trackEvent(AmplitudeConstraints.WRITING_DIARY_BACK) + if (!viewModel.hasChangedFromInitial()) { navigateToPrevious() + } else { + viewModel.updateShowExitDialog(true) } }, onClickAdd = { From 7a5931bfc5a909bbd7460caa1d6f5d9e41019106 Mon Sep 17 00:00:00 2001 From: MoonsuKang Date: Sat, 7 Jun 2025 18:11:32 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[DEL/#276]=20=EC=9D=BC=EA=B8=B0=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=20=ED=8C=A8?= =?UTF-8?q?=EB=94=A9=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/bottomsheet/DeleteWriteDiaryBottomSheet.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/com/sopt/clody/presentation/ui/writediary/component/bottomsheet/DeleteWriteDiaryBottomSheet.kt b/app/src/main/java/com/sopt/clody/presentation/ui/writediary/component/bottomsheet/DeleteWriteDiaryBottomSheet.kt index 5446dbc3..0a723e1d 100644 --- a/app/src/main/java/com/sopt/clody/presentation/ui/writediary/component/bottomsheet/DeleteWriteDiaryBottomSheet.kt +++ b/app/src/main/java/com/sopt/clody/presentation/ui/writediary/component/bottomsheet/DeleteWriteDiaryBottomSheet.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Column 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.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width @@ -67,7 +66,6 @@ fun DeleteWriteDiaryBottomSheet( ) } Spacer(modifier = Modifier.navigationBarsPadding()) - Spacer(modifier = Modifier.height(60.dp)) } }, )