diff --git a/README.md b/README.md index 2ccd503..eb4647c 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,18 @@ I'lab(아이랩) - 내 취향대로 만드는 AI 프로필 사진 [PlayStore](ht ## Features +|홈 화면 1|홈 화면 2|사진 가이드 화면| +|:-----:|:-----:|:-----:| +||| + +|스타일 입력 화면|이미지 생성 화면|이미지 생성 완료 화면| +|:-----:|:-----:|:-----:| +||| + +|마이 페이지 화면|마이 앨범 화면|설정 화면| +|:-----:|:-----:|:-----:| +||| + ## Development ### Required @@ -112,3 +124,6 @@ Based on [Now in Android](https://github.com/android/nowinandroid) with Clean Ar ```
+## Issue +- [ ] proguard 활성화시 compose-navigation 관련 함수들을 인식할 수 없는 문제 + 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 } 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, 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)) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a4cc5c6..b844014 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ androidx-navigation = "2.7.7" androidx-datastore = "1.0.0" androidx-activity-compose = "1.8.2" androidx-compose-compiler = "1.5.10" -androidx-compose-bom = "2024.03.00" +androidx-compose-bom = "2024.04.00" androidx-compose-material3 = "1.2.1" androidx-hilt-navigation-compose = "1.2.0" @@ -42,7 +42,7 @@ ksp = "1.9.22-1.0.18" orbit-core = "4.6.1" kotest = "5.8.1" kakao-core = "2.20.1" -compose-extensions = "1.6.4" +compose-extensions = "1.6.5" accompanist-webview = "0.34.0" compose-stable-marker = "1.0.3" compose-investigator = "1.5.11-0.2.1"