From 8915769f7d0ebdbd20cc5b3a8e2c9622c1824ae0 Mon Sep 17 00:00:00 2001
From: boiledegg <tjrwns2163@naver.com>
Date: Wed, 2 Oct 2024 14:38:33 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[UI/#273]=20=EC=88=98=EC=A0=95=20=ED=86=A0?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/terning/feature/dialog/detail/ScrapDialog.kt  | 2 ++
 feature/src/main/res/values/strings.xml                         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt b/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt
index fbca9cf3..b78c326a 100644
--- a/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt
+++ b/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -89,6 +90,7 @@ fun ScrapDialog(
                     is ScrapDialogSideEffect.PatchedScrap -> {
                         onClickChangeColor()
                         onDismissRequest(false)
+                        context.toast(R.string.dialog_content_calendar_color_change_complete)
                     }
 
                     is ScrapDialogSideEffect.NavigateToDetail -> onClickNavigateButton(
diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml
index 61a377ab..9f037461 100644
--- a/feature/src/main/res/values/strings.xml
+++ b/feature/src/main/res/values/strings.xml
@@ -60,7 +60,7 @@
     <string name="dialog_content_scrap_sub_title">공고를 캘린더에 스크랩하시겠어요?</string>
     <string name="dialog_content_color_button">스크랩 색상</string>
     <string name="dialog_content_calendar_color_change">색상 변경하기</string>
-    <string name="dialog_content_calendar_color_change_complete">색상 변경완료</string>
+    <string name="dialog_content_calendar_color_change_complete">스크랩 색상이 변경되었어요!</string>
     <string name="dialog_scrap_button">내 캘린더에 스크랩하기</string>
     <string name="dialog_content_scrap_cancel_main_title">관심 공고가 캘린더에서 사라져요!</string>
     <string name="dialog_content_scrap_cancel_sub_title">스크랩을 취소하시겠어요?</string>

From 0fc63e5be1d272b7f3f859fd456526b2461d48b1 Mon Sep 17 00:00:00 2001
From: boiledegg <tjrwns2163@naver.com>
Date: Wed, 2 Oct 2024 14:39:12 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[DEL/#273]=20=EB=9D=BC=EC=9D=B4=EB=B8=8C?=
 =?UTF-8?q?=EB=9F=AC=EB=A6=AC=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/terning/feature/dialog/detail/ScrapDialog.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt b/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt
index b78c326a..5ae677c6 100644
--- a/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt
+++ b/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt
@@ -30,7 +30,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle

From 54d26e092785fe03d7549d60e892826613f6a884 Mon Sep 17 00:00:00 2001
From: boiledegg <tjrwns2163@naver.com>
Date: Sat, 5 Oct 2024 00:19:59 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[FIX/#278]=20=EC=83=89=EC=83=81=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../calendar/component/CalendarDay.kt         | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/feature/src/main/java/com/terning/feature/calendar/calendar/component/CalendarDay.kt b/feature/src/main/java/com/terning/feature/calendar/calendar/component/CalendarDay.kt
index 97af1138..297e42fa 100644
--- a/feature/src/main/java/com/terning/feature/calendar/calendar/component/CalendarDay.kt
+++ b/feature/src/main/java/com/terning/feature/calendar/calendar/component/CalendarDay.kt
@@ -32,16 +32,19 @@ fun CalendarDay(
     onDateSelected: (LocalDate) -> Unit = {}
 ) {
     val backgroundColor =
-        if (isSelected) TerningMain else if (isToday) Grey200 else Color.Transparent
+        if (isSelected)
+            TerningMain
+        else if (isToday) Grey150
+        else Color.Transparent
+
     val textColor =
-        if (dayData.isOutDate) {
-            Grey150
-        } else {
-            if (isSelected)
-                White
-            else
-                Black
-        }
+        if (dayData.isOutDate)
+            Grey200
+        else if (isSelected)
+            White
+        else
+            Black
+
 
     Box(
         modifier = modifier,