From f06c5e97fd4741deec74f7a501d25ed886da2e3f Mon Sep 17 00:00:00 2001 From: JI HUN LEE <51016231+easyhooon@users.noreply.github.com> Date: Sat, 6 Apr 2024 03:56:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[CHORE]=20Create=20Image=20=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20Route=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CreateImage Navigation 의 route 를 create_route 로, CreateImageScreen 의 route 를 create_image_route 로 변경 --- .../createimage/navigation/CreateImageNavigation.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/feature/createimage/src/main/kotlin/com/nexters/ilab/feature/createimage/navigation/CreateImageNavigation.kt b/feature/createimage/src/main/kotlin/com/nexters/ilab/feature/createimage/navigation/CreateImageNavigation.kt index 1f06806..8443fdb 100644 --- a/feature/createimage/src/main/kotlin/com/nexters/ilab/feature/createimage/navigation/CreateImageNavigation.kt +++ b/feature/createimage/src/main/kotlin/com/nexters/ilab/feature/createimage/navigation/CreateImageNavigation.kt @@ -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() { @@ -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 @@ -46,7 +46,7 @@ fun NavGraphBuilder.createImageNavGraph( }, ), ) { - composable(route = CREATE_ROUTE) { entry -> + composable(route = CREATE_IMAGE_ROUTE) { entry -> val viewModel = entry.sharedViewModel(navController) CreateImageRoute( onCloseClick = onCloseClick, From 89f1653e714b07c0361f0d17398823b5e509fa5a Mon Sep 17 00:00:00 2001 From: JI HUN LEE <51016231+easyhooon@users.noreply.github.com> Date: Sat, 6 Apr 2024 04:02:18 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20Loading=20Indicator=20=EC=9C=84=EC=B9=98?= =?UTF-8?q?=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Loading Indicator 가 안보이던게 아니라, 왼쪽 상단에 위치해 있던거였음... --- .../com/nexters/ilab/android/feature/login/LoginScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/login/src/main/kotlin/com/nexters/ilab/android/feature/login/LoginScreen.kt b/feature/login/src/main/kotlin/com/nexters/ilab/android/feature/login/LoginScreen.kt index edc1c62..f35dbbf 100644 --- a/feature/login/src/main/kotlin/com/nexters/ilab/android/feature/login/LoginScreen.kt +++ b/feature/login/src/main/kotlin/com/nexters/ilab/android/feature/login/LoginScreen.kt @@ -152,7 +152,7 @@ internal fun LoginScreen( onLoginClick = onLoginClick, ) if (uiState.isLoading) { - LoadingIndicator() + LoadingIndicator(modifier = Modifier.align(Alignment.Center)) } } } From 0ddf3fee33340b5f19b2e0115fcd54eb70f42fd7 Mon Sep 17 00:00:00 2001 From: JI HUN LEE <51016231+easyhooon@users.noreply.github.com> Date: Sat, 6 Apr 2024 04:11:05 +0900 Subject: [PATCH 3/3] [CHORE] app version up --- .../src/main/kotlin/com/nexters/ilab/android/Config.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-logic/src/main/kotlin/com/nexters/ilab/android/Config.kt b/build-logic/src/main/kotlin/com/nexters/ilab/android/Config.kt index 79c2f8e..c05179d 100644 --- a/build-logic/src/main/kotlin/com/nexters/ilab/android/Config.kt +++ b/build-logic/src/main/kotlin/com/nexters/ilab/android/Config.kt @@ -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 }