Skip to content

Commit ddb20c2

Browse files
segunfamisapchevrel@mozilla.com
authored andcommitted
Bug 2039860 - Only apply selected semantics to bookmark items when in selection mode a=pascalc
Pull request: #294 Differential Revision: https://phabricator.services.mozilla.com/D310076
1 parent 1aa6b2b commit ddb20c2

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ private fun BookmarksList(
387387
)
388388
return@Scaffold
389389
}
390+
val inSelectionMode = state.selectedItems.isNotEmpty()
390391

391392
saveableStateHolder.SaveableStateProvider(state.currentFolder.guid) {
392393
LazyColumn(
@@ -418,7 +419,9 @@ private fun BookmarksList(
418419
beforeIconPainter = painterResource(iconsR.drawable.mozac_ic_folder_24),
419420
modifier = Modifier
420421
.semantics(mergeDescendants = true) {
421-
selected = isSelected
422+
if (inSelectionMode) {
423+
selected = isSelected
424+
}
422425
collectionItemInfo = CollectionItemInfo(
423426
rowIndex = index,
424427
rowSpan = 1,
@@ -442,7 +445,9 @@ private fun BookmarksList(
442445
beforeIconPainter = painterResource(iconsR.drawable.mozac_ic_folder_24),
443446
modifier = Modifier
444447
.semantics(mergeDescendants = true) {
445-
selected = isSelected
448+
if (inSelectionMode) {
449+
selected = isSelected
450+
}
446451
collectionItemInfo = CollectionItemInfo(
447452
rowIndex = index,
448453
rowSpan = 1,
@@ -498,7 +503,9 @@ private fun BookmarksList(
498503
onLongClick = { store.dispatch(BookmarkLongClicked(item)) },
499504
modifier = Modifier
500505
.semantics(mergeDescendants = true) {
501-
selected = isSelected
506+
if (inSelectionMode) {
507+
selected = isSelected
508+
}
502509
collectionItemInfo = CollectionItemInfo(
503510
rowIndex = index,
504511
rowSpan = 1,

0 commit comments

Comments
 (0)