Improves color contrast for Zap Amount notifications in light mode

app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt

@@ -8,10 +8,12 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
@@ -28,6 +30,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.painterResource
@@ -237,7 +240,7 @@ private fun RenderBoostGallery(
                 null,
                 modifier = remember {
                     Modifier
-                        .size(18.dp)
+                        .size(19.dp)
                         .align(Alignment.TopEnd)
                 },
                 tint = Color.Unspecified
@@ -352,18 +355,21 @@ private fun AuthorPictureAndComment(
             )
 
             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)
+                        )
+                    }
                 }
             }
         }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserReactionsRow.kt

@@ -44,6 +44,7 @@ import com.vitorpamplona.amethyst.service.model.RepostEvent
 import com.vitorpamplona.amethyst.service.model.TextNoteEvent
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.showAmountAxis
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import com.vitorpamplona.amethyst.ui.theme.RoyalBlue
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -285,7 +286,7 @@ fun UserReplyReaction(
         painter = painterResource(R.drawable.ic_comment),
         null,
         modifier = Modifier.size(20.dp),
-        tint = Color.Cyan
+        tint = RoyalBlue
     )
 
     Spacer(modifier = Modifier.width(10.dp))

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt

@@ -52,6 +52,7 @@ import com.vitorpamplona.amethyst.ui.screen.CardFeedView
 import com.vitorpamplona.amethyst.ui.screen.NotificationViewModel
 import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
+import com.vitorpamplona.amethyst.ui.theme.RoyalBlue
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.math.BigDecimal
@@ -131,7 +132,7 @@ fun SummaryBar(model: UserReactionsViewModel) {
 
     val lineChartCount =
         lineChart(
-            lines = listOf(Color.Cyan, Color.Green, Color.Red).map { lineChartColor ->
+            lines = listOf(RoyalBlue, Color.Green, Color.Red).map { lineChartColor ->
                 LineChart.LineSpec(
                     lineColor = lineChartColor.toArgb(),
                     lineBackgroundShader = DynamicShaders.fromBrush(

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Color.kt

@@ -7,6 +7,7 @@ val Purple500 = Color(0xFF6200EE)
 val Purple700 = Color(0xFF3700B3)
 val Teal200 = Color(0xFF03DAC5)
 val BitcoinOrange = Color(0xFFF7931A)
+val RoyalBlue = Color(0xFF4169E1)
 
 val Following = Color(0xFF03DAC5)
 val Nip05 = Color(0xFF01BAFF)

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt

@@ -7,19 +7,22 @@ import androidx.compose.material.darkColors
 import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalView
 
 private val DarkColorPalette = darkColors(
     primary = Purple200,
     primaryVariant = Purple700,
-    secondary = Teal200
+    secondary = Teal200,
+    secondaryVariant = Color(0xFFF7931A)
 )
 
 private val LightColorPalette = lightColors(
     primary = Purple500,
     primaryVariant = Purple700,
-    secondary = Teal200
+    secondary = Teal200,
+    secondaryVariant = Color(0xFFB66605)
 
   /* Other default colors to override
     background = Color.White,