๐ :: (#803) ์จ๋ณด๋ฉ ๊ธฐ๋ฅ ๊ตฌํ #806
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,12 @@ | ||
| package team.aliens.dms.android.app | ||
|
|
||
| import androidx.compose.foundation.layout.systemBarsPadding | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.windowsizeclass.WindowSizeClass | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.LaunchedEffect | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.navigation3.runtime.NavKey | ||
| import androidx.navigation3.runtime.entryProvider | ||
|
|
@@ -19,59 +15,64 @@ import androidx.navigation3.ui.NavDisplay | |
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.serialization.Serializable | ||
| import team.aliens.dms.android.core.designsystem.DmsTheme | ||
| import team.aliens.dms.android.feature.onboarding.navigation.OnboardingRoute | ||
| import team.aliens.dms.android.feature.signin.navigation.SignInRoute | ||
|
|
||
| @Serializable | ||
| data object OnboardingScreenNav : NavKey | ||
|
|
||
| @Serializable | ||
| data object SignInScreenNav : NavKey | ||
|
|
||
| @Serializable | ||
| data object MainScreenNav : NavKey | ||
|
|
||
| @Composable | ||
| fun DmsApp( | ||
| windowSizeClass: WindowSizeClass, | ||
| isJwtAvailable: StateFlow<Boolean>, | ||
| mainViewModel: MainActivityViewModel, | ||
| ) { | ||
| val isOnboardingCompleted by mainViewModel.isOnboardingCompleted.collectAsState() | ||
| val isJwtAvailableState by isJwtAvailable.collectAsState() | ||
|
|
||
| val backStack = rememberNavBackStack(OnboardingScreenNav) | ||
|
|
||
| LaunchedEffect(isOnboardingCompleted, isJwtAvailableState) { | ||
| val initialScreen = when { | ||
| !isOnboardingCompleted -> OnboardingScreenNav | ||
| isJwtAvailableState -> MainScreenNav | ||
| else -> SignInScreenNav | ||
| } | ||
|
|
||
| if (backStack.lastOrNull() != initialScreen) { | ||
| backStack.clear() | ||
| backStack.add(initialScreen) | ||
| } | ||
|
Comment on lines
+41
to
+51
There was a problem hiding this comment. The navigation logic runs on every recomposition when |
||
| } | ||
|
|
||
| NavDisplay( | ||
| modifier = Modifier.systemBarsPadding(), | ||
| backStack = backStack, | ||
| onBack = { backStack.removeLastOrNull() }, | ||
| entryProvider = entryProvider { | ||
| entry<OnboardingScreenNav> { | ||
| OnboardingRoute( | ||
| navigateToSignIn = { | ||
| backStack.clear() | ||
| backStack.add(SignInScreenNav) | ||
| }, | ||
| ) | ||
| } | ||
| entry<SignInScreenNav> { | ||
| SignInRoute() | ||
| } | ||
| entry<MainScreenNav> { | ||
| Text( | ||
| text = "Main Screen (TODO)", | ||
| color = DmsTheme.colorScheme.onSurface, | ||
| ) | ||
| } | ||
| }, | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,36 @@ | ||
| package team.aliens.dms.android.app | ||
|
|
||
| import androidx.lifecycle.viewModelScope | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.flow.asStateFlow | ||
| import kotlinx.coroutines.launch | ||
| import team.aliens.dms.android.core.jwt.JwtProvider | ||
| import team.aliens.dms.android.core.ui.viewmodel.BaseViewModel | ||
| import team.aliens.dms.android.onboarding.datastore.OnboardingDataStoreDataSource | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltViewModel | ||
| class MainActivityViewModel @Inject constructor( | ||
| private val jwtProvider: JwtProvider, | ||
| private val onboardingDataSource: OnboardingDataStoreDataSource, | ||
| ) : BaseViewModel() { | ||
| val autoSignInAvailable: StateFlow<Boolean> = jwtProvider.isCachedAccessTokenAvailable | ||
|
|
||
| private val _isUpdateFailed = MutableStateFlow(false) | ||
| val isUpdateFailed = _isUpdateFailed.asStateFlow() | ||
|
|
||
| private val _isOnboardingCompleted = MutableStateFlow(false) | ||
| val isOnboardingCompleted: StateFlow<Boolean> = _isOnboardingCompleted.asStateFlow() | ||
|
|
||
| init { | ||
| viewModelScope.launch { | ||
| _isOnboardingCompleted.value = onboardingDataSource.getOnboardingCompleted() | ||
| } | ||
| } | ||
|
|
||
| fun onUpdateFailed() { | ||
| _isUpdateFailed.value = true | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hilt-navigation-compose์ข ์์ฑ์ดprodImplementation๊ณผdevImplementation์ ์ค๋ณต์ผ๋ก ์ถ๊ฐ๋์์ต๋๋ค. ์ด ์ข ์์ฑ์ด ๋ ๋น๋ ์ ํ ๋ชจ๋์ ํ์ํ๋ค๋ฉดimplementation์ผ๋ก ํ ๋ฒ๋ง ์ ์ธํ๋ ๊ฒ์ด ์ข์ต๋๋ค. ์ด๋ ๊ฒ ํ๋ฉด ์ค๋ณต์ ํผํ๊ณ Gradle ์คํฌ๋ฆฝํธ๋ฅผ ๋ ๊น๋ํ๊ฒ ์ ์งํ ์ ์์ต๋๋ค.implementation(libs.androidx.hilt.navigation.compose) add("devImplementation", libs.androidx.navigation3.runtime) add("devImplementation", libs.androidx.navigation3.ui)