Skip to content

Commit b2ce757

Browse files
committed
REFACTOR: 로그인, 마이페이지, 온보딩, 추천 루틴 화면 경로 수정
1 parent f3689fd commit b2ce757

39 files changed

Lines changed: 99 additions & 100 deletions

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import androidx.navigation.toRoute
99
import com.threegap.bitnagil.navigation.home.HomeNavHost
1010
import com.threegap.bitnagil.presentation.screen.emotion.EmotionScreenContainer
1111
import com.threegap.bitnagil.presentation.screen.guide.GuideScreenContainer
12-
import com.threegap.bitnagil.presentation.login.LoginScreenContainer
13-
import com.threegap.bitnagil.presentation.onboarding.OnBoardingScreenContainer
14-
import com.threegap.bitnagil.presentation.onboarding.OnBoardingViewModel
15-
import com.threegap.bitnagil.presentation.onboarding.model.navarg.OnBoardingScreenArg
12+
import com.threegap.bitnagil.presentation.screen.login.LoginScreenContainer
13+
import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingScreenContainer
14+
import com.threegap.bitnagil.presentation.screen.onboarding.OnBoardingViewModel
15+
import com.threegap.bitnagil.presentation.screen.onboarding.model.navarg.OnBoardingScreenArg
1616
import com.threegap.bitnagil.presentation.report.ReportScreenContainer
1717
import com.threegap.bitnagil.presentation.reportdetail.ReportDetailScreenContainer
1818
import com.threegap.bitnagil.presentation.reportdetail.ReportDetailViewModel

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import com.threegap.bitnagil.designsystem.component.atom.FloatingActionItem
3030
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
3131
import com.threegap.bitnagil.presentation.common.toast.GlobalBitnagilToast
3232
import com.threegap.bitnagil.presentation.screen.home.HomeScreenContainer
33-
import com.threegap.bitnagil.presentation.mypage.MyPageScreenContainer
34-
import com.threegap.bitnagil.presentation.recommendroutine.RecommendRoutineScreenContainer
33+
import com.threegap.bitnagil.presentation.screen.mypage.MyPageScreenContainer
34+
import com.threegap.bitnagil.presentation.screen.recommendroutine.RecommendRoutineScreenContainer
3535
import com.threegap.bitnagil.util.setStatusBarContentColor
3636

3737
@Composable

presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/contract/MyPageSideEffect.kt

Lines changed: 0 additions & 3 deletions
This file was deleted.

presentation/src/main/java/com/threegap/bitnagil/presentation/onboarding/model/navarg/OnBoardingScreenArg.kt

Lines changed: 0 additions & 6 deletions
This file was deleted.

presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginScreen.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.login
1+
package com.threegap.bitnagil.presentation.screen.login
22

33
import androidx.compose.foundation.Image
44
import androidx.compose.foundation.background
@@ -31,8 +31,8 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme
3131
import com.threegap.bitnagil.designsystem.R
3232
import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
3333
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
34-
import com.threegap.bitnagil.presentation.login.contract.LoginSideEffect
35-
import com.threegap.bitnagil.presentation.login.kakao.KakaoLoginHandlerImpl
34+
import com.threegap.bitnagil.presentation.screen.login.contract.LoginSideEffect
35+
import com.threegap.bitnagil.presentation.screen.login.kakao.KakaoLoginHandlerImpl
3636
import org.orbitmvi.orbit.compose.collectSideEffect
3737

3838
@Composable

presentation/src/main/java/com/threegap/bitnagil/presentation/login/LoginViewModel.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/LoginViewModel.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.threegap.bitnagil.presentation.login
1+
package com.threegap.bitnagil.presentation.screen.login
22

33
import android.util.Log
44
import androidx.lifecycle.ViewModel
55
import com.kakao.sdk.auth.model.OAuthToken
66
import com.threegap.bitnagil.domain.auth.model.UserRole
77
import com.threegap.bitnagil.domain.auth.usecase.LoginUseCase
8-
import com.threegap.bitnagil.presentation.login.contract.LoginSideEffect
9-
import com.threegap.bitnagil.presentation.login.contract.LoginState
8+
import com.threegap.bitnagil.presentation.screen.login.contract.LoginSideEffect
9+
import com.threegap.bitnagil.presentation.screen.login.contract.LoginState
1010
import dagger.hilt.android.lifecycle.HiltViewModel
1111
import org.orbitmvi.orbit.Container
1212
import org.orbitmvi.orbit.ContainerHost
@@ -18,7 +18,7 @@ class LoginViewModel @Inject constructor(
1818
private val loginUseCase: LoginUseCase,
1919
) : ContainerHost<LoginState, LoginSideEffect>, ViewModel() {
2020

21-
override val container: Container<LoginState, LoginSideEffect> = container(initialState = LoginState.INIT)
21+
override val container: Container<LoginState, LoginSideEffect> = container(initialState = LoginState.Companion.INIT)
2222

2323
fun kakaoLogin(token: OAuthToken?, error: Throwable?) {
2424
intent {

presentation/src/main/java/com/threegap/bitnagil/presentation/login/contract/LoginSideEffect.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/contract/LoginSideEffect.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.login.contract
1+
package com.threegap.bitnagil.presentation.screen.login.contract
22

33
sealed interface LoginSideEffect {
44
data object NavigateToHome : LoginSideEffect

presentation/src/main/java/com/threegap/bitnagil/presentation/login/contract/LoginState.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/contract/LoginState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.login.contract
1+
package com.threegap.bitnagil.presentation.screen.login.contract
22

33
data class LoginState(
44
val isLoading: Boolean,

presentation/src/main/java/com/threegap/bitnagil/presentation/login/kakao/KakaoLoginHandler.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/kakao/KakaoLoginHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.login.kakao
1+
package com.threegap.bitnagil.presentation.screen.login.kakao
22

33
import android.content.Context
44
import com.kakao.sdk.auth.model.OAuthToken

presentation/src/main/java/com/threegap/bitnagil/presentation/login/kakao/KakaoLoginHandlerImpl.kt renamed to presentation/src/main/java/com/threegap/bitnagil/presentation/screen/login/kakao/KakaoLoginHandlerImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.threegap.bitnagil.presentation.login.kakao
1+
package com.threegap.bitnagil.presentation.screen.login.kakao
22

33
import android.content.Context
44
import com.kakao.sdk.auth.model.OAuthToken

0 commit comments

Comments
 (0)