Skip to content

Commit 17691a9

Browse files
authored
Merge pull request #131 from Nexters/fix/chore-detail
[FIX] Login 화면 Loading Indicator 위치 조정
2 parents 5a93ffa + 0ddf3fe commit 17691a9

File tree

3 files changed

+9
-9
lines changed
  • build-logic/src/main/kotlin/com/nexters/ilab/android
  • feature

3 files changed

+9
-9
lines changed

build-logic/src/main/kotlin/com/nexters/ilab/android/Config.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ internal object ApplicationConfig {
44
const val MinSdk = 26
55
const val TargetSdk = 34
66
const val CompileSdk = 34
7-
const val VersionCode = 8
8-
const val VersionName = "1.0.7"
7+
const val VersionCode = 9
8+
const val VersionName = "1.0.8"
99
val JavaVersion = org.gradle.api.JavaVersion.VERSION_17
1010
const val JavaVersionAsInt = 17
1111
}

feature/createimage/src/main/kotlin/com/nexters/ilab/feature/createimage/navigation/CreateImageNavigation.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ import com.nexters.ilab.feature.createimage.viewmodel.CreateImageViewModel
1414

1515
const val IMAGE_URL = "image_url"
1616
const val STYLE_ID = "style_id"
17-
const val CREATE_IMAGE_ROUTE = "create_image_route/{$IMAGE_URL}/{$STYLE_ID}"
18-
const val CREATE_ROUTE = "create_route"
17+
const val CREATE_ROUTE = "create_route/{$IMAGE_URL}/{$STYLE_ID}"
18+
const val CREATE_IMAGE_ROUTE = "create_image_route"
1919
const val CREATE_IMAGE_COMPLETE_ROUTE = "create_image_complete_route"
2020

2121
fun NavController.navigateToCreateImage(
2222
imageUrl: String,
2323
styleId: Int,
2424
) {
25-
navigate("create_image_route/$imageUrl/$styleId")
25+
navigate("create_route/$imageUrl/$styleId")
2626
}
2727

2828
fun NavController.navigateToCreateImageComplete() {
@@ -35,8 +35,8 @@ fun NavGraphBuilder.createImageNavGraph(
3535
onNavigateToCreateImageComplete: () -> Unit,
3636
) {
3737
navigation(
38-
startDestination = CREATE_ROUTE,
39-
route = CREATE_IMAGE_ROUTE,
38+
startDestination = CREATE_IMAGE_ROUTE,
39+
route = CREATE_ROUTE,
4040
arguments = listOf(
4141
navArgument(IMAGE_URL) {
4242
type = NavType.StringType
@@ -46,7 +46,7 @@ fun NavGraphBuilder.createImageNavGraph(
4646
},
4747
),
4848
) {
49-
composable(route = CREATE_ROUTE) { entry ->
49+
composable(route = CREATE_IMAGE_ROUTE) { entry ->
5050
val viewModel = entry.sharedViewModel<CreateImageViewModel>(navController)
5151
CreateImageRoute(
5252
onCloseClick = onCloseClick,

feature/login/src/main/kotlin/com/nexters/ilab/android/feature/login/LoginScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ internal fun LoginScreen(
152152
onLoginClick = onLoginClick,
153153
)
154154
if (uiState.isLoading) {
155-
LoadingIndicator()
155+
LoadingIndicator(modifier = Modifier.align(Alignment.Center))
156156
}
157157
}
158158
}

0 commit comments

Comments
 (0)