From cee2240cdc1ae004063f4686be656bf53f2702bf Mon Sep 17 00:00:00 2001 From: Ax333l Date: Sun, 15 Oct 2023 13:17:07 +0200 Subject: [PATCH] chore: bump compose --- app/build.gradle.kts | 4 ++-- .../app/revanced/manager/ui/screen/DashboardScreen.kt | 8 ++++++-- .../manager/ui/screen/PatchesSelectorScreen.kt | 11 +++++++---- gradle/libs.versions.toml | 8 ++++---- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e5c3f484..d3a2a95d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,13 +9,13 @@ plugins { android { namespace = "app.revanced.manager" - compileSdk = 33 + compileSdk = 34 buildToolsVersion = "33.0.2" defaultConfig { applicationId = "app.revanced.manager" minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "0.0.1" resourceConfigurations.addAll(listOf( diff --git a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt index be71514b..2f3e49ec 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt @@ -65,7 +65,12 @@ fun DashboardScreen( val availablePatches by vm.availablePatches.collectAsStateWithLifecycle(0) val androidContext = LocalContext.current - val pagerState = rememberPagerState() + val pagerState = rememberPagerState( + initialPage = DashboardPage.DASHBOARD.ordinal, + initialPageOffsetFraction = 0f + ) { + DashboardPage.values().size + } val composableScope = rememberCoroutineScope() LaunchedEffect(pagerState.currentPage) { @@ -186,7 +191,6 @@ fun DashboardScreen( } HorizontalPager( - pageCount = pages.size, state = pagerState, userScrollEnabled = true, modifier = Modifier.fillMaxSize(), diff --git a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt index 01cda7c0..47119f4b 100644 --- a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt +++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt @@ -79,15 +79,19 @@ fun PatchesSelectorScreen( onBackClick: () -> Unit, vm: PatchesSelectorViewModel ) { - val pagerState = rememberPagerState() + val bundles by vm.bundlesFlow.collectAsStateWithLifecycle(initialValue = emptyList()) + val pagerState = rememberPagerState( + initialPage = 0, + initialPageOffsetFraction = 0f + ) { + bundles.size + } val composableScope = rememberCoroutineScope() var search: String? by rememberSaveable { mutableStateOf(null) } var showBottomSheet by rememberSaveable { mutableStateOf(false) } - val bundles by vm.bundlesFlow.collectAsStateWithLifecycle(initialValue = emptyList()) - if (showBottomSheet) { ModalBottomSheet( onDismissRequest = { @@ -358,7 +362,6 @@ fun PatchesSelectorScreen( } HorizontalPager( - pageCount = bundles.size, state = pagerState, userScrollEnabled = true, pageContent = { index -> diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0c7b5e3b..1cb69f97 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -ktx = "1.10.1" +ktx = "1.12.0" viewmodel-lifecycle = "2.6.2" splash-screen = "1.0.1" -compose-activity = "1.7.2" +compose-activity = "1.8.0" paging = "3.2.1" preferences-datastore = "1.0.0" work-runtime = "2.8.1" -compose-bom = "2023.06.01" +compose-bom = "2023.10.00" accompanist = "0.30.1" serialization = "1.6.0" collection = "0.3.5" @@ -15,7 +15,7 @@ revanced-patcher = "16.0.1" revanced-library = "1.1.1" koin-version = "3.4.3" koin-version-compose = "3.4.6" -reimagined-navigation = "1.4.0" +reimagined-navigation = "1.5.0" ktor = "2.3.3" markdown = "0.5.0" androidGradlePlugin = "8.1.1"