Skip to content

Commit

Permalink
Merge pull request #131 from Nexters/fix/chore-detail
Browse files Browse the repository at this point in the history
[FIX] Login 화면 Loading Indicator 위치 조정
  • Loading branch information
easyhooon authored Apr 5, 2024
2 parents 5a93ffa + 0ddf3fe commit 17691a9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ internal object ApplicationConfig {
const val MinSdk = 26
const val TargetSdk = 34
const val CompileSdk = 34
const val VersionCode = 8
const val VersionName = "1.0.7"
const val VersionCode = 9
const val VersionName = "1.0.8"
val JavaVersion = org.gradle.api.JavaVersion.VERSION_17
const val JavaVersionAsInt = 17
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import com.nexters.ilab.feature.createimage.viewmodel.CreateImageViewModel

const val IMAGE_URL = "image_url"
const val STYLE_ID = "style_id"
const val CREATE_IMAGE_ROUTE = "create_image_route/{$IMAGE_URL}/{$STYLE_ID}"
const val CREATE_ROUTE = "create_route"
const val CREATE_ROUTE = "create_route/{$IMAGE_URL}/{$STYLE_ID}"
const val CREATE_IMAGE_ROUTE = "create_image_route"
const val CREATE_IMAGE_COMPLETE_ROUTE = "create_image_complete_route"

fun NavController.navigateToCreateImage(
imageUrl: String,
styleId: Int,
) {
navigate("create_image_route/$imageUrl/$styleId")
navigate("create_route/$imageUrl/$styleId")
}

fun NavController.navigateToCreateImageComplete() {
Expand All @@ -35,8 +35,8 @@ fun NavGraphBuilder.createImageNavGraph(
onNavigateToCreateImageComplete: () -> Unit,
) {
navigation(
startDestination = CREATE_ROUTE,
route = CREATE_IMAGE_ROUTE,
startDestination = CREATE_IMAGE_ROUTE,
route = CREATE_ROUTE,
arguments = listOf(
navArgument(IMAGE_URL) {
type = NavType.StringType
Expand All @@ -46,7 +46,7 @@ fun NavGraphBuilder.createImageNavGraph(
},
),
) {
composable(route = CREATE_ROUTE) { entry ->
composable(route = CREATE_IMAGE_ROUTE) { entry ->
val viewModel = entry.sharedViewModel<CreateImageViewModel>(navController)
CreateImageRoute(
onCloseClick = onCloseClick,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ internal fun LoginScreen(
onLoginClick = onLoginClick,
)
if (uiState.isLoading) {
LoadingIndicator()
LoadingIndicator(modifier = Modifier.align(Alignment.Center))
}
}
}
Expand Down

0 comments on commit 17691a9

Please sign in to comment.