Fixes the spacing in the Like button

This commit is contained in:
Vitor Pamplona
2024-05-17 17:00:19 -04:00
parent 5c88e7993f
commit 4a6ea550d6
3 changed files with 58 additions and 32 deletions
@@ -47,6 +47,7 @@ import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Alignment.Companion.BottomStart import androidx.compose.ui.Alignment.Companion.BottomStart
import androidx.compose.ui.Alignment.Companion.Center import androidx.compose.ui.Alignment.Companion.Center
import androidx.compose.ui.Alignment.Companion.CenterVertically import androidx.compose.ui.Alignment.Companion.CenterVertically
@@ -83,6 +84,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
import com.vitorpamplona.amethyst.ui.theme.HalfPadding import com.vitorpamplona.amethyst.ui.theme.HalfPadding
import com.vitorpamplona.amethyst.ui.theme.QuoteBorder import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
import com.vitorpamplona.amethyst.ui.theme.Size35dp import com.vitorpamplona.amethyst.ui.theme.Size35dp
import com.vitorpamplona.amethyst.ui.theme.Size5dp import com.vitorpamplona.amethyst.ui.theme.Size5dp
import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer
@@ -585,12 +587,17 @@ fun RenderCommunitiesThumb(
) )
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
LikeReaction( Row(
baseNote = baseNote, verticalAlignment = Alignment.CenterVertically,
grayTint = MaterialTheme.colorScheme.onSurface, horizontalArrangement = RowColSpacing,
accountViewModel = accountViewModel, ) {
nav, LikeReaction(
) baseNote = baseNote,
grayTint = MaterialTheme.colorScheme.onSurface,
accountViewModel = accountViewModel,
nav,
)
}
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
ZapReaction( ZapReaction(
baseNote = baseNote, baseNote = baseNote,
@@ -782,12 +789,17 @@ fun RenderContentDVMThumb(
) )
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
LikeReaction( Row(
baseNote = baseNote, verticalAlignment = Alignment.CenterVertically,
grayTint = MaterialTheme.colorScheme.onSurface, horizontalArrangement = RowColSpacing,
accountViewModel = accountViewModel, ) {
nav, LikeReaction(
) baseNote = baseNote,
grayTint = MaterialTheme.colorScheme.onSurface,
accountViewModel = accountViewModel,
nav,
)
}
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
ZapReaction( ZapReaction(
baseNote = baseNote, baseNote = baseNote,
@@ -895,14 +907,18 @@ fun RenderChannelThumb(
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) )
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
LikeReaction( Row(
baseNote = baseNote, verticalAlignment = Alignment.CenterVertically,
grayTint = MaterialTheme.colorScheme.onSurface, horizontalArrangement = RowColSpacing,
accountViewModel = accountViewModel, ) {
nav, LikeReaction(
) baseNote = baseNote,
grayTint = MaterialTheme.colorScheme.onSurface,
accountViewModel = accountViewModel,
nav,
)
}
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
ZapReaction( ZapReaction(
baseNote = baseNote, baseNote = baseNote,
@@ -67,6 +67,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.LeaveCommunityButton
import com.vitorpamplona.amethyst.ui.screen.loggedIn.NormalTimeAgo import com.vitorpamplona.amethyst.ui.screen.loggedIn.NormalTimeAgo
import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
import com.vitorpamplona.amethyst.ui.theme.HeaderPictureModifier import com.vitorpamplona.amethyst.ui.theme.HeaderPictureModifier
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.Size25dp import com.vitorpamplona.amethyst.ui.theme.Size25dp
import com.vitorpamplona.amethyst.ui.theme.Size35dp import com.vitorpamplona.amethyst.ui.theme.Size35dp
@@ -310,12 +311,17 @@ private fun ShortCommunityActionOptions(
nav: (String) -> Unit, nav: (String) -> Unit,
) { ) {
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
LikeReaction( Row(
baseNote = note, verticalAlignment = Alignment.CenterVertically,
grayTint = MaterialTheme.colorScheme.onSurface, horizontalArrangement = RowColSpacing,
accountViewModel = accountViewModel, ) {
nav = nav, LikeReaction(
) baseNote = note,
grayTint = MaterialTheme.colorScheme.onSurface,
accountViewModel = accountViewModel,
nav = nav,
)
}
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
ZapReaction( ZapReaction(
baseNote = note, baseNote = note,
@@ -323,7 +329,6 @@ private fun ShortCommunityActionOptions(
accountViewModel = accountViewModel, accountViewModel = accountViewModel,
nav = nav, nav = nav,
) )
WatchAddressableNoteFollows(note, accountViewModel) { isFollowing -> WatchAddressableNoteFollows(note, accountViewModel) { isFollowing ->
if (!isFollowing) { if (!isFollowing) {
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
@@ -1080,12 +1080,17 @@ private fun LiveChannelActionOptions(
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
} }
LikeReaction( Row(
baseNote = it, verticalAlignment = Alignment.CenterVertically,
grayTint = MaterialTheme.colorScheme.onSurface, horizontalArrangement = RowColSpacing,
accountViewModel = accountViewModel, ) {
nav, LikeReaction(
) baseNote = it,
grayTint = MaterialTheme.colorScheme.onSurface,
accountViewModel = accountViewModel,
nav,
)
}
Spacer(modifier = StdHorzSpacer) Spacer(modifier = StdHorzSpacer)
ZapReaction( ZapReaction(
baseNote = it, baseNote = it,