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

Improve weird bottom sheet scrolling behavior

Browse Source
This commit is contained in:
MM20 2022-12-21 20:52:39 +01:00
parent aa69fb5f42
commit 7d078c69d0
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
9 changed files with 80 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt
View File

@ -80,6 +80,7 @@ fun RestoreBackupSheet(
.fillMaxWidth()
.wrapContentHeight()
.verticalScroll(rememberScrollState())
.padding(it)
) {
when (state) {
RestoreBackupState.Parsing -> {

2
app/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt
View File

@ -51,7 +51,7 @@ fun WeatherLocationSearchDialog(
) {
var query by remember { mutableStateOf("") }
Column(
modifier = Modifier.fillMaxWidth()
modifier = Modifier.fillMaxWidth().padding(it)
) {
Row(
Modifier.padding(bottom = 16.dp)

8
app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt
View File

@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
@ -58,7 +59,7 @@ fun BottomSheetDialog(
dismissButton: @Composable (() -> Unit)? = null,
swipeToDismiss: () -> Boolean = { true },
dismissOnBackPress: () -> Boolean = { true },
content: @Composable () -> Unit,
content: @Composable (paddingValues: PaddingValues) -> Unit,
) {
val swipeState = remember {
SwipeableState(
@ -200,12 +201,11 @@ fun BottomSheetDialog(
Box(
modifier = Modifier
.fillMaxWidth()
.wrapContentHeight()
.padding(horizontal = 24.dp, vertical = 8.dp),
.wrapContentHeight(),
propagateMinConstraints = true,
contentAlignment = Alignment.Center
) {
content()
content(PaddingValues(horizontal = 24.dp, vertical = 8.dp))
}
}

6
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt
View File

@ -66,7 +66,8 @@ fun CustomizeSearchableSheet(
if (!pickIcon) {
Column(
modifier = Modifier
.padding(top = 8.dp),
.padding(top = 8.dp)
.padding(it),
horizontalAlignment = Alignment.CenterHorizontally
) {
@ -162,7 +163,8 @@ fun CustomizeSearchableSheet(
LazyVerticalGrid(
modifier = Modifier.fillMaxSize(),
columns = GridCells.Fixed(columns)
columns = GridCells.Fixed(columns),
contentPadding = it,
) {
item(span = { GridItemSpan(columns) }) {

14
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt
View File

@ -151,6 +151,7 @@ fun EditFavoritesSheet(
modifier = Modifier
.fillMaxWidth()
.aspectRatio(1f)
.padding(it)
) {
CircularProgressIndicator(
modifier = Modifier
@ -159,15 +160,15 @@ fun EditFavoritesSheet(
)
}
} else if (createShortcutTarget != null) {
ShortcutPicker(viewModel)
ShortcutPicker(viewModel, it)
} else {
ReorderFavoritesGrid(viewModel)
ReorderFavoritesGrid(viewModel, it)
}
}
}
@Composable
fun ReorderFavoritesGrid(viewModel: EditFavoritesSheetVM) {
fun ReorderFavoritesGrid(viewModel: EditFavoritesSheetVM, paddingValues: PaddingValues) {
val items by viewModel.gridItems.observeAsState(emptyList())
val columns = LocalGridSettings.current.columnCount
@ -238,6 +239,7 @@ fun ReorderFavoritesGrid(viewModel: EditFavoritesSheetVM) {
LazyVerticalDragAndDropGrid(
state = state,
columns = GridCells.Fixed(columns),
contentPadding = paddingValues,
) {
items(
@ -670,7 +672,7 @@ fun GridItem(
}
@Composable
fun ShortcutPicker(viewModel: EditFavoritesSheetVM) {
fun ShortcutPicker(viewModel: EditFavoritesSheetVM, paddingValues: PaddingValues) {
val hasShortcutPermission by remember { viewModel.hasShortcutPermission }.collectAsState(null)
@ -690,7 +692,9 @@ fun ShortcutPicker(viewModel: EditFavoritesSheetVM) {
val iconSize = 48.dp.toPixels().roundToInt()
val activity = LocalLifecycleOwner.current as AppCompatActivity
LazyColumn {
LazyColumn(
contentPadding = paddingValues
) {
if (hasShortcutPermission == false) {
item {
MissingPermissionBanner(

1
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt
View File

@ -56,6 +56,7 @@ fun HiddenItemsSheet(
items,
modifier = Modifier
.verticalScroll(rememberScrollState())
.padding(it)
)
}
}

5
app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt
View File

@ -93,6 +93,7 @@ fun CreateBackupSheet(
.fillMaxWidth()
.wrapContentHeight()
.verticalScroll(rememberScrollState())
.padding(it)
) {
when (state) {
CreateBackupState.Ready -> {
@ -143,7 +144,9 @@ fun CreateBackupSheet(
}
)
SmallMessage(
modifier = Modifier.padding(top = 8.dp),
modifier = Modifier
.padding(top = 8.dp)
.fillMaxWidth(),
icon = Icons.Rounded.Warning,
text = stringResource(R.string.backup_not_included)
)

60
app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt
View File

@ -205,20 +205,25 @@ fun EditSearchActionSheet(
)
}) {
when (page) {
EditSearchActionPage.SelectType -> SelectTypePage(viewModel)
EditSearchActionPage.InitWebSearch -> InitWebSearchPage(viewModel)
EditSearchActionPage.InitAppSearch -> InitAppSearchPage(viewModel)
EditSearchActionPage.CustomizeWebSearch -> CustomizeWebSearch(viewModel)
EditSearchActionPage.CustomizeCustomIntent -> CustomizeCustomIntent(viewModel)
EditSearchActionPage.CustomizeAppSearch -> CustomizeAppSearch(viewModel)
EditSearchActionPage.PickIcon -> PickIcon(viewModel)
EditSearchActionPage.SelectType -> SelectTypePage(viewModel, it)
EditSearchActionPage.InitWebSearch -> InitWebSearchPage(viewModel, it)
EditSearchActionPage.InitAppSearch -> InitAppSearchPage(viewModel, it)
EditSearchActionPage.CustomizeWebSearch -> CustomizeWebSearch(viewModel, it)
EditSearchActionPage.CustomizeCustomIntent -> CustomizeCustomIntent(viewModel, it)
EditSearchActionPage.CustomizeAppSearch -> CustomizeAppSearch(viewModel, it)
EditSearchActionPage.PickIcon -> PickIcon(viewModel, it)
}
}
}
@Composable
private fun SelectTypePage(viewModel: EditSearchActionSheetVM) {
Column {
private fun SelectTypePage(viewModel: EditSearchActionSheetVM, paddingValues: PaddingValues) {
Column(
modifier = Modifier
.fillMaxWidth()
.verticalScroll(rememberScrollState())
.padding(paddingValues)
) {
Text(
text = stringResource(R.string.create_search_action_type),
style = MaterialTheme.typography.labelMedium,
@ -299,13 +304,13 @@ private fun SelectTypePage(viewModel: EditSearchActionSheetVM) {
}
@Composable
private fun InitAppSearchPage(viewModel: EditSearchActionSheetVM) {
private fun InitAppSearchPage(viewModel: EditSearchActionSheetVM, paddingValues: PaddingValues) {
val context = LocalContext.current
val searchableApps by remember { viewModel.getSearchableApps(context) }.collectAsState(null)
if (searchableApps != null) {
LazyColumn(
contentPadding = PaddingValues(bottom = 16.dp)
contentPadding = paddingValues
) {
item {
Text(
@ -344,12 +349,15 @@ private fun InitAppSearchPage(viewModel: EditSearchActionSheetVM) {
}
@Composable
private fun InitWebSearchPage(viewModel: EditSearchActionSheetVM) {
private fun InitWebSearchPage(viewModel: EditSearchActionSheetVM, paddingValues: PaddingValues) {
var url by viewModel.initWebsearchUrl
val importError by viewModel.websearchImportError
val loading by viewModel.loadingWebsearch
Column(
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.verticalScroll(rememberScrollState())
.padding(paddingValues)
) {
Text(
text = stringResource(R.string.create_search_action_website_url),
@ -391,11 +399,14 @@ private fun InitWebSearchPage(viewModel: EditSearchActionSheetVM) {
}
@Composable
fun CustomizeWebSearch(viewModel: EditSearchActionSheetVM) {
fun CustomizeWebSearch(viewModel: EditSearchActionSheetVM, paddingValues: PaddingValues) {
val searchAction by viewModel.searchAction
Column(
modifier = Modifier.verticalScroll(rememberScrollState())
modifier = Modifier
.verticalScroll(rememberScrollState())
.fillMaxWidth()
.padding(paddingValues)
) {
if (searchAction != null && searchAction is WebsearchActionBuilder) {
@ -515,7 +526,7 @@ fun CustomizeWebSearch(viewModel: EditSearchActionSheetVM) {
}
@Composable
fun CustomizeAppSearch(viewModel: EditSearchActionSheetVM) {
fun CustomizeAppSearch(viewModel: EditSearchActionSheetVM, paddingValues: PaddingValues) {
val searchAction by viewModel.searchAction
val context = LocalContext.current
@ -531,7 +542,10 @@ fun CustomizeAppSearch(viewModel: EditSearchActionSheetVM) {
}
Column(
modifier = Modifier.verticalScroll(rememberScrollState())
modifier = Modifier
.verticalScroll(rememberScrollState())
.fillMaxWidth()
.padding(paddingValues)
) {
if (searchAction != null) {
@ -632,7 +646,7 @@ fun CustomizeAppSearch(viewModel: EditSearchActionSheetVM) {
}
@Composable
fun CustomizeCustomIntent(viewModel: EditSearchActionSheetVM) {
fun CustomizeCustomIntent(viewModel: EditSearchActionSheetVM, paddingValues: PaddingValues) {
val searchAction by viewModel.searchAction
val action = searchAction
@ -642,6 +656,7 @@ fun CustomizeCustomIntent(viewModel: EditSearchActionSheetVM) {
modifier = Modifier
.verticalScroll(rememberScrollState())
.fillMaxWidth()
.padding(paddingValues)
) {
Row(
verticalAlignment = Alignment.Bottom
@ -715,7 +730,7 @@ fun CustomizeCustomIntent(viewModel: EditSearchActionSheetVM) {
}
@Composable
fun PickIcon(viewModel: EditSearchActionSheetVM) {
fun PickIcon(viewModel: EditSearchActionSheetVM, paddingValues: PaddingValues) {
val action by viewModel.searchAction
val iconSizePx = 20.dp.toPixels()
@ -730,7 +745,9 @@ fun PickIcon(viewModel: EditSearchActionSheetVM) {
val availableIcons =
remember { SearchActionIcon.values().filter { it != SearchActionIcon.Custom } }
Column {
Column(
modifier = Modifier.padding(paddingValues)
) {
LazyVerticalGrid(columns = GridCells.Adaptive(64.dp)) {
if (action is AppSearchActionBuilder) {
item {
@ -779,7 +796,8 @@ fun PickIcon(viewModel: EditSearchActionSheetVM) {
}
} else {
Column(
horizontalAlignment = Alignment.CenterHorizontally
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.padding(paddingValues)
) {
SearchActionIconTile {
SearchActionIcon(builder = action!!, size = 24.dp)

26
app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheet.kt
View File

@ -4,6 +4,7 @@ import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@ -102,16 +103,19 @@ fun EditTagSheet(
}
) {
when (viewModel.page) {
EditTagSheetPage.CreateTag -> CreateNewTagPage(viewModel)
EditTagSheetPage.PickItems -> PickItems(viewModel)
EditTagSheetPage.CustomizeTag -> CustomizeTag(viewModel)
EditTagSheetPage.CreateTag -> CreateNewTagPage(viewModel, it)
EditTagSheetPage.PickItems -> PickItems(viewModel, it)
EditTagSheetPage.CustomizeTag -> CustomizeTag(viewModel, it)
}
}
}
@Composable
fun CreateNewTagPage(viewModel: EditTagSheetVM) {
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
fun CreateNewTagPage(viewModel: EditTagSheetVM, paddingValues: PaddingValues) {
Column(modifier = Modifier
.verticalScroll(rememberScrollState())
.padding(paddingValues)
) {
OutlinedTextField(
modifier = Modifier.fillMaxWidth(),
singleLine = true,
@ -130,8 +134,8 @@ fun CreateNewTagPage(viewModel: EditTagSheetVM) {
}
@Composable
fun PickItems(viewModel: EditTagSheetVM) {
LazyColumn(modifier = Modifier.fillMaxWidth()) {
fun PickItems(viewModel: EditTagSheetVM, paddingValues: PaddingValues) {
LazyColumn(modifier = Modifier.fillMaxWidth(), contentPadding = paddingValues) {
item {
Text(stringResource(id = R.string.tag_select_items),
style = MaterialTheme.typography.labelMedium,
@ -209,9 +213,13 @@ fun ListItem(
@Composable
fun CustomizeTag(viewModel: EditTagSheetVM) {
fun CustomizeTag(viewModel: EditTagSheetVM, paddingValues: PaddingValues) {
val iconSize = 32.dp.toPixels()
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
Column(modifier = Modifier
.verticalScroll(rememberScrollState())
.fillMaxWidth()
.padding(paddingValues)
) {
OutlinedTextField(
modifier = Modifier.fillMaxWidth(),
singleLine = true,