From 68ab68a2e5b32e3e9efd2d0e23afd34240cf808c Mon Sep 17 00:00:00 2001 From: "HyunWoo Lee (Nunu Lee)" <54518925+l2hyunwoo@users.noreply.github.com> Date: Fri, 11 Aug 2023 17:32:31 +0900 Subject: [PATCH] Version Bump and fix build error (#297) - Compile/Target SDK: 33 -> 34 - androidx navigation: 2.6.0 -> 2.7.0 - compose compiler: 1.5.0 -> 1.5.1 - compose bom: 06.01 -> 08.00 - compose destination: 1.9.42-beta -> 1.9.52 --- .../feature/mission/detail/component/ImageContent.kt | 3 ++- .../stamp/feature/onboarding/OnboardingScreen.kt | 5 ++--- gradle/libs.versions.toml | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/mission/detail/component/ImageContent.kt b/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/mission/detail/component/ImageContent.kt index 9f5417743..cd8b79126 100644 --- a/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/mission/detail/component/ImageContent.kt +++ b/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/mission/detail/component/ImageContent.kt @@ -48,13 +48,14 @@ fun ImageContent( isEditable: Boolean ) { val isImageEmpty = remember(imageModel) { imageModel.isEmpty() } + val pagerState = rememberPagerState { imageModel.size } val photoPickerLauncher = rememberLauncherForActivityResult(ActivityResultContracts.PickMultipleVisualMedia()) { if (it.isNotEmpty()) { onChangeImage(ImageModel.Local(it)) } } - HorizontalPager(imageModel.size) { page -> + HorizontalPager(state = pagerState) { page -> Box( modifier = Modifier .fillMaxWidth() diff --git a/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/onboarding/OnboardingScreen.kt b/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/onboarding/OnboardingScreen.kt index 6e1d23782..adca69bd8 100644 --- a/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/onboarding/OnboardingScreen.kt +++ b/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/onboarding/OnboardingScreen.kt @@ -72,7 +72,7 @@ fun OnboardingScreen( navigator: DestinationsNavigator ) { val onboardingPages = OnBoardingPageUiModel.values() - val pageState = rememberPagerState() + val pageState = rememberPagerState { onboardingPages.size } SoptTheme { SoptColumn( modifier = Modifier @@ -93,8 +93,7 @@ fun OnboardingScreen( ) HorizontalPager( modifier = Modifier.fillMaxWidth(), - state = pageState, - pageCount = onboardingPages.size + state = pageState ) { OnboardingPage( image = onboardingPages[pageState.currentPage].image, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ab86477cf..091e59df7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -compileSdk = "33" +compileSdk = "34" minSdk = "28" -targetSdk = "33" +targetSdk = "34" appVersion = "1.0.1" versionCode = "10001" @@ -14,11 +14,11 @@ corektx = "1.10.1" appcompat = "1.6.1" activity = "1.7.2" lifecycle = "2.6.1" -navigation = "2.6.0" +navigation = "2.7.0" startup = "1.1.1" security = "1.1.0-alpha06" -compose-compiler = "1.5.0" -compose-bom = "2023.06.01" +compose-compiler = "1.5.1" +compose-bom = "2023.08.00" desugarJdk = "2.0.3" rxjava = "3.1.6" rxkotlin = "3.0.1" @@ -51,7 +51,7 @@ soloader = "0.10.5" okhttp = "4.11.0" retrofit = "2.9.0" timber = "5.0.1" -compose-destination = "1.9.42-beta" +compose-destination = "1.9.52" mavericks = "3.0.6" coil = "2.4.0" lottie = "6.1.0"