highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-04-08 11:58:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes alignment of reactions

Browse Source
This commit is contained in:
Vitor Pamplona 2024-06-11 10:00:26 -04:00
parent 609faf245a
commit 3a63c1d1ab
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,9 +116,10 @@ import com.vitorpamplona.amethyst.ui.theme.ModifierWidth3dp
import com.vitorpamplona.amethyst.ui.theme.NoSoTinyBorders
import com.vitorpamplona.amethyst.ui.theme.ReactionRowExpandButton
import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeight
import com.vitorpamplona.amethyst.ui.theme.ReactionRowZapraiserSize
import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightWithPadding
import com.vitorpamplona.amethyst.ui.theme.ReactionRowZapraiser
import com.vitorpamplona.amethyst.ui.theme.ReactionRowZapraiserWithPadding
import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
import com.vitorpamplona.amethyst.ui.theme.Size0dp
import com.vitorpamplona.amethyst.ui.theme.Size16Modifier
import com.vitorpamplona.amethyst.ui.theme.Size17Modifier
import com.vitorpamplona.amethyst.ui.theme.Size19Modifier
@ -126,7 +127,6 @@ import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
import com.vitorpamplona.amethyst.ui.theme.Size20dp
import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
import com.vitorpamplona.amethyst.ui.theme.Size24dp
import com.vitorpamplona.amethyst.ui.theme.Size75dp
import com.vitorpamplona.amethyst.ui.theme.TinyBorders
import com.vitorpamplona.amethyst.ui.theme.mediumImportanceLink
import com.vitorpamplona.amethyst.ui.theme.placeholderText
@ -229,28 +229,26 @@ private fun GenericInnerReactionRow(
Row(
verticalAlignment = CenterVertically,
horizontalArrangement = RowColSpacing,
modifier = ReactionRowHeight,
modifier = if (showReactionDetail) ReactionRowHeightWithPadding else ReactionRowHeight,
) {
val fullWeight = remember { Modifier.weight(1f) }
if (showReactionDetail) {
Row(
verticalAlignment = CenterVertically,
modifier = remember { ReactionRowExpandButton.then(fullWeight) },
modifier = ReactionRowExpandButton,
) {
one()
}
}
Row(verticalAlignment = CenterVertically, horizontalArrangement = RowColSpacing, modifier = fullWeight) { two() }
Row(verticalAlignment = CenterVertically, horizontalArrangement = RowColSpacing, modifier = Modifier.weight(1f)) { two() }
Row(verticalAlignment = CenterVertically, horizontalArrangement = RowColSpacing, modifier = fullWeight) { three() }
Row(verticalAlignment = CenterVertically, horizontalArrangement = RowColSpacing, modifier = Modifier.weight(1f)) { three() }
Row(verticalAlignment = CenterVertically, horizontalArrangement = RowColSpacing, modifier = fullWeight) { four() }
Row(verticalAlignment = CenterVertically, horizontalArrangement = RowColSpacing, modifier = Modifier.weight(1f)) { four() }
Row(verticalAlignment = CenterVertically, modifier = fullWeight) { five() }
Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) { five() }
Row(verticalAlignment = CenterVertically, modifier = fullWeight) { six() }
Row(verticalAlignment = CenterVertically, modifier = Modifier.weight(1f)) { six() }
}
}
@ -261,15 +259,10 @@ private fun LoadAndDisplayZapraiser(
wantsToSeeReactions: MutableState<Boolean>,
accountViewModel: AccountViewModel,
) {
val zapraiserAmount by
remember(baseNote) { derivedStateOf { baseNote.event?.zapraiserAmount() ?: 0 } }
val zapraiserAmount = baseNote.event?.zapraiserAmount() ?: 0
if (zapraiserAmount > 0) {
Box(
modifier =
remember {
ReactionRowZapraiserSize.padding(start = if (showReactionDetail) Size75dp else Size0dp)
},
modifier = if (showReactionDetail) ReactionRowZapraiserWithPadding else ReactionRowZapraiser,
contentAlignment = CenterStart,
) {
RenderZapRaiser(baseNote, zapraiserAmount, wantsToSeeReactions.value, accountViewModel)

7
app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt
View File

@ -141,7 +141,9 @@ val Size55Modifier = Modifier.size(55.dp)
val TinyBorders = Modifier.padding(2.dp)
val NoSoTinyBorders = Modifier.padding(start = 5.dp, end = 5.dp, top = 2.dp, bottom = 2.dp)
val ReactionRowZapraiserSize = Modifier.defaultMinSize(minHeight = 4.dp).fillMaxWidth()
val ReactionRowZapraiserWithPadding = Modifier.defaultMinSize(minHeight = 4.dp).padding(Size75dp).fillMaxWidth()
val ReactionRowZapraiser = Modifier.defaultMinSize(minHeight = 4.dp).fillMaxWidth()
val ReactionRowExpandButton = Modifier.width(65.dp).padding(start = 31.dp)
val WidthAuthorPictureModifier = Modifier.width(55.dp)
@ -151,7 +153,8 @@ val VideoReactionColumnPadding = Modifier.padding(bottom = 75.dp)
val DividerThickness = 0.25.dp
val ReactionRowHeight = Modifier.height(24.dp).padding(start = 10.dp)
val ReactionRowHeight = Modifier.height(24.dp)
val ReactionRowHeightWithPadding = Modifier.height(24.dp).padding(start = 10.dp)
val ReactionRowHeightChat = Modifier.height(25.dp)
val UserNameRowHeight = Modifier.fillMaxWidth()
val UserNameMaxRowHeight = Modifier.fillMaxWidth()