From 0bb4d45a2b7d87ae769894cbfb870fc9bbc09712 Mon Sep 17 00:00:00 2001
From: yunsehwan <sh10302@naver.com>
Date: Thu, 31 Jul 2025 22:56:39 +0900
Subject: [PATCH 1/2] =?UTF-8?q?FIX:=20=EC=98=A8=EB=B3=B4=EB=94=A9=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=9D=B4=ED=9B=84=20=EC=B6=94=EC=B2=9C=20?=
 =?UTF-8?q?=EB=A3=A8=ED=8B=B4=20=ED=99=94=EB=A9=B4=EC=97=90=20=EC=83=81?=
 =?UTF-8?q?=EB=8B=A8=20status=20bar=20=ED=8C=A8=EB=94=A9=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9,=20=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20=EB=B0=8F?=
 =?UTF-8?q?=20=EC=9E=90=EC=A3=BC=20=EB=AC=BB=EB=8A=94=20=EC=A7=88=EB=AC=B8?=
 =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20=EC=97=B0=EA=B2=B0,=20fab=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC-=EC=A0=9C=EB=B3=B4=ED=95=98=EA=B8=B0=20=ED=81=B4?=
 =?UTF-8?q?=EB=A6=AD=EC=8B=9C=20=EC=A4=80=EB=B9=84=EC=A4=91=20=ED=86=A0?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=A9=94=EC=84=B8=EC=A7=80=20=EC=B6=9C?=
 =?UTF-8?q?=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/threegap/bitnagil/MainNavHost.kt   | 12 ++++++++++++
 .../threegap/bitnagil/navigation/home/HomeNavHost.kt |  2 +-
 .../bitnagil/presentation/emotion/EmotionScreen.kt   |  3 ++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
index f997a6c4..f3e3d717 100644
--- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
+++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
@@ -101,8 +101,20 @@ fun MainNavHost(
                     navigator.navController.navigate(Route.OnBoarding(isNew = false))
                 },
                 navigateToNotice = {
+                    navigator.navController.navigate(
+                        Route.WebView(
+                            title = "공지 사항",
+                            url = "https://complex-wombat-99f.notion.site/23ff4587491d80efa0a5e4baece6017b?source=copy_link",
+                        )
+                    )
                 },
                 navigateToQnA = {
+                    navigator.navController.navigate(
+                        Route.WebView(
+                            title = "자주 묻는 질문",
+                            url = "https://complex-wombat-99f.notion.site/23ff4587491d80659ae3ea392afbc05e?source=copy_link",
+                        )
+                    )
                 },
                 navigateToRegisterRoutine = { routineId ->
                     navigator.navController.navigate(Route.WriteRoutine(routineId = routineId))
diff --git a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt
index 0df174f2..68f4adca 100644
--- a/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt
+++ b/app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt
@@ -103,7 +103,7 @@ fun HomeNavHost(
                     FloatingActionItem(
                         icon = R.drawable.ic_report,
                         text = "제보하기",
-                        onClick = {},
+                        onClick = { GlobalBitnagilToast.showWarning("제보하기 기능은 추후 제공될 예정입니다.") },
                     ),
                     FloatingActionItem(
                         icon = R.drawable.ic_add_routine,
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt
index b29ae409..48eaf1c4 100644
--- a/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt
+++ b/presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt
@@ -148,7 +148,8 @@ private fun EmotionRecommendRoutineScreen(
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(color = BitnagilTheme.colors.coolGray99),
+            .background(color = BitnagilTheme.colors.coolGray99)
+            .statusBarsPadding(),
     ) {
         BitnagilProgressTopBar(
             onBackClick = onClickPreviousButton,

From b39747be6ec91a2cebec776c97594100b01a5e0c Mon Sep 17 00:00:00 2001
From: yunsehwan <sh10302@naver.com>
Date: Thu, 31 Jul 2025 22:58:14 +0900
Subject: [PATCH 2/2] =?UTF-8?q?CHORE:=20ktlint=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/threegap/bitnagil/MainNavHost.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
index f3e3d717..bc43017c 100644
--- a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
+++ b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
@@ -105,7 +105,7 @@ fun MainNavHost(
                         Route.WebView(
                             title = "공지 사항",
                             url = "https://complex-wombat-99f.notion.site/23ff4587491d80efa0a5e4baece6017b?source=copy_link",
-                        )
+                        ),
                     )
                 },
                 navigateToQnA = {
@@ -113,7 +113,7 @@ fun MainNavHost(
                         Route.WebView(
                             title = "자주 묻는 질문",
                             url = "https://complex-wombat-99f.notion.site/23ff4587491d80659ae3ea392afbc05e?source=copy_link",
-                        )
+                        ),
                     )
                 },
                 navigateToRegisterRoutine = { routineId ->