diff --git a/mobile/src/main/java/ru/omni_devel/cards/SelectIconActivity.kt b/mobile/src/main/java/ru/omni_devel/cards/SelectIconActivity.kt index a4987d4..96496d6 100644 --- a/mobile/src/main/java/ru/omni_devel/cards/SelectIconActivity.kt +++ b/mobile/src/main/java/ru/omni_devel/cards/SelectIconActivity.kt @@ -169,65 +169,61 @@ fun SelectIconPage(innerPadding: PaddingValues) { Text(stringResource(R.string.icons_not_found)) } } else { - for (chunk in searchResults.chunked(2)) { + for (iconData in searchResults) { + val loadedIcon = loadedIcons[iconData.iconId] + item { - Row( - horizontalArrangement = Arrangement.spacedBy(8.dp) - ) { - for (iconData in chunk) { - val loadedIcon = loadedIcons[iconData.iconId] + AdaptiveButton( + modifier = Modifier + .fillMaxWidth() + .height(64.dp), + 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( - modifier = Modifier.weight(1f).height(64.dp), - 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() - - 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 - ) + 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 + ) + ) + } } } }