Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Closes #26870: remove layer behind wallpaper thumbnails #26871

Merged
merged 2 commits into from
Sep 7, 2022
Merged

Closes #26870: remove layer behind wallpaper thumbnails #26871

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4712ea3
Closes #26870: remove layer behind wallpaper thumbnails
MatthewTighe Sep 7, 2022
ab854fc
Merge branch 'main' into remove-layering-on-wallpaper-settings
mergify[bot] Sep 7, 2022
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
40 changes: 19 additions & 21 deletions app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,28 +159,26 @@ private fun WallpaperThumbnails(
numColumns: Int = 3,
onSelectWallpaper: (Wallpaper) -> Unit,
) {
Surface(color = FirefoxTheme.colors.layer2) {
Column(modifier = Modifier.padding(vertical = 30.dp, horizontal = 20.dp)) {
val numRows = (wallpapers.size + numColumns - 1) / numColumns
for (rowIndex in 0 until numRows) {
Row {
for (columnIndex in 0 until numColumns) {
val itemIndex = rowIndex * numColumns + columnIndex
if (itemIndex < wallpapers.size) {
Box(
modifier = Modifier.weight(1f, fill = true).padding(4.dp),
) {
WallpaperThumbnailItem(
wallpaper = wallpapers[itemIndex],
defaultWallpaper = defaultWallpaper,
loadWallpaperResource = loadWallpaperResource,
isSelected = selectedWallpaper == wallpapers[itemIndex],
onSelect = onSelectWallpaper
)
}
} else {
Spacer(Modifier.weight(1f))
Column(modifier = Modifier.padding(vertical = 30.dp, horizontal = 20.dp)) {
val numRows = (wallpapers.size + numColumns - 1) / numColumns
for (rowIndex in 0 until numRows) {
Row {
for (columnIndex in 0 until numColumns) {
val itemIndex = rowIndex * numColumns + columnIndex
if (itemIndex < wallpapers.size) {
Box(
modifier = Modifier.weight(1f, fill = true).padding(4.dp),
) {
WallpaperThumbnailItem(
wallpaper = wallpapers[itemIndex],
defaultWallpaper = defaultWallpaper,
loadWallpaperResource = loadWallpaperResource,
isSelected = selectedWallpaper == wallpapers[itemIndex],
onSelect = onSelectWallpaper
)
}
} else {
Spacer(Modifier.weight(1f))
}
}
}
Expand Down