Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix floating effect for custom list description #6061

Merged
merged 1 commit into from
Apr 8, 2024
Merged

Fix floating effect for custom list description #6061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ fun SelectLocationScreen(
customLists(
customLists = state.filteredCustomLists,
selectedItem = state.selectedItem,
backgroundColor = backgroundColor,
onSelectRelay = onSelectRelay,
onShowCustomListBottomSheet = {
bottomSheetState =
Expand Down Expand Up @@ -375,6 +376,7 @@ private fun LazyListScope.loading() {
private fun LazyListScope.customLists(
customLists: List<RelayItem.CustomList>,
selectedItem: RelayItem?,
backgroundColor: Color,
onSelectRelay: (item: RelayItem) -> Unit,
onShowCustomListBottomSheet: () -> Unit,
onShowEditBottomSheet: (RelayItem.CustomList) -> Unit
Expand Down Expand Up @@ -413,14 +415,16 @@ private fun LazyListScope.customLists(
item {
SwitchComposeSubtitleCell(
text = stringResource(R.string.to_add_locations_to_a_list),
modifier = Modifier.animateItemPlacement().animateContentSize()
modifier =
Modifier.background(backgroundColor).animateItemPlacement().animateContentSize()
)
}
} else {
item(contentType = ContentType.EMPTY_TEXT) {
SwitchComposeSubtitleCell(
text = stringResource(R.string.to_create_a_custom_list),
modifier = Modifier.animateItemPlacement().animateContentSize()
modifier =
Modifier.background(backgroundColor).animateItemPlacement().animateContentSize()
)
}
}
Expand Down
Loading