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 2865479f3..9f5417743 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 @@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.pager.HorizontalPager +import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Text import androidx.compose.runtime.Composable @@ -52,9 +53,8 @@ fun ImageContent( onChangeImage(ImageModel.Local(it)) } } - val pageCount = remember(imageModel) { imageModel.size } - HorizontalPager(pageCount) { page -> + HorizontalPager(imageModel.size) { 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 2c494f3b0..6e1d23782 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 @@ -71,8 +71,8 @@ private enum class OnBoardingPageUiModel( fun OnboardingScreen( navigator: DestinationsNavigator ) { - val pageState = rememberPagerState() val onboardingPages = OnBoardingPageUiModel.values() + val pageState = rememberPagerState() SoptTheme { SoptColumn( modifier = Modifier @@ -93,8 +93,8 @@ fun OnboardingScreen( ) HorizontalPager( modifier = Modifier.fillMaxWidth(), - pageCount = onboardingPages.size, - state = pageState + state = pageState, + pageCount = onboardingPages.size ) { OnboardingPage( image = onboardingPages[pageState.currentPage].image, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8cbcce198..514bf0c03 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ targetSdk = "33" appVersion = "1.0.1" versionCode = "10001" -kotlin = "1.8.21" +kotlin = "1.9.0" kotlinx-serialization-json = "1.5.1" kotlinx-serialization-converter = "1.0.0" kotlinx-coroutines = "1.7.2" @@ -17,7 +17,7 @@ lifecycle = "2.6.1" navigation = "2.6.0" startup = "1.1.1" security = "1.1.0-alpha06" -compose-compiler = "1.4.7" +compose-compiler = "1.5.0" compose-bom = "2023.06.01" desugarJdk = "2.0.3" @@ -35,9 +35,10 @@ truth = "1.1.5" robolectric = "4.10.3" androidx-uiautomator = "2.3.0-alpha03" androidx-test = "1.5.2" +androidx-test-rules = "1.5.0" gradleplugin = "8.0.2" -kspplugin = "1.8.21-1.0.11" +kspplugin = "1.9.0-1.0.11" dagger-hilt = "2.47" dagger-hilt-navigation-compose = "1.0.0" @@ -46,7 +47,7 @@ soloader = "0.10.5" okhttp = "4.11.0" retrofit = "2.9.0" timber = "5.0.1" -compose-destination = "1.8.41-beta" +compose-destination = "1.9.42-beta" mavericks = "3.0.5" coil = "2.4.0" lottie = "6.1.0" @@ -120,7 +121,7 @@ robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectr androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx-uiautomator" } androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" } -androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" } +androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test-rules" } flipper = { module = "com.facebook.flipper:flipper", version.ref = "flipper" } flipper-noop = { module = "com.facebook.flipper:flipper-noop", version.ref = "flipper" }