lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update Jetpack Compose and Accompanist

Browse Source
This commit is contained in:
MM20 2023-05-11 19:25:07 +02:00
parent 5c7d162c88
commit 864383ab2c
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
5 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
View File

@ -108,7 +108,7 @@ fun PagerScaffold(
val widgetsScrollState = rememberScrollState() val widgetsScrollState = rememberScrollState()
val searchState = rememberLazyListState() val searchState = rememberLazyListState()
val pagerState = rememberPagerState() val pagerState = rememberPagerState { 2 }
val isSearchAtBottom by remember { val isSearchAtBottom by remember {
derivedStateOf { derivedStateOf {
@ -330,7 +330,6 @@ fun PagerScaffold(
HorizontalPager( HorizontalPager(
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),
pageCount = 2,
beyondBoundsPageCount = 1, beyondBoundsPageCount = 1,
reverseLayout = reverse, reverseLayout = reverse,
state = pagerState, state = pagerState,

3
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
View File

@ -105,7 +105,7 @@ fun PullDownScaffold(
val widgetsScrollState = rememberScrollState() val widgetsScrollState = rememberScrollState()
val searchState = rememberLazyListState() val searchState = rememberLazyListState()
val pagerState = rememberPagerState() val pagerState = rememberPagerState { 2 }
val isSearchAtTop by remember { val isSearchAtTop by remember {
derivedStateOf { derivedStateOf {
@ -361,7 +361,6 @@ fun PullDownScaffold(
) { ) {
VerticalPager( VerticalPager(
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),
pageCount = 2,
beyondBoundsPageCount = 1, beyondBoundsPageCount = 1,
state = pagerState, state = pagerState,
reverseLayout = true, reverseLayout = true,

4
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt
View File

@ -358,7 +358,7 @@ fun CustomActions(
val action = actions.customActions[i] val action = actions.customActions[i]
PlainTooltipBox(tooltip = { Text(action.name.toString()) }) { PlainTooltipBox(tooltip = { Text(action.name.toString()) }) {
IconButton( IconButton(
modifier = Modifier.tooltipAnchor(), modifier = Modifier.tooltipTrigger(),
onClick = { onClick = {
onActionSelected(action) onActionSelected(action)
} }
@ -402,7 +402,7 @@ fun CustomActions(
val action = actions.customActions.last() val action = actions.customActions.last()
PlainTooltipBox(tooltip = { Text(action.name.toString()) }) { PlainTooltipBox(tooltip = { Text(action.name.toString()) }) {
IconButton( IconButton(
modifier = Modifier.tooltipAnchor(), modifier = Modifier.tooltipTrigger(),
onClick = { onClick = {
onActionSelected(action) onActionSelected(action)
} }

2
app/ui/src/main/java/de/mm20/launcher2/ui/settings/icons/IconsSettingsScreen.kt
View File

@ -228,7 +228,7 @@ fun IconsSettingsScreen() {
) { ) {
PlainTooltipBox(tooltip = { Text(stringResource(R.string.icon_pack_dynamic_colors)) }) { PlainTooltipBox(tooltip = { Text(stringResource(R.string.icon_pack_dynamic_colors)) }) {
FilledIconToggleButton( FilledIconToggleButton(
modifier = Modifier.tooltipAnchor(), modifier = Modifier.tooltipTrigger(),
checked = iconPackThemed, checked = iconPackThemed,
onCheckedChange = { onCheckedChange = {
viewModel.setIconPackThemed(it) viewModel.setIconPackThemed(it)

22
settings.gradle.kts
View File

@ -39,25 +39,25 @@ dependencyResolutionManagement {
version("androidx.compose.compiler", "1.4.5") version("androidx.compose.compiler", "1.4.5")
library("androidx.compose.runtime", "androidx.compose.runtime", "runtime") 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") 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") 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") 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") 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") 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") 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") 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") 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") library("androidx.compose.material3", "androidx.compose.material3", "material3")
.version("1.1.0-rc01") .version("1.2.0-alpha01")
version("androidx.lifecycle", "2.6.1") version("androidx.lifecycle", "2.6.1")
library("androidx.lifecycle.viewmodel", "androidx.lifecycle", "lifecycle-viewmodel-ktx") 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") library("accompanist.insets", "com.google.accompanist", "accompanist-insets")
.versionRef("accompanist") .versionRef("accompanist")
library("accompanist.systemuicontroller", "com.google.accompanist", "accompanist-systemuicontroller") library("accompanist.systemuicontroller", "com.google.accompanist", "accompanist-systemuicontroller")