Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Fix emoji icon scaling #408

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+13 −7
Open

Bugfix: Fix emoji icon scaling #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49b1d22
changed add emoji icon scaling
julian-wls Feb 12, 2025
5091010
Merge branch 'develop' into bugfix/fix-emoji-scaling
julian-wls Feb 13, 2025
2cda0ba
minor changes
julian-wls Feb 13, 2025
62fdd7d
minor changes
julian-wls Feb 17, 2025
995b2dc
adjustments
julian-wls Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/ui/src/main/kotlin/de/tum/informatics/www1/artemis/native_app/core/ui/Spacings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp

object Spacings {
val ScreenHorizontalSpacing = 16.dp
Expand All @@ -25,6 +26,9 @@ object Spacings {

val postHeadlineHeight = 36.dp
val emojiHeight = 27.dp
val emojiTextSize = 12.sp
// The size of the emoji icon to open the emoji picker (measured in sp to support font scaling)
val addEmojiIconSize = 18.sp
}

object AutoCompletePopup {
Expand Down
16 changes: 9 additions & 7 deletions ...de/tum/informatics/www1/artemis/native_app/feature/metis/conversation/ui/post/PostItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ import androidx.compose.ui.draw.drawWithCache
import androidx.compose.ui.graphics.BlendMode
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -592,14 +592,16 @@ private fun StandalonePostFooter(
modifier = modifier
.background(color = PostColors.EmojiChipColors.background, CircleShape)
.clip(CircleShape)
.sizeIn(minHeight = Spacings.Post.emojiHeight, minWidth = Spacings.Post.emojiHeight)
.padding(with(LocalDensity.current) { 5.sp.toDp() } )
.clickable(onClick = {
showEmojiDialog = true
})
) {
Icon(
modifier = Modifier
.sizeIn(minHeight = Spacings.Post.emojiHeight)
.padding(5.dp),
.align(Alignment.Center)
.size(with(LocalDensity.current) { Spacings.Post.addEmojiIconSize.toDp() } ),
imageVector = Icons.Default.InsertEmoticon,
contentDescription = null,
)
Expand Down Expand Up @@ -659,7 +661,7 @@ private fun AnimatedCounter(currentCount: Int, selected: Boolean) {
) { targetCount ->
Text(
text = "$targetCount",
fontSize = 12.sp,
fontSize = Spacings.Post.emojiTextSize,
color = if (selected) MaterialTheme.colorScheme.primary else Color.Unspecified
)
}
Expand Down Expand Up @@ -699,13 +701,13 @@ private fun EmojiChip(
) {
Row(
modifier = Modifier
.padding(2.dp)
.padding(horizontal = 4.dp),
.align(Alignment.Center)
.padding(horizontal = 6.dp, vertical = 1.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp)
) {
Text(
text = getUnicodeForEmojiId(emojiId = emojiId),
fontSize = 12.sp
fontSize = Spacings.Post.emojiTextSize
)

AnimatedCounter(reactionCount, selected)
Expand Down
Loading