fimkov/OmniCards
1
0
Fork 0
forked from omni/OmniCards
Code Pull Requests Activity

fix: removed card icons chunking

Browse Source
This commit is contained in:
omni
2026-06-23 15:15:59 +03:00
parent 8fe59df6f9
commit c80958f339
1 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/java/ru/omni_devel/cards/SelectIconActivity.kt
+49 -53
View File
@@ -169,65 +169,61 @@ 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) {
val loadedIcon = loadedIcons[iconData.iconId]
item { item {
Row( AdaptiveButton(
horizontalArrangement = Arrangement.spacedBy(8.dp) modifier = Modifier
) { .fillMaxWidth()
for (iconData in chunk) { .height(64.dp),
val loadedIcon = loadedIcons[iconData.iconId] contentPadding = PaddingValues(0.dp),
onClick = {
if (loadedIcon == null && iconData.iconId != null) {
Toast.makeText(
context,
context.getString(R.string.wait_for_icon_load),
Toast.LENGTH_SHORT
).show()
} else {
val intent = Intent()
AdaptiveButton( if (loadedIcon != null) {
modifier = Modifier.weight(1f).height(64.dp), intent.putExtra(
contentPadding = PaddingValues(0.dp), "icon",
onClick = { imageBitmapToBase64(loadedIcon)
if (loadedIcon == null && iconData.iconId != null) {
Toast.makeText(
context,
context.getString(R.string.wait_for_icon_load),
Toast.LENGTH_SHORT
).show()
} else {
val intent = Intent()
if (loadedIcon != null) {
intent.putExtra(
"icon",
imageBitmapToBase64(loadedIcon)
)
}
activityContext!!.setResult(
Activity.RESULT_OK,
intent
)
activityContext.finish()
}
}
) {
Row(
modifier = Modifier
.fillMaxSize()
.background(Color.Transparent)
.padding(horizontal = 8.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
CardIcon(
loadedIcon,
MaterialTheme.colorScheme.primary,
loadedIcon == null && iconData.iconId != null
)
Text(
selectItemNameViaLanguage(
iconData.names,
language
)
) )
} }
activityContext!!.setResult(
Activity.RESULT_OK,
intent
)
activityContext.finish()
} }
} }
) {
Row(
modifier = Modifier
.fillMaxSize()
.background(Color.Transparent)
.padding(horizontal = 8.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
CardIcon(
loadedIcon,
MaterialTheme.colorScheme.primary,
loadedIcon == null && iconData.iconId != null
)
Text(
selectItemNameViaLanguage(
iconData.names,
language
)
)
}
} }
} }
} }