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