RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge d83ed57352 into 584ce90b64

This commit is contained in:
Gabriel 2026-06-16 21:03:23 +01:00 committed by GitHub
parent 584ce90b64 d83ed57352
commit 4518bbe4e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/chat/stoat/composables/emoji/EmojiPicker.kt
View File

@ -492,8 +492,8 @@ fun EmojiPicker(
LazyVerticalGrid( LazyVerticalGrid(
state = gridState, state = gridState,
columns = GridCells.Fixed(spanCount), columns = GridCells.Fixed(spanCount),
horizontalArrangement = Arrangement.spacedBy(4.dp), horizontalArrangement = Arrangement.spacedBy(2.dp),
verticalArrangement = Arrangement.spacedBy(4.dp), verticalArrangement = Arrangement.spacedBy(2.dp),
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) { ) {
if (searchResults.isNotEmpty()) { if (searchResults.isNotEmpty()) {
@ -589,18 +589,16 @@ fun ColumnScope.PickerItem(
is EmojiPickerItem.UnicodeEmoji -> { is EmojiPickerItem.UnicodeEmoji -> {
Column( Column(
modifier = Modifier modifier = Modifier
.clip(CircleShape) .aspectRatio(1f)
.clickable { .clickable {
onClick(item) onClick(item)
} },
.aspectRatio(1f)
.weight(1f),
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center verticalArrangement = Arrangement.Center
) { ) {
Text( Text(
text = skinToneFactory(item), text = skinToneFactory(item),
style = LocalTextStyle.current.copy(fontSize = 20.sp) style = LocalTextStyle.current.copy(fontSize = 22.sp)
) )
} }
} }
@ -608,13 +606,11 @@ fun ColumnScope.PickerItem(
is EmojiPickerItem.ServerEmote -> { is EmojiPickerItem.ServerEmote -> {
Column( Column(
modifier = Modifier modifier = Modifier
.clip(CircleShape) .aspectRatio(1f)
.combinedClickable( .combinedClickable(
onClick = { onClick(item) }, onClick = { onClick(item) },
onLongClick = { item.emote.id?.let { onServerEmoteInfo(it) } } onLongClick = { item.emote.id?.let { onServerEmoteInfo(it) } }
) ),
.aspectRatio(1f)
.weight(1f),
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center verticalArrangement = Arrangement.Center
) { ) {
@ -624,7 +620,7 @@ fun ColumnScope.PickerItem(
contentScale = ContentScale.Fit, contentScale = ContentScale.Fit,
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(8.dp) .padding(4.dp)
) )
} }
} }