mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-09-14 00:55:08 +00:00
Fixes lilked and reposted colors
This commit is contained in:
@@ -68,6 +68,8 @@ import com.vitorpamplona.amethyst.commons.resources.search_button
|
||||
import com.vitorpamplona.amethyst.commons.resources.website
|
||||
import com.vitorpamplona.amethyst.ui.stringRes
|
||||
import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
|
||||
import com.vitorpamplona.amethyst.ui.theme.LikedColor
|
||||
import com.vitorpamplona.amethyst.ui.theme.RepostedColor
|
||||
import com.vitorpamplona.amethyst.ui.theme.Size19Modifier
|
||||
import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
|
||||
import com.vitorpamplona.amethyst.ui.theme.Size30Modifier
|
||||
@@ -128,7 +130,7 @@ fun DownloadForOfflineIcon(
|
||||
@Composable
|
||||
fun LikedIcon(
|
||||
modifier: Modifier,
|
||||
tint: Color = Color.Unspecified,
|
||||
tint: Color = LikedColor,
|
||||
) {
|
||||
AmethystIconGlyph(
|
||||
symbol = AmethystIcons.Liked,
|
||||
@@ -180,7 +182,7 @@ fun RepostIcon(
|
||||
@Composable
|
||||
fun RepostedIcon(
|
||||
modifier: Modifier,
|
||||
tint: Color = Color.Unspecified,
|
||||
tint: Color = RepostedColor,
|
||||
) {
|
||||
AmethystIconGlyph(
|
||||
symbol = AmethystIcons.Reposted,
|
||||
|
||||
@@ -999,7 +999,11 @@ fun BoostReaction(
|
||||
},
|
||||
) {
|
||||
ObserveBoostIcon(baseNote, accountViewModel) { hasBoosted ->
|
||||
RepostedIcon(iconSizeModifier, if (hasBoosted) Color.Unspecified else grayTint)
|
||||
if (hasBoosted) {
|
||||
RepostedIcon(iconSizeModifier)
|
||||
} else {
|
||||
RepostIcon(iconSizeModifier)
|
||||
}
|
||||
}
|
||||
|
||||
if (wantsToBoost) {
|
||||
@@ -2724,7 +2728,7 @@ internal fun ZapRailIcon(
|
||||
val mono = MaterialTheme.colorScheme.onSurface
|
||||
val cashuSize = size * 0.86f
|
||||
when (rail) {
|
||||
ZapRail.CASHU ->
|
||||
ZapRail.CASHU -> {
|
||||
Material3Icon(
|
||||
imageVector = CustomHashTagIcons.Cashu,
|
||||
contentDescription = stringRes(Res.string.nutzap),
|
||||
@@ -2733,7 +2737,9 @@ internal fun ZapRailIcon(
|
||||
// same brand orange as the other rails when selected, else mono.
|
||||
tint = if (colored) BitcoinOrange else mono,
|
||||
)
|
||||
ZapRail.RELOAD ->
|
||||
}
|
||||
|
||||
ZapRail.RELOAD -> {
|
||||
// Funds exist but in the wrong mint — a dimmed cashu logo with a
|
||||
// small "+" badge; tapping it opens the top-up screen.
|
||||
Box(contentAlignment = Alignment.BottomEnd) {
|
||||
@@ -2750,20 +2756,25 @@ internal fun ZapRailIcon(
|
||||
tint = if (colored) BitcoinOrange else mono,
|
||||
)
|
||||
}
|
||||
ZapRail.LIGHTNING ->
|
||||
}
|
||||
|
||||
ZapRail.LIGHTNING -> {
|
||||
Icon(
|
||||
symbol = MaterialSymbols.Bolt,
|
||||
contentDescription = null,
|
||||
modifier = Modifier.size(size),
|
||||
tint = if (colored) BitcoinOrange else mono,
|
||||
)
|
||||
ZapRail.ONCHAIN ->
|
||||
}
|
||||
|
||||
ZapRail.ONCHAIN -> {
|
||||
Icon(
|
||||
symbol = MaterialSymbols.CurrencyBitcoin,
|
||||
contentDescription = null,
|
||||
modifier = Modifier.size(size),
|
||||
tint = if (colored) BitcoinOrange else mono,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@ import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.ui.Alignment.Companion.CenterVertically
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
@@ -119,7 +118,6 @@ private fun UserReactionModel(model: NotificationSummaryState) {
|
||||
private fun UserBoostModel(model: NotificationSummaryState) {
|
||||
RepostedIcon(
|
||||
modifier = Size24Modifier,
|
||||
tint = Color.Unspecified,
|
||||
)
|
||||
|
||||
Spacer(modifier = StdHorzSpacer)
|
||||
|
||||
@@ -43,6 +43,9 @@ val AccentPinkLight = Color(0xFFAD1457)
|
||||
val BitcoinOrange = Color(0xFFF7931A)
|
||||
val RoyalBlue = Color(0xFF4169E1)
|
||||
|
||||
val LikedColor = Color(0xFFCA395f)
|
||||
val RepostedColor = Color(0xFF59bc6d)
|
||||
|
||||
val BitcoinDark = Color(0xFFF7931A)
|
||||
val BitcoinLight = Color(0xFFB66605)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user