highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-07-13 19:34:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes alignment of the like icons after the like event.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-05-14 19:26:47 -04:00
parent a34a3cbc83
commit a9eeb04014
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
View File

@ -78,6 +78,7 @@ import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
import com.vitorpamplona.amethyst.ui.theme.Font12SP import com.vitorpamplona.amethyst.ui.theme.Font12SP
import com.vitorpamplona.amethyst.ui.theme.HalfTopPadding import com.vitorpamplona.amethyst.ui.theme.HalfTopPadding
import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightChat import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightChat
import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
import com.vitorpamplona.amethyst.ui.theme.Size10dp import com.vitorpamplona.amethyst.ui.theme.Size10dp
import com.vitorpamplona.amethyst.ui.theme.Size15Modifier import com.vitorpamplona.amethyst.ui.theme.Size15Modifier
import com.vitorpamplona.amethyst.ui.theme.Size20dp import com.vitorpamplona.amethyst.ui.theme.Size20dp
@ -388,18 +389,21 @@ private fun MessageBubbleLines(
Spacer(modifier = DoubleHorzSpacer) Spacer(modifier = DoubleHorzSpacer)
}, },
secondColumn = { secondColumn = {
LikeReaction(baseNote, MaterialTheme.colorScheme.placeholderText, accountViewModel, nav) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = RowColSpacing) {
Spacer(modifier = StdHorzSpacer) LikeReaction(baseNote, MaterialTheme.colorScheme.placeholderText, accountViewModel, nav)
}
ZapReaction(baseNote, MaterialTheme.colorScheme.placeholderText, accountViewModel, nav = nav) ZapReaction(baseNote, MaterialTheme.colorScheme.placeholderText, accountViewModel, nav = nav)
Spacer(modifier = DoubleHorzSpacer) Spacer(modifier = StdHorzSpacer)
ReplyReaction( Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = RowColSpacing) {
baseNote = baseNote, ReplyReaction(
grayTint = MaterialTheme.colorScheme.placeholderText, baseNote = baseNote,
accountViewModel = accountViewModel, grayTint = MaterialTheme.colorScheme.placeholderText,
showCounter = false, accountViewModel = accountViewModel,
iconSizeModifier = Size15Modifier, showCounter = false,
) { iconSizeModifier = Size15Modifier,
onWantsToReply(baseNote) ) {
onWantsToReply(baseNote)
}
} }
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
}, },

6
app/src/main/java/com/vitorpamplona/amethyst/ui/note/ReactionsRow.kt
View File

@ -34,6 +34,7 @@ import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith import androidx.compose.animation.togetherWith
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@ -786,7 +787,6 @@ fun LikeReaction(
contentAlignment = Center, contentAlignment = Center,
modifier = modifier =
Modifier Modifier
.size(iconSize)
.combinedClickable( .combinedClickable(
role = Role.Button, role = Role.Button,
interactionSource = remember { MutableInteractionSource() }, interactionSource = remember { MutableInteractionSource() },
@ -879,8 +879,8 @@ private fun RenderReactionType(
} else { } else {
when (reactionType) { when (reactionType) {
"+" -> LikedIcon(iconSizeModifier) "+" -> LikedIcon(iconSizeModifier)
"-" -> Text(text = "\uD83D\uDC4E", fontSize = iconFontSize) "-" -> Text(text = "\uD83D\uDC4E", maxLines = 1, fontSize = iconFontSize)
else -> Text(text = reactionType, fontSize = iconFontSize) else -> Text(text = reactionType, maxLines = 1, fontSize = iconFontSize)
} }
} }
} }