REFACTOR: 설정, 스플래시, 약관, 웹뷰, 탈퇴 화면 경로 수정

l5x5l · l5x5l · commit 6a8f37ae091d · 2026-02-25T22:17:11.000+09:00
diff --git a/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt b/app/src/main/java/com/threegap/bitnagil/MainNavHost.kt
@@ -19,11 +19,11 @@ import com.threegap.bitnagil.presentation.screen.reportdetail.ReportDetailViewMo
 import com.threegap.bitnagil.presentation.screen.reportdetail.model.navarg.ReportDetailScreenArg
 import com.threegap.bitnagil.presentation.screen.reporthistory.ReportHistoryScreenContainer
 import com.threegap.bitnagil.presentation.screen.routinelist.RoutineListScreenContainer
-import com.threegap.bitnagil.presentation.setting.SettingScreenContainer
-import com.threegap.bitnagil.presentation.splash.SplashScreenContainer
-import com.threegap.bitnagil.presentation.terms.TermsAgreementScreenContainer
-import com.threegap.bitnagil.presentation.webview.BitnagilWebViewScreen
-import com.threegap.bitnagil.presentation.withdrawal.WithdrawalScreenContainer
+import com.threegap.bitnagil.presentation.screen.setting.SettingScreenContainer
+import com.threegap.bitnagil.presentation.screen.splash.SplashScreenContainer
+import com.threegap.bitnagil.presentation.screen.terms.TermsAgreementScreenContainer
+import com.threegap.bitnagil.presentation.screen.webview.BitnagilWebViewScreen
+import com.threegap.bitnagil.presentation.screen.withdrawal.WithdrawalScreenContainer
 import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineScreenContainer
 import com.threegap.bitnagil.presentation.screen.routinewrite.WriteRoutineViewModel
 import com.threegap.bitnagil.presentation.screen.routinewrite.model.navarg.WriteRoutineScreenArg
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingScreen.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.setting
+package com.threegap.bitnagil.presentation.screen.setting
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.background
@@ -32,9 +32,9 @@ import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
 import com.threegap.bitnagil.presentation.common.playstore.UpdateAvailableState
 import com.threegap.bitnagil.presentation.common.playstore.openAppInPlayStore
 import com.threegap.bitnagil.presentation.common.playstore.updateAvailable
-import com.threegap.bitnagil.presentation.setting.component.atom.settingtitle.SettingTitle
-import com.threegap.bitnagil.presentation.setting.contract.SettingSideEffect
-import com.threegap.bitnagil.presentation.setting.contract.SettingState
+import com.threegap.bitnagil.presentation.screen.setting.component.atom.settingtitle.SettingTitle
+import com.threegap.bitnagil.presentation.screen.setting.contract.SettingSideEffect
+import com.threegap.bitnagil.presentation.screen.setting.contract.SettingState
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/SettingViewModel.kt
@@ -1,12 +1,12 @@
-package com.threegap.bitnagil.presentation.setting
+package com.threegap.bitnagil.presentation.screen.setting
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.threegap.bitnagil.domain.auth.usecase.LogoutUseCase
 import com.threegap.bitnagil.presentation.common.version.VersionNameProvider
-import com.threegap.bitnagil.presentation.setting.contract.SettingSideEffect
-import com.threegap.bitnagil.presentation.setting.contract.SettingState
+import com.threegap.bitnagil.presentation.screen.setting.contract.SettingSideEffect
+import com.threegap.bitnagil.presentation.screen.setting.contract.SettingState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/settingtitle/SettingTitle.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/settingtitle/SettingTitle.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.setting.component.atom.settingtitle
+package com.threegap.bitnagil.presentation.screen.setting.component.atom.settingtitle
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/Preview.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/Preview.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.setting.component.atom.toggleswitch
+package com.threegap.bitnagil.presentation.screen.setting.component.atom.toggleswitch
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/ToggleSwitch.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/component/atom/toggleswitch/ToggleSwitch.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.setting.component.atom.toggleswitch
+package com.threegap.bitnagil.presentation.screen.setting.component.atom.toggleswitch
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateDpAsState
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingSideEffect.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.setting.contract
+package com.threegap.bitnagil.presentation.screen.setting.contract
 
 sealed interface SettingSideEffect {
     data object NavigateToLogin : SettingSideEffect
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/setting/contract/SettingState.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.setting.contract
+package com.threegap.bitnagil.presentation.screen.setting.contract
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashScreen.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.splash
+package com.threegap.bitnagil.presentation.screen.splash
 
 import androidx.activity.ComponentActivity
 import androidx.compose.animation.core.tween
@@ -23,9 +23,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.threegap.bitnagil.designsystem.R
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
 import com.threegap.bitnagil.presentation.common.playstore.openAppInPlayStore
-import com.threegap.bitnagil.presentation.splash.component.template.BitnagilLottieAnimation
-import com.threegap.bitnagil.presentation.splash.component.template.ForceUpdateDialog
-import com.threegap.bitnagil.presentation.splash.contract.SplashSideEffect
+import com.threegap.bitnagil.presentation.screen.splash.component.template.BitnagilLottieAnimation
+import com.threegap.bitnagil.presentation.screen.splash.component.template.ForceUpdateDialog
+import com.threegap.bitnagil.presentation.screen.splash.contract.SplashSideEffect
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 import kotlin.system.exitProcess
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/SplashViewModel.kt
@@ -1,12 +1,12 @@
-package com.threegap.bitnagil.presentation.splash
+package com.threegap.bitnagil.presentation.screen.splash
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.threegap.bitnagil.domain.auth.model.UserRole
 import com.threegap.bitnagil.domain.auth.usecase.AutoLoginUseCase
 import com.threegap.bitnagil.domain.version.usecase.CheckUpdateRequirementUseCase
-import com.threegap.bitnagil.presentation.splash.contract.SplashSideEffect
-import com.threegap.bitnagil.presentation.splash.contract.SplashState
+import com.threegap.bitnagil.presentation.screen.splash.contract.SplashSideEffect
+import com.threegap.bitnagil.presentation.screen.splash.contract.SplashState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/BitnagilLottieAnimation.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/BitnagilLottieAnimation.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.splash.component.template
+package com.threegap.bitnagil.presentation.screen.splash.component.template
 
 import androidx.annotation.RawRes
 import androidx.compose.animation.core.FastOutSlowInEasing
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/ForceUpdateDialog.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/component/template/ForceUpdateDialog.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.splash.component.template
+package com.threegap.bitnagil.presentation.screen.splash.component.template
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashSideEffect.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.splash.contract
+package com.threegap.bitnagil.presentation.screen.splash.contract
 
 sealed interface SplashSideEffect {
     data object NavigateToLogin : SplashSideEffect
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/splash/contract/SplashState.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.splash.contract
+package com.threegap.bitnagil.presentation.screen.splash.contract
 
 import com.threegap.bitnagil.domain.auth.model.UserRole
 
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementScreen.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.terms
+package com.threegap.bitnagil.presentation.screen.terms
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -17,10 +17,10 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton
 import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
-import com.threegap.bitnagil.presentation.terms.component.TermsAgreementItem
-import com.threegap.bitnagil.presentation.terms.component.ToggleAllAgreementsItem
-import com.threegap.bitnagil.presentation.terms.contract.TermsAgreementSideEffect
-import com.threegap.bitnagil.presentation.terms.contract.TermsAgreementState
+import com.threegap.bitnagil.presentation.screen.terms.component.TermsAgreementItem
+import com.threegap.bitnagil.presentation.screen.terms.component.ToggleAllAgreementsItem
+import com.threegap.bitnagil.presentation.screen.terms.contract.TermsAgreementSideEffect
+import com.threegap.bitnagil.presentation.screen.terms.contract.TermsAgreementState
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/TermsAgreementViewModel.kt
@@ -1,11 +1,11 @@
-package com.threegap.bitnagil.presentation.terms
+package com.threegap.bitnagil.presentation.screen.terms
 
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import com.threegap.bitnagil.domain.auth.model.TermsAgreement
 import com.threegap.bitnagil.domain.auth.usecase.SubmitTermsAgreementUseCase
-import com.threegap.bitnagil.presentation.terms.contract.TermsAgreementSideEffect
-import com.threegap.bitnagil.presentation.terms.contract.TermsAgreementState
+import com.threegap.bitnagil.presentation.screen.terms.contract.TermsAgreementSideEffect
+import com.threegap.bitnagil.presentation.screen.terms.contract.TermsAgreementState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.orbitmvi.orbit.Container
 import org.orbitmvi.orbit.ContainerHost
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/TermsAgreementItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/TermsAgreementItem.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.terms.component
+package com.threegap.bitnagil.presentation.screen.terms.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/ToggleAllAgreementsItem.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/component/ToggleAllAgreementsItem.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.terms.component
+package com.threegap.bitnagil.presentation.screen.terms.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementSideEffect.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.terms.contract
+package com.threegap.bitnagil.presentation.screen.terms.contract
 
 sealed interface TermsAgreementSideEffect {
     data object NavigateToTermsOfService : TermsAgreementSideEffect
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/terms/contract/TermsAgreementState.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.terms.contract
+package com.threegap.bitnagil.presentation.screen.terms.contract
 
 data class TermsAgreementState(
     val isLoading: Boolean,
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/webview/BitnagilWebViewScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/webview/BitnagilWebViewScreen.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.webview
+package com.threegap.bitnagil.presentation.screen.webview
 
 import android.view.ViewGroup
 import android.webkit.WebResourceRequest
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalScreen.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalScreen.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.withdrawal
+package com.threegap.bitnagil.presentation.screen.withdrawal
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -39,10 +39,10 @@ import com.threegap.bitnagil.designsystem.component.atom.BitnagilSelectButtonCol
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilTextButton
 import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
 import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
-import com.threegap.bitnagil.presentation.withdrawal.component.WithdrawalConfirmDialog
-import com.threegap.bitnagil.presentation.withdrawal.contract.WithdrawalSideEffect
-import com.threegap.bitnagil.presentation.withdrawal.contract.WithdrawalState
-import com.threegap.bitnagil.presentation.withdrawal.model.WithdrawalReason
+import com.threegap.bitnagil.presentation.screen.withdrawal.component.WithdrawalConfirmDialog
+import com.threegap.bitnagil.presentation.screen.withdrawal.contract.WithdrawalSideEffect
+import com.threegap.bitnagil.presentation.screen.withdrawal.contract.WithdrawalState
+import com.threegap.bitnagil.presentation.screen.withdrawal.model.WithdrawalReason
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
@@ -223,7 +223,7 @@ private fun WithdrawalScreen(
 @Composable
 private fun WithdrawalScreenPreview() {
     WithdrawalScreen(
-        uiState = WithdrawalState.INIT,
+        uiState = WithdrawalState.Companion.INIT,
         onTermsToggle = {},
         onReasonSelect = {},
         onCustomReasonChanged = {},
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalViewModel.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/WithdrawalViewModel.kt
@@ -1,10 +1,10 @@
-package com.threegap.bitnagil.presentation.withdrawal
+package com.threegap.bitnagil.presentation.screen.withdrawal
 
 import androidx.lifecycle.ViewModel
 import com.threegap.bitnagil.domain.auth.usecase.WithdrawalUseCase
-import com.threegap.bitnagil.presentation.withdrawal.contract.WithdrawalSideEffect
-import com.threegap.bitnagil.presentation.withdrawal.contract.WithdrawalState
-import com.threegap.bitnagil.presentation.withdrawal.model.WithdrawalReason
+import com.threegap.bitnagil.presentation.screen.withdrawal.contract.WithdrawalSideEffect
+import com.threegap.bitnagil.presentation.screen.withdrawal.contract.WithdrawalState
+import com.threegap.bitnagil.presentation.screen.withdrawal.model.WithdrawalReason
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.orbitmvi.orbit.Container
 import org.orbitmvi.orbit.ContainerHost
@@ -16,7 +16,7 @@ class WithdrawalViewModel @Inject constructor(
     private val withdrawalUseCase: WithdrawalUseCase,
 ) : ContainerHost<WithdrawalState, WithdrawalSideEffect>, ViewModel() {
 
-    override val container: Container<WithdrawalState, WithdrawalSideEffect> = container(initialState = WithdrawalState.INIT)
+    override val container: Container<WithdrawalState, WithdrawalSideEffect> = container(initialState = WithdrawalState.Companion.INIT)
 
     fun onTermsToggle() {
         intent {
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/component/WithdrawalConfirmDialog.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/component/WithdrawalConfirmDialog.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.withdrawal.component
+package com.threegap.bitnagil.presentation.screen.withdrawal.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalSideEffect.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalSideEffect.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.withdrawal.contract
+package com.threegap.bitnagil.presentation.screen.withdrawal.contract
 
 sealed interface WithdrawalSideEffect {
     data object NavigateToBack : WithdrawalSideEffect
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalState.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/contract/WithdrawalState.kt
@@ -1,6 +1,6 @@
-package com.threegap.bitnagil.presentation.withdrawal.contract
+package com.threegap.bitnagil.presentation.screen.withdrawal.contract
 
-import com.threegap.bitnagil.presentation.withdrawal.model.WithdrawalReason
+import com.threegap.bitnagil.presentation.screen.withdrawal.model.WithdrawalReason
 
 data class WithdrawalState(
     val isLoading: Boolean,
diff --git a/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/model/WithdrawalReason.kt b/presentation/src/main/java/com/threegap/bitnagil/presentation/screen/withdrawal/model/WithdrawalReason.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.presentation.withdrawal.model
+package com.threegap.bitnagil.presentation.screen.withdrawal.model
 
 enum class WithdrawalReason(
     val displayText: String,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.threegap.bitnagil.presentation.setting.component.atom.settingtitle`
	`1`	`+package com.threegap.bitnagil.presentation.screen.setting.component.atom.settingtitle`
`2`	`2`
`3`	`3`	`import androidx.compose.foundation.layout.fillMaxWidth`
`4`	`4`	`import androidx.compose.foundation.layout.padding`