Fixes the padding of the reaction row on quotes

This commit is contained in:
Vitor Pamplona
2024-06-11 18:51:47 -04:00
parent 957ad1e0db
commit 42e11d239d
3 changed files with 8 additions and 3 deletions

View File

@@ -506,6 +506,7 @@ fun InnerNoteWithReactions(
ReactionsRow(
baseNote = baseNote,
showReactionDetail = notBoostedNorQuote,
addPadding = !isBoostedNote,
editState = editState,
accountViewModel = accountViewModel,
nav = nav,

View File

@@ -147,6 +147,7 @@ import kotlin.math.roundToInt
fun ReactionsRow(
baseNote: Note,
showReactionDetail: Boolean,
addPadding: Boolean,
editState: State<GenericLoadable<EditState>>,
accountViewModel: AccountViewModel,
nav: (String) -> Unit,
@@ -155,7 +156,7 @@ fun ReactionsRow(
Spacer(modifier = HalfDoubleVertSpacer)
InnerReactionRow(baseNote, showReactionDetail, wantsToSeeReactions, editState, accountViewModel, nav)
InnerReactionRow(baseNote, showReactionDetail, addPadding, wantsToSeeReactions, editState, accountViewModel, nav)
Spacer(modifier = HalfDoubleVertSpacer)
@@ -171,6 +172,7 @@ fun ReactionsRow(
private fun InnerReactionRow(
baseNote: Note,
showReactionDetail: Boolean,
addPadding: Boolean,
wantsToSeeReactions: MutableState<Boolean>,
editState: State<GenericLoadable<EditState>>,
accountViewModel: AccountViewModel,
@@ -178,6 +180,7 @@ private fun InnerReactionRow(
) {
GenericInnerReactionRow(
showReactionDetail = showReactionDetail,
addPadding = addPadding,
one = {
WatchReactionsZapsBoostsAndDisplayIfExists(baseNote) {
RenderShowIndividualReactionsButton(wantsToSeeReactions)
@@ -219,6 +222,7 @@ private fun InnerReactionRow(
@Composable
private fun GenericInnerReactionRow(
showReactionDetail: Boolean,
addPadding: Boolean,
one: @Composable () -> Unit,
two: @Composable () -> Unit,
three: @Composable () -> Unit,
@@ -229,7 +233,7 @@ private fun GenericInnerReactionRow(
Row(
verticalAlignment = CenterVertically,
horizontalArrangement = RowColSpacing,
modifier = if (showReactionDetail) ReactionRowHeightWithPadding else ReactionRowHeight,
modifier = if (addPadding) ReactionRowHeightWithPadding else ReactionRowHeight,
) {
if (showReactionDetail) {
Row(

View File

@@ -651,7 +651,7 @@ fun NoteMaster(
}
}
ReactionsRow(note, true, editState, accountViewModel, nav)
ReactionsRow(note, true, true, editState, accountViewModel, nav)
}
NoteQuickActionMenu(