mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2024-09-30 00:40:49 +00:00
Improves color contrast for Zap Amount notifications in light mode
This commit is contained in:
parent
a3adadb251
commit
860f3bd096
@ -8,10 +8,12 @@ import androidx.compose.foundation.layout.Box
|
|||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.size
|
import androidx.compose.foundation.layout.size
|
||||||
import androidx.compose.foundation.layout.width
|
import androidx.compose.foundation.layout.width
|
||||||
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.material.Icon
|
import androidx.compose.material.Icon
|
||||||
import androidx.compose.material.MaterialTheme
|
import androidx.compose.material.MaterialTheme
|
||||||
import androidx.compose.material.Text
|
import androidx.compose.material.Text
|
||||||
@ -28,6 +30,7 @@ import androidx.compose.runtime.rememberCoroutineScope
|
|||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.clip
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.compositeOver
|
import androidx.compose.ui.graphics.compositeOver
|
||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
@ -237,7 +240,7 @@ private fun RenderBoostGallery(
|
|||||||
null,
|
null,
|
||||||
modifier = remember {
|
modifier = remember {
|
||||||
Modifier
|
Modifier
|
||||||
.size(18.dp)
|
.size(19.dp)
|
||||||
.align(Alignment.TopEnd)
|
.align(Alignment.TopEnd)
|
||||||
},
|
},
|
||||||
tint = Color.Unspecified
|
tint = Color.Unspecified
|
||||||
@ -352,18 +355,21 @@ private fun AuthorPictureAndComment(
|
|||||||
)
|
)
|
||||||
|
|
||||||
amount?.let {
|
amount?.let {
|
||||||
Box(
|
Box(modifier = Modifier.fillMaxSize().clip(shape = CircleShape), contentAlignment = Alignment.BottomCenter) {
|
||||||
modifier = Modifier
|
Box(
|
||||||
.fillMaxWidth()
|
modifier = Modifier
|
||||||
.background(MaterialTheme.colors.background.copy(0.52f)),
|
.fillMaxWidth()
|
||||||
contentAlignment = Alignment.BottomCenter
|
.background(MaterialTheme.colors.background.copy(0.62f)),
|
||||||
) {
|
contentAlignment = Alignment.BottomCenter
|
||||||
Text(
|
) {
|
||||||
text = it,
|
Text(
|
||||||
fontWeight = FontWeight.Bold,
|
text = it,
|
||||||
color = BitcoinOrange,
|
fontWeight = FontWeight.Bold,
|
||||||
fontSize = 12.sp
|
color = MaterialTheme.colors.secondaryVariant,
|
||||||
)
|
fontSize = 12.sp,
|
||||||
|
modifier = Modifier.padding(bottom = 1.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -44,6 +44,7 @@ import com.vitorpamplona.amethyst.service.model.RepostEvent
|
|||||||
import com.vitorpamplona.amethyst.service.model.TextNoteEvent
|
import com.vitorpamplona.amethyst.service.model.TextNoteEvent
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
|
||||||
import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
|
import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.RoyalBlue
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
@ -285,7 +286,7 @@ fun UserReplyReaction(
|
|||||||
painter = painterResource(R.drawable.ic_comment),
|
painter = painterResource(R.drawable.ic_comment),
|
||||||
null,
|
null,
|
||||||
modifier = Modifier.size(20.dp),
|
modifier = Modifier.size(20.dp),
|
||||||
tint = Color.Cyan
|
tint = RoyalBlue
|
||||||
)
|
)
|
||||||
|
|
||||||
Spacer(modifier = Modifier.width(10.dp))
|
Spacer(modifier = Modifier.width(10.dp))
|
||||||
|
@ -52,6 +52,7 @@ import com.vitorpamplona.amethyst.ui.screen.CardFeedView
|
|||||||
import com.vitorpamplona.amethyst.ui.screen.NotificationViewModel
|
import com.vitorpamplona.amethyst.ui.screen.NotificationViewModel
|
||||||
import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys
|
import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys
|
||||||
import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
|
import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.RoyalBlue
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import java.math.BigDecimal
|
import java.math.BigDecimal
|
||||||
@ -131,7 +132,7 @@ fun SummaryBar(model: UserReactionsViewModel) {
|
|||||||
|
|
||||||
val lineChartCount =
|
val lineChartCount =
|
||||||
lineChart(
|
lineChart(
|
||||||
lines = listOf(Color.Cyan, Color.Green, Color.Red).map { lineChartColor ->
|
lines = listOf(RoyalBlue, Color.Green, Color.Red).map { lineChartColor ->
|
||||||
LineChart.LineSpec(
|
LineChart.LineSpec(
|
||||||
lineColor = lineChartColor.toArgb(),
|
lineColor = lineChartColor.toArgb(),
|
||||||
lineBackgroundShader = DynamicShaders.fromBrush(
|
lineBackgroundShader = DynamicShaders.fromBrush(
|
||||||
|
@ -7,6 +7,7 @@ val Purple500 = Color(0xFF6200EE)
|
|||||||
val Purple700 = Color(0xFF3700B3)
|
val Purple700 = Color(0xFF3700B3)
|
||||||
val Teal200 = Color(0xFF03DAC5)
|
val Teal200 = Color(0xFF03DAC5)
|
||||||
val BitcoinOrange = Color(0xFFF7931A)
|
val BitcoinOrange = Color(0xFFF7931A)
|
||||||
|
val RoyalBlue = Color(0xFF4169E1)
|
||||||
|
|
||||||
val Following = Color(0xFF03DAC5)
|
val Following = Color(0xFF03DAC5)
|
||||||
val Nip05 = Color(0xFF01BAFF)
|
val Nip05 = Color(0xFF01BAFF)
|
||||||
|
@ -7,19 +7,22 @@ import androidx.compose.material.darkColors
|
|||||||
import androidx.compose.material.lightColors
|
import androidx.compose.material.lightColors
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.SideEffect
|
import androidx.compose.runtime.SideEffect
|
||||||
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.graphics.toArgb
|
import androidx.compose.ui.graphics.toArgb
|
||||||
import androidx.compose.ui.platform.LocalView
|
import androidx.compose.ui.platform.LocalView
|
||||||
|
|
||||||
private val DarkColorPalette = darkColors(
|
private val DarkColorPalette = darkColors(
|
||||||
primary = Purple200,
|
primary = Purple200,
|
||||||
primaryVariant = Purple700,
|
primaryVariant = Purple700,
|
||||||
secondary = Teal200
|
secondary = Teal200,
|
||||||
|
secondaryVariant = Color(0xFFF7931A)
|
||||||
)
|
)
|
||||||
|
|
||||||
private val LightColorPalette = lightColors(
|
private val LightColorPalette = lightColors(
|
||||||
primary = Purple500,
|
primary = Purple500,
|
||||||
primaryVariant = Purple700,
|
primaryVariant = Purple700,
|
||||||
secondary = Teal200
|
secondary = Teal200,
|
||||||
|
secondaryVariant = Color(0xFFB66605)
|
||||||
|
|
||||||
/* Other default colors to override
|
/* Other default colors to override
|
||||||
background = Color.White,
|
background = Color.White,
|
||||||
|
Loading…
Reference in New Issue
Block a user