fix(mcap): use activeMarker as key for persistent markers

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/TokenInfoScreen.kt

@@ -217,6 +217,7 @@ private fun BottomBar(
     Row(
         modifier = Modifier
             .fillMaxWidth()
+            .navigationBarsPadding()
             .hazeEffect(
                 state = hazeState,
                 style = HazeMaterials.ultraThin(
@@ -225,12 +226,11 @@ private fun BottomBar(
             ) {
                 this.blurRadius = 20.dp
                 this.progressive = HazeProgressive.LinearGradient(
-                    startIntensity = 0.5f,
+                    startIntensity = 1f,
                     endIntensity = 1f
                 )
             }
             .padding(horizontal = CodeTheme.dimens.inset)
-            .navigationBarsPadding()
             .padding(vertical = CodeTheme.dimens.grid.x3),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2),

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/components/marketcap/MarketCapChart.kt

@@ -50,6 +50,7 @@ import com.patrykandpatrick.vico.compose.cartesian.marker.rememberDefaultCartesi
 import com.patrykandpatrick.vico.compose.cartesian.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.cartesian.rememberVicoScrollState
 import com.patrykandpatrick.vico.compose.common.component.rememberTextComponent
+import com.patrykandpatrick.vico.compose.common.component.shapeComponent
 import com.patrykandpatrick.vico.compose.common.fill
 import com.patrykandpatrick.vico.core.cartesian.data.CartesianChartModelProducer
 import com.patrykandpatrick.vico.core.cartesian.data.lineSeries
@@ -271,7 +272,7 @@ private fun MarketCapChartContent(
                 ),
             ),
         ),
-        persistentMarkers = remember(isDragging, persistentMarker) {
+        persistentMarkers = remember(isDragging, persistentMarker, activeMarker) {
             if (isDragging) {
                 { persistentMarker at 99.0 }
             } else {
@@ -296,10 +297,10 @@ private fun MarketCapChartContent(
 
 @Composable
 private fun rememberChartMarker(
-    strokeFill: Color = Color.Unspecified,
-    outerFill: Color = strokeFill.takeIf { it.isSpecified }?.copy(0.20f) ?: Color.Transparent,
+    strokeFill: Color? = null,
 ): CartesianMarker {
     val markerFill = CodeTheme.colors.background
+    val outerFill: Color = strokeFill?.copy(0.20f) ?: Color.Transparent
 
     return rememberDefaultCartesianMarker(
         label = rememberTextComponent(
@@ -308,14 +309,16 @@ private fun rememberChartMarker(
         valueFormatter = remember {
             DefaultCartesianMarker.ValueFormatter.default(colorCode = false)
         },
-        indicator = { color ->
-            outerFillShapeComponent(
-                outerFill = fill(outerFill),
-                margins = Insets(6f),
-                innerFill = fill(markerFill),
-                strokeFill = fill(strokeFill.takeIf { it.isSpecified } ?: color),
-                strokeThickness = 2.dp,
-            )
+        indicator = remember(strokeFill) {
+            { color ->
+                outerFillShapeComponent(
+                    outerFill = fill(outerFill),
+                    margins = Insets(6f),
+                    innerFill = fill(markerFill),
+                    strokeFill = fill(strokeFill ?: color),
+                    strokeThickness = 2.dp,
+                )
+            }
         },
         indicatorSize = CodeTheme.dimens.grid.x3,
         guideline = null,

apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/internal/components/marketcap/ShowOnLongPress.kt

@@ -5,9 +5,7 @@ import androidx.compose.runtime.remember
 import com.patrykandpatrick.vico.core.cartesian.marker.CartesianMarker
 import com.patrykandpatrick.vico.core.cartesian.marker.CartesianMarkerController
 import com.patrykandpatrick.vico.core.cartesian.marker.Interaction
-import kotlin.concurrent.atomics.ExperimentalAtomicApi
 
-@OptIn(ExperimentalAtomicApi::class)
 private class ShowOnLongPress : CartesianMarkerController {
 
     private var isPressed = false