Skip to content

Commit 1c6d67b

Browse files
authored
Merge pull request #69 from YAPP-Github/fix/#68-detail_fix_before_release_1.0.0
[Fix/#68] 릴리즈 직전 세부 항목 수정
2 parents e01eb48 + b39747b commit 1c6d67b

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

app/src/main/java/com/threegap/bitnagil/MainNavHost.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,20 @@ fun MainNavHost(
101101
navigator.navController.navigate(Route.OnBoarding(isNew = false))
102102
},
103103
navigateToNotice = {
104+
navigator.navController.navigate(
105+
Route.WebView(
106+
title = "공지 사항",
107+
url = "https://complex-wombat-99f.notion.site/23ff4587491d80efa0a5e4baece6017b?source=copy_link",
108+
),
109+
)
104110
},
105111
navigateToQnA = {
112+
navigator.navController.navigate(
113+
Route.WebView(
114+
title = "자주 묻는 질문",
115+
url = "https://complex-wombat-99f.notion.site/23ff4587491d80659ae3ea392afbc05e?source=copy_link",
116+
),
117+
)
106118
},
107119
navigateToRegisterRoutine = { routineId ->
108120
navigator.navController.navigate(Route.WriteRoutine(routineId = routineId))

app/src/main/java/com/threegap/bitnagil/navigation/home/HomeNavHost.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fun HomeNavHost(
103103
FloatingActionItem(
104104
icon = R.drawable.ic_report,
105105
text = "제보하기",
106-
onClick = {},
106+
onClick = { GlobalBitnagilToast.showWarning("제보하기 기능은 추후 제공될 예정입니다.") },
107107
),
108108
FloatingActionItem(
109109
icon = R.drawable.ic_add_routine,

presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ private fun EmotionRecommendRoutineScreen(
148148
Column(
149149
modifier = Modifier
150150
.fillMaxSize()
151-
.background(color = BitnagilTheme.colors.coolGray99),
151+
.background(color = BitnagilTheme.colors.coolGray99)
152+
.statusBarsPadding(),
152153
) {
153154
BitnagilProgressTopBar(
154155
onBackClick = onClickPreviousButton,

0 commit comments

Comments
 (0)