From 864383ab2c0d75345c4856f0eae0ed466741f2bf Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Thu, 11 May 2023 19:25:07 +0200 Subject: [PATCH] Update Jetpack Compose and Accompanist --- .../launcher2/ui/launcher/PagerScaffold.kt | 3 +-- .../launcher2/ui/launcher/PullDownScaffold.kt | 3 +-- .../ui/launcher/widgets/music/MusicWidget.kt | 4 ++-- .../ui/settings/icons/IconsSettingsScreen.kt | 2 +- settings.gradle.kts | 22 +++++++++---------- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt index fdedea61..b29da9d0 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt @@ -108,7 +108,7 @@ fun PagerScaffold( val widgetsScrollState = rememberScrollState() val searchState = rememberLazyListState() - val pagerState = rememberPagerState() + val pagerState = rememberPagerState { 2 } val isSearchAtBottom by remember { derivedStateOf { @@ -330,7 +330,6 @@ fun PagerScaffold( HorizontalPager( modifier = Modifier.fillMaxSize(), - pageCount = 2, beyondBoundsPageCount = 1, reverseLayout = reverse, state = pagerState, diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt index 8638a5e1..3cdd34b3 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt @@ -105,7 +105,7 @@ fun PullDownScaffold( val widgetsScrollState = rememberScrollState() val searchState = rememberLazyListState() - val pagerState = rememberPagerState() + val pagerState = rememberPagerState { 2 } val isSearchAtTop by remember { derivedStateOf { @@ -361,7 +361,6 @@ fun PullDownScaffold( ) { VerticalPager( modifier = Modifier.fillMaxSize(), - pageCount = 2, beyondBoundsPageCount = 1, state = pagerState, reverseLayout = true, diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt index 602e8b31..0918259e 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt @@ -358,7 +358,7 @@ fun CustomActions( val action = actions.customActions[i] PlainTooltipBox(tooltip = { Text(action.name.toString()) }) { IconButton( - modifier = Modifier.tooltipAnchor(), + modifier = Modifier.tooltipTrigger(), onClick = { onActionSelected(action) } @@ -402,7 +402,7 @@ fun CustomActions( val action = actions.customActions.last() PlainTooltipBox(tooltip = { Text(action.name.toString()) }) { IconButton( - modifier = Modifier.tooltipAnchor(), + modifier = Modifier.tooltipTrigger(), onClick = { onActionSelected(action) } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreen.kt index 33637745..f5bf9e1f 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreen.kt @@ -228,7 +228,7 @@ fun IconsSettingsScreen() { ) { PlainTooltipBox(tooltip = { Text(stringResource(R.string.icon_pack_dynamic_colors)) }) { FilledIconToggleButton( - modifier = Modifier.tooltipAnchor(), + modifier = Modifier.tooltipTrigger(), checked = iconPackThemed, onCheckedChange = { viewModel.setIconPackThemed(it) diff --git a/settings.gradle.kts b/settings.gradle.kts index 705d4512..1112f832 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -39,25 +39,25 @@ dependencyResolutionManagement { version("androidx.compose.compiler", "1.4.5") library("androidx.compose.runtime", "androidx.compose.runtime", "runtime") - .version("1.5.0-alpha03") + .version("1.5.0-alpha04") library("androidx.compose.foundation", "androidx.compose.foundation", "foundation") - .version("1.5.0-alpha03") + .version("1.5.0-alpha04") library("androidx.compose.foundationlayout", "androidx.compose.foundation", "foundation-layout") - .version("1.5.0-alpha03") + .version("1.5.0-alpha04") library("androidx.compose.ui", "androidx.compose.ui", "ui") - .version("1.5.0-alpha03") + .version("1.5.0-alpha04") library("androidx.compose.uitooling", "androidx.compose.ui", "ui-tooling") - .version("1.5.0-alpha03") + .version("1.5.0-alpha04") library("androidx.compose.material", "androidx.compose.material", "material") - .version("1.5.0-alpha03") + .version("1.5.0-alpha04") library("androidx.compose.materialicons", "androidx.compose.material", "material-icons-extended") - .version("1.5.0-alpha03") + .version("1.5.0-alpha04") library("androidx.compose.animation", "androidx.compose.animation", "animation") - .version("1.5.0-alpha03") + .version("1.5.0-alpha04") library("androidx.compose.animationgraphics", "androidx.compose.animation", "animation-graphics") - .version("1.5.0-alpha03") + .version("1.5.0-alpha04") library("androidx.compose.material3", "androidx.compose.material3", "material3") - .version("1.1.0-rc01") + .version("1.2.0-alpha01") version("androidx.lifecycle", "2.6.1") library("androidx.lifecycle.viewmodel", "androidx.lifecycle", "lifecycle-viewmodel-ktx") @@ -79,7 +79,7 @@ dependencyResolutionManagement { ) ) - version("accompanist", "0.31.0-alpha") + version("accompanist", "0.31.2-alpha") library("accompanist.insets", "com.google.accompanist", "accompanist-insets") .versionRef("accompanist") library("accompanist.systemuicontroller", "com.google.accompanist", "accompanist-systemuicontroller")