From 0fef47548241cc7f8074acacc7136ab016756c13 Mon Sep 17 00:00:00 2001 From: Eric Ampire Date: Sun, 17 Oct 2021 22:36:07 +0200 Subject: [PATCH] Update to Jetpack Compose 1.0.4 --- .../screen/explore/ui/ExploreScreen.kt | 4 +- lint.xml | 6 + settings.gradle.kts | 3 + versions.properties | 153 ++++++++++++++++-- 4 files changed, 153 insertions(+), 13 deletions(-) create mode 100644 lint.xml diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/explore/ui/ExploreScreen.kt b/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/explore/ui/ExploreScreen.kt index 95cbf93..2e9a47f 100644 --- a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/explore/ui/ExploreScreen.kt +++ b/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/explore/ui/ExploreScreen.kt @@ -55,7 +55,7 @@ fun ExploreScreen( val context = LocalContext.current val tabItems = stringArrayResource(id = R.array.explore_item) - val pagerState = rememberPagerState(pageCount = tabItems.size) + val pagerState = rememberPagerState() val bottomSheetState = rememberModalBottomSheetState(ModalBottomSheetValue.Hidden) @@ -192,7 +192,7 @@ fun ExploreScreen( arcColor = MaterialTheme.colors.primaryVariant ) } else { - HorizontalPager(state = pagerState) { + HorizontalPager(state = pagerState, count = tabItems.size) { ExploreContent( files = animations, onShareClick = { diff --git a/lint.xml b/lint.xml new file mode 100644 index 0000000..9b1f16a --- /dev/null +++ b/lint.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 5f9ef90..fff4fed 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,8 @@ plugins { id("de.fayard.refreshVersions") version "0.20.0" +//// # available:"0.21.0" +//// # available:"0.22.0" +//// # available:"0.23.0" } refreshVersions { diff --git a/versions.properties b/versions.properties index cfa350e..c09e891 100644 --- a/versions.properties +++ b/versions.properties @@ -1,5 +1,5 @@ #### Dependencies and Plugin versions with their available updates. -#### Generated by `./gradlew refreshVersions` version 0.10.1 +#### Generated by `./gradlew refreshVersions` version 0.20.0 #### #### Don't manually edit or split the comments that start with four hashtags (####), #### they will be overwritten by refreshVersions. @@ -7,60 +7,191 @@ #### suppress inspection "SpellCheckingInspection" for whole file #### suppress inspection "UnusedProperty" for whole file -plugin.android=7.0.2 +plugin.android=7.0.3 +## # available=7.1.0-alpha01 +## # available=7.1.0-alpha02 +## # available=7.1.0-alpha03 +## # available=7.1.0-alpha04 +## # available=7.1.0-alpha05 +## # available=7.1.0-alpha06 +## # available=7.1.0-alpha07 +## # available=7.1.0-alpha08 +## # available=7.1.0-alpha09 +## # available=7.1.0-alpha10 +## # available=7.1.0-alpha11 +## # available=7.1.0-alpha12 +## # available=7.1.0-alpha13 +## # available=7.1.0-beta01 +## # available=7.2.0-alpha01 + +## unused version.androidx.activity=1.3.0-alpha08 + +## unused version.androidx.preference=1.1.1 + +## unused version.androidx.appcompat=1.3.0 -version.androidx.compose.compiler=1.0.2 -version.androidx.compose.material-icons-extended=1.0.2 -version.androidx.compose.material=1.0.2 -version.androidx.compose.runtime=1.0.2 -version.google.accompanist=0.18.0 -version.androidx.compose.ui=1.0.2 -version.androidx.compose.ui-viewbinding=1.0.2 + +## unused +version.androidx.compose.compiler=1.0.4 + +## unused +version.androidx.compose.material-icons-extended=1.0.4 + +## unused +version.androidx.compose.material=1.0.4 + +## unused +version.androidx.compose.runtime=1.0.4 + +## unused +version.google.accompanist=0.20.0 + +## unused +version.androidx.compose.ui=1.0.4 + +## unused +version.androidx.compose.ui-viewbinding=1.0.4 + +## unused version.androidx.core=1.5.0 + +## unused version.androidx.room=2.3.0 + +## unused version.androidx.startup=1.0.0 + +## unused version.androidx.lifecycle=2.3.1 + +## unused version.androidx.test.espresso=3.3.0 + +## unused version.androidx.test.ext.junit=1.1.2 + +## unused version.google.android.material=1.4.0 + version.google.dagger=2.38.1 +## # available=2.39 +## # available=2.39.1 + +## unused version.kotest=4.4.3 + +## unused version.mockk=1.12.0 -version.kotlin=1.5.21 -version.ktor=1.6.3 + +version.kotlin=1.5.31 ## # available=1.5.30-M1 +## # available=1.5.30-RC +## # available=1.5.30 +## # available=1.5.31 +## # available=1.6.0-M1 +## # available=1.6.0-RC + +## unused + version.ktor=1.6.3 +### available=1.5.30-M1 + +## unused version.junit.junit=4.13 + +## unused version.junit=5.7.2 + +## unused version.kotlinx.coroutines=1.5.1 + +## unused version.com.airbnb.android..mavericks=2.3.0 + +## unused version.com.airbnb.android..mavericks-testing=2.3.0 + +## unused version.com.airbnb.android..mavericks-mocking=2.3.0 + +## unused version.com.airbnb.android..mavericks-compose=2.1.0-alpha02 + +## unused version.org.jacoco..org.jacoco.ant=0.8.3 + +## unused version.com.jakewharton.timber..timber=4.7.1 + +## unused version.com.zeugmasolutions.localehelper..locale-helper-android=1.1.4 + +## unused version.com.google.maps.android..places-ktx=0.4.0 + +## unused version.androidx.navigation-compose=2.4.0-alpha02 + +## unused version.com.google.maps.android..maps-ktx=2.1.1 + +## unused version.com.google.maps.android..maps-utils-ktx=2.1.1 + +## unused version.com.google.devtools.ksp..symbol-processing-api=1.5.10-1.0.0-beta01 + +## unused version.com.google.android.gms..play-services-auth=19.0.0 + +## unused version.com.google.android.play..core=1.10.0 + +## unused version.com.google.android.play..core-ktx=1.8.1 + +## unused version.com.google.android.gms..play-services-maps=17.0.0 + +## unused version.com.google.android.gms..play-services-location=17.0.0 + +## unused version.io.nlopez.smartlocation..library=3.3.3 + +## unused version.io.insert-koin..koin-core=3.1.2 + +## unused version.io.insert-koin..koin-test-junit5=3.1.2 + +## unused version.io.insert-koin..koin-android=3.1.2 + +## unused version.io.insert-koin..koin-androidx-viewmodel=3.1.2 + +## unused version.io.insert-koin..koin-androidx-compose=3.1.2 + +## unused version.io.insert-koin..koin-androidx-workmanager=3.1.2 + +## unused version.com.airbnb.android..lottie-compose=4.1.0 + +## unused version.app.cash.turbine..turbine=0.6.1 + +## unused version.com.mindorks.android..prdownloader=0.6.0 + +## unused version.org.mockito.kotlin..mockito-kotlin=3.2.0 + +## unused version.de.mannodermaus.junit5..android-test-runner=1.2.2 + +## unused version.de.mannodermaus.junit5..android-test-core=1.2.2