Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17ac8d18a3 | ||
|
|
c80958f339 |
@@ -113,7 +113,7 @@ fun SelectIconPage(innerPadding: PaddingValues) {
|
||||
queryCleaned = queryCleaned.replace(from, to)
|
||||
}
|
||||
|
||||
val searchResults = iconsData!!.filter { iconData ->
|
||||
val searchResults = iconsData?.filter { iconData ->
|
||||
if (queryCleaned.isEmpty()) {
|
||||
return@filter true
|
||||
}
|
||||
@@ -131,7 +131,7 @@ fun SelectIconPage(innerPadding: PaddingValues) {
|
||||
}
|
||||
|
||||
return@filter false
|
||||
}
|
||||
} ?: emptyList()
|
||||
|
||||
Page(context.getString(R.string.choosing_icon), innerPadding) {
|
||||
OutlinedTextField(
|
||||
@@ -169,16 +169,14 @@ fun SelectIconPage(innerPadding: PaddingValues) {
|
||||
Text(stringResource(R.string.icons_not_found))
|
||||
}
|
||||
} else {
|
||||
for (chunk in searchResults.chunked(2)) {
|
||||
item {
|
||||
Row(
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||
) {
|
||||
for (iconData in chunk) {
|
||||
for (iconData in searchResults) {
|
||||
val loadedIcon = loadedIcons[iconData.iconId]
|
||||
|
||||
item {
|
||||
AdaptiveButton(
|
||||
modifier = Modifier.weight(1f).height(64.dp),
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(64.dp),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
onClick = {
|
||||
if (loadedIcon == null && iconData.iconId != null) {
|
||||
@@ -234,5 +232,3 @@ fun SelectIconPage(innerPadding: PaddingValues) {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user