Skip to content

[RELEASE/1.0]: 1.0 버전 배포 전 수정 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l5x5l merged 1 commit into from
Aug 2, 2025
Merged

[RELEASE/1.0]: 1.0 버전 배포 전 수정 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@ fun MainNavHost(
navigateToOnBoarding = {
navigator.navController.navigate(Route.OnBoarding())
},
navigateToBack = { navigator.navController.popBackStack() },
navigateToBack = {
if (navigator.navController.previousBackStackEntry != null) {
navigator.navController.popBackStack()
}
},
)
}

Expand Down Expand Up @@ -133,14 +137,20 @@ fun MainNavHost(
BitnagilWebViewScreen(
title = webViewRoute.title,
url = webViewRoute.url,
onBackClick = { navigator.navController.popBackStack() },
onBackClick = {
if (navigator.navController.previousBackStackEntry != null) {
navigator.navController.popBackStack()
}
},
)
}

composable<Route.Setting> {
SettingScreenContainer(
navigateToBack = {
navigator.navController.popBackStack()
if (navigator.navController.previousBackStackEntry != null) {
navigator.navController.popBackStack()
}
},
navigateToTermsOfService = {
navigator.navController.navigate(
Expand Down Expand Up @@ -190,7 +200,9 @@ fun MainNavHost(
}
},
navigateToBack = {
navigator.navController.popBackStack()
if (navigator.navController.previousBackStackEntry != null) {
navigator.navController.popBackStack()
}
},
)
}
Expand All @@ -210,15 +222,19 @@ fun MainNavHost(
WriteRoutineScreenContainer(
viewModel = viewModel,
navigateToBack = {
navigator.navController.popBackStack()
if (navigator.navController.previousBackStackEntry != null) {
navigator.navController.popBackStack()
}
},
)
}

composable<Route.Emotion> {
EmotionScreenContainer(
navigateToBack = {
navigator.navController.popBackStack()
if (navigator.navController.previousBackStackEntry != null) {
navigator.navController.popBackStack()
}
},
)
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ minSdk = "28"
targetSdk = "35"

## App Versioning
versionCode = "1"
versionCode = "2"
versionName = "1.0"

# Android Gradle Plugin
Expand Down
33 changes: 0 additions & 33 deletions presentation/src/main/java/com/threegap/bitnagil/presentation/setting/SettingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import com.threegap.bitnagil.designsystem.component.block.BitnagilOptionButton
import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
import com.threegap.bitnagil.presentation.common.flow.collectAsEffect
import com.threegap.bitnagil.presentation.setting.component.atom.settingtitle.SettingTitle
import com.threegap.bitnagil.presentation.setting.component.atom.toggleswitch.ToggleSwitch
import com.threegap.bitnagil.presentation.setting.component.block.ConfirmDialog
import com.threegap.bitnagil.presentation.setting.model.mvi.SettingSideEffect
import com.threegap.bitnagil.presentation.setting.model.mvi.SettingState
Expand Down Expand Up @@ -103,38 +102,6 @@ private fun SettingScreen(
) {
Spacer(modifier = Modifier.height(32.dp))

SettingTitle("알림")

Row(
modifier = Modifier
.fillMaxWidth()
.height(48.dp)
.padding(horizontal = 16.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
) {
Text("서비스 이용 알림", style = BitnagilTheme.typography.body1Regular)
ToggleSwitch(checked = state.useServiceAlarm, onCheckedChange = { toggleServiceAlarm() })
}

Row(
modifier = Modifier
.fillMaxWidth()
.height(48.dp)
.padding(horizontal = 16.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
) {
Text("푸시알림", style = BitnagilTheme.typography.body1Regular)
ToggleSwitch(checked = state.usePushAlarm, onCheckedChange = { togglePushAlarm() })
}

Spacer(modifier = Modifier.height(6.dp))

HorizontalDivider(modifier = Modifier.height(6.dp), thickness = 6.dp, color = BitnagilTheme.colors.coolGray98)

Spacer(modifier = Modifier.height(18.dp))

SettingTitle("정보")

Row(
Expand Down