Skip to content

Commit 08e69a0

Browse files
committed
Merge branch 'add-background-to-custom-lists-description-text-in-select-droid-827'
2 parents 86d0ce1 + b7ad5b6 commit 08e69a0

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ fun SelectLocationScreen(
320320
customLists(
321321
customLists = state.filteredCustomLists,
322322
selectedItem = state.selectedItem,
323+
backgroundColor = backgroundColor,
323324
onSelectRelay = onSelectRelay,
324325
onShowCustomListBottomSheet = {
325326
bottomSheetState =
@@ -375,6 +376,7 @@ private fun LazyListScope.loading() {
375376
private fun LazyListScope.customLists(
376377
customLists: List<RelayItem.CustomList>,
377378
selectedItem: RelayItem?,
379+
backgroundColor: Color,
378380
onSelectRelay: (item: RelayItem) -> Unit,
379381
onShowCustomListBottomSheet: () -> Unit,
380382
onShowEditBottomSheet: (RelayItem.CustomList) -> Unit
@@ -413,14 +415,16 @@ private fun LazyListScope.customLists(
413415
item {
414416
SwitchComposeSubtitleCell(
415417
text = stringResource(R.string.to_add_locations_to_a_list),
416-
modifier = Modifier.animateItemPlacement().animateContentSize()
418+
modifier =
419+
Modifier.background(backgroundColor).animateItemPlacement().animateContentSize()
417420
)
418421
}
419422
} else {
420423
item(contentType = ContentType.EMPTY_TEXT) {
421424
SwitchComposeSubtitleCell(
422425
text = stringResource(R.string.to_create_a_custom_list),
423-
modifier = Modifier.animateItemPlacement().animateContentSize()
426+
modifier =
427+
Modifier.background(backgroundColor).animateItemPlacement().animateContentSize()
424428
)
425429
}
426430
}

0 commit comments

Comments
 (0)