chore(ocp): rename formatting param to rule for Fiat#formatted

bmc08gt · bmc08gt · commit 4e5962b515d1 · 2025-11-12T13:40:49.000-05:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/money/FormatUtils.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/money/FormatUtils.kt
@@ -40,6 +40,6 @@ fun Int.withCommas(): String {
     return this.toString().reversed().chunked(3).joinToString(",").reversed()
 }
 
-fun LocalFiat.formatted(formatting: Fiat.Formatting = Fiat.Formatting.None): String {
-    return nativeAmount.formatted(formatting = formatting)
+fun LocalFiat.formatted(formatting: Fiat.FormattingRule = Fiat.FormattingRule.None): String {
+    return nativeAmount.formatted(rule = formatting)
 }
diff --git a/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/betting/components/BidOptions.kt b/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/betting/components/BidOptions.kt
@@ -46,14 +46,12 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEach
 import com.flipcash.app.core.pools.PoolBetOutcome
 import com.flipcash.app.core.pools.PoolResolution
 import com.flipcash.app.core.pools.label
 import com.flipcash.app.core.pools.winningOutcome
-import com.flipcash.app.core.ui.FlagWithFiat
 import com.flipcash.features.pools.R
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.theme.CodeTheme
@@ -215,7 +213,7 @@ internal fun BidOptions(
 
         if (canBid && selectedOutcome == null) {
             val buyInAmount = buyIn.formatted(
-                formatting = Fiat.Formatting.Truncated
+                rule = Fiat.FormattingRule.Truncated
             )
 
             val label = stringResource(R.string.subtitle_poolNotYetBet, buyInAmount)
diff --git a/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/list/components/CompletedPoolStatusRow.kt b/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/list/components/CompletedPoolStatusRow.kt
@@ -61,7 +61,7 @@ internal fun CompletedPoolStatusRow(
                                 stringResource(
                                     R.string.subtitle_wonPool,
                                     summary.amountWon.formatted(
-                                        formatting = Fiat.Formatting.Truncated
+                                        rule = Fiat.FormattingRule.Truncated
                                     )
                                 ),
                                 style = CodeTheme.typography.textSmall,
@@ -80,7 +80,7 @@ internal fun CompletedPoolStatusRow(
                             stringResource(
                                 R.string.subtitle_lostPool,
                                 summary.amount.formatted(
-                                    formatting = Fiat.Formatting.Truncated
+                                    rule = Fiat.FormattingRule.Truncated
                                 )
                             ),
                             style = CodeTheme.typography.textSmall,
diff --git a/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/list/components/PoolSummaryRow.kt b/apps/flipcash/features/pools/src/main/kotlin/com/flipcash/app/pools/internal/list/components/PoolSummaryRow.kt
@@ -87,7 +87,7 @@ internal fun PoolSummaryRow(
                     text = stringResource(
                         R.string.subtitle_totalInPool,
                         pool.totalPoolAmount.formatted(
-                            formatting = Fiat.Formatting.Truncated
+                            rule = Fiat.FormattingRule.Truncated
                         )
                     ),
                     style = CodeTheme.typography.textSmall,
diff --git a/apps/flipcash/features/purchase/src/main/kotlin/com/flipcash/app/purchase/internal/PurchaseAccountViewModel.kt b/apps/flipcash/features/purchase/src/main/kotlin/com/flipcash/app/purchase/internal/PurchaseAccountViewModel.kt
@@ -131,7 +131,7 @@ internal class PurchaseAccountViewModel @Inject constructor(
         stateFlow
             .mapNotNull { it.costOfAccount }
             .map { (amount, currency) -> Fiat(amount, currency) }
-            .onEach { dispatchEvent(Event.OnPriceFormatted(it.formatted(formatting = Fiat.Formatting.Truncated))) }
+            .onEach { dispatchEvent(Event.OnPriceFormatted(it.formatted(rule = Fiat.FormattingRule.Truncated))) }
             .launchIn(viewModelScope)
 
         eventFlow
diff --git a/apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/components/FeedItemDetails.kt b/apps/flipcash/features/transactions/src/main/kotlin/com/flipcash/app/transactions/internal/components/FeedItemDetails.kt
@@ -16,7 +16,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.text.font.FontWeight.Companion.W600
 import androidx.compose.ui.text.style.TextOverflow
-import com.flipcash.app.core.feed.ActivityFeedMessage
 import com.flipcash.app.core.feed.ActivityFeedMessageWithToken
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.solana.keys.Mint
@@ -91,7 +90,7 @@ internal fun FeedItemDetails(
                     modifier = Modifier.weight(1f),
                     label = "USDC",
                     value = usdcAmount.formatted(
-                        formatting = Fiat.Formatting.Length(
+                        rule = Fiat.FormattingRule.Length(
                             token?.decimals ?: 6
                         )
                     ),
diff --git a/apps/flipcash/shared/bill-customization/src/main/kotlin/com/flipcash/app/bill/customization/BillPlaygroundController.kt b/apps/flipcash/shared/bill-customization/src/main/kotlin/com/flipcash/app/bill/customization/BillPlaygroundController.kt
@@ -9,6 +9,7 @@ import com.getcode.opencode.model.financial.Token
 import com.getcode.ui.utils.hexToColor
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import java.util.UUID
 
 interface BillPlaygroundController {
     val state: StateFlow<State>
@@ -26,6 +27,7 @@ enum class PlaygroundMode {
 data class ColorStore(
     val committed: Color,
     val transition: Color? = null,
+    val id: String = UUID.randomUUID().toString(),
 ) {
     constructor(color: Color): this (color, null)
     constructor(color: String): this (hexToColor(color))
@@ -69,10 +71,10 @@ sealed interface Event {
     data object Undo: Event
 }
 
-private const val MaxGradientColors = 3
+internal const val MaxGradientColors = 3
 
 @OptIn(ExperimentalStdlibApi::class)
-private val PresetColorOptions: List<BillBackground.Solid> = listOf(
+internal val PresetColorOptions: List<BillBackground.Solid> = listOf(
     BillBackground.Solid("#FFFF453A"), // Red
     BillBackground.Solid("#FFFF9F0A"), // Orange
     BillBackground.Solid("#FFFFD60A"), // Yellow
@@ -87,7 +89,7 @@ private val PresetColorOptions: List<BillBackground.Solid> = listOf(
     BillBackground.Solid("#FF8B4513"), // Brown
 )
 
-private val PresetGradients: List<BillBackground.Gradient> = listOf(
+internal val PresetGradients: List<BillBackground.Gradient> = listOf(
     BillBackground.Gradient(listOf("#FFE2EAF3", "#FF5487C1")),
     BillBackground.Gradient(listOf("#FFCDB3FF", "#FFECE0E5", "#FFFB9655")),
     BillBackground.Gradient(listOf("#FFFFD5E7", "#FF31D9AA")),
@@ -96,7 +98,7 @@ private val PresetGradients: List<BillBackground.Gradient> = listOf(
     BillBackground.Gradient(listOf("#FF4F63FC", "#FF31D9AA"))
 )
 
-private fun buildGradient(): List<ColorStore> {
+internal fun buildGradient(): List<ColorStore> {
     val swatches = PresetColorOptions
 
     // return a random 3 color gradient
diff --git a/apps/flipcash/shared/bill-customization/src/main/kotlin/com/flipcash/app/bill/customization/internal/BackgroundController.kt b/apps/flipcash/shared/bill-customization/src/main/kotlin/com/flipcash/app/bill/customization/internal/BackgroundController.kt
@@ -0,0 +1,32 @@
+package com.flipcash.app.bill.customization.internal
+
+import com.flipcash.app.bill.customization.ColorStore
+import com.flipcash.app.bill.customization.MaxGradientColors
+import com.flipcash.app.bill.customization.PlaygroundMode
+import com.flipcash.app.bill.customization.PresetColorOptions
+import com.flipcash.app.bill.customization.PresetGradients
+import com.flipcash.app.bill.customization.State
+import com.flipcash.app.bill.customization.buildGradient
+import com.getcode.opencode.model.financial.BillBackground
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import javax.inject.Inject
+
+class BackgroundController @Inject constructor() {
+
+    private val _state = MutableStateFlow(ColorState())
+    val state: StateFlow<ColorState>
+        get() = _state.asStateFlow()
+
+
+}
+
+data class ColorState(
+    val mode: PlaygroundMode = PlaygroundMode.Presets,
+    val selectedSlot: Int = 0,
+    val maxSlots: Int = MaxGradientColors,
+    val selectedColors: List<ColorStore> = buildGradient(),
+    val colorOptions: List<BillBackground.Solid> = PresetColorOptions,
+    val gradientOptions: List<BillBackground.Gradient> = PresetGradients,
+)
diff --git a/apps/flipcash/shared/bill-customization/src/main/kotlin/com/flipcash/app/bill/customization/internal/InternalBillPlaygroundController.kt b/apps/flipcash/shared/bill-customization/src/main/kotlin/com/flipcash/app/bill/customization/internal/InternalBillPlaygroundController.kt
@@ -16,6 +16,7 @@ import com.getcode.opencode.model.financial.BillBackground
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.toFiat
+import com.getcode.opencode.model.financial.usdc
 import com.getcode.opencode.utils.nonce
 import com.getcode.ui.utils.hexToColor
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -45,10 +46,8 @@ class InternalBillPlaygroundController(
 
     override fun customizeFor(token: Token) {
         // create amount for the bill
-        val demoAmount = LocalFiat.valueExchangeIn(
-            amount = 5.toFiat(),
-            token = token,
-            rate = exchange.rateForUsd()
+        val demoAmount = LocalFiat(
+            usdc = 5.toFiat(),
         )
 
         // provide bill "data" to render the scan code
diff --git a/apps/flipcash/shared/onramp/common/src/main/kotlin/com/flipcash/app/onramp/OnRampAmountSelectionModal.kt b/apps/flipcash/shared/onramp/common/src/main/kotlin/com/flipcash/app/onramp/OnRampAmountSelectionModal.kt
@@ -122,7 +122,7 @@ private fun PresetAmount(
     onClick: () -> Unit
 ) {
     ClickableCell(
-        text = amount.formatted(formatting = Fiat.Formatting.Truncated),
+        text = amount.formatted(rule = Fiat.FormattingRule.Truncated),
         isSelected = isSelected,
         modifier = modifier,
         onClick = onClick
diff --git a/apps/flipcash/shared/shareable/src/main/kotlin/com/flipcash/app/shareable/internal/InternalShareSheetController.kt b/apps/flipcash/shared/shareable/src/main/kotlin/com/flipcash/app/shareable/internal/InternalShareSheetController.kt
@@ -6,7 +6,6 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import androidx.core.net.toUri
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.flipcash.app.core.money.formatted
 import com.flipcash.app.core.pools.Pool
@@ -25,14 +24,12 @@ import com.getcode.opencode.model.accounts.entropy
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Token
-import com.getcode.opencode.utils.base64
 import com.getcode.opencode.utils.base64UrlSafe
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.utils.base58
 import com.getcode.utils.decodeBase64
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.delay
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import java.security.SecureRandom
 import java.util.Timer
@@ -166,14 +163,14 @@ internal class InternalShareSheetController(
                 Intent.EXTRA_TITLE,
                 resources.getString(
                     R.string.title_shareCashLink,
-                    amount.formatted(Fiat.Formatting.Truncated)
+                    amount.formatted(Fiat.FormattingRule.Truncated)
                 )
             )
             putExtra(
                 Intent.EXTRA_SUBJECT,
                 resources.getString(
                     R.string.title_shareCashLink,
-                    amount.formatted(Fiat.Formatting.Truncated)
+                    amount.formatted(Fiat.FormattingRule.Truncated)
                 )
             )
             putExtra(Intent.EXTRA_TEXT, text)
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Fiat.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/Fiat.kt
@@ -1,6 +1,5 @@
 package com.getcode.opencode.model.financial
 
-import android.icu.util.ULocale
 import android.os.Parcelable
 import com.flipcash.libs.currency.math.Estimator
 import com.flipcash.libs.currency.math.divideWithHighPrecision
@@ -53,10 +52,10 @@ data class Fiat(
         currencyCode = CurrencyCode.USD
     )
 
-    sealed interface Formatting {
-        data object Truncated : Formatting
-        data object None : Formatting
-        data class Length(val decimalPlaces: Int) : Formatting
+    sealed interface FormattingRule {
+        data object Truncated : FormattingRule
+        data object None : FormattingRule
+        data class Length(val decimalPlaces: Int) : FormattingRule
     }
 
     fun rounded(decimalPlaces: Int = 2): Fiat {
@@ -68,11 +67,11 @@ data class Fiat(
 
     // Formatting
     fun formatted(
-        formatting: Formatting = Formatting.None,
+        rule: FormattingRule = FormattingRule.None,
         showPrefix: Boolean = true,
         includeCommas: Boolean = true,
     ): String {
-        val shouldTruncate = if (formatting is Formatting.Truncated) {
+        val shouldTruncate = if (rule is FormattingRule.Truncated) {
             val fractionalPart = decimalValue - decimalValue.toLong()
             fractionalPart == 0.0
         } else {
@@ -81,10 +80,10 @@ data class Fiat(
 
         val formatter = DecimalFormat.getInstance(Locale.US).apply {
             val decimalDigits = Currency.getInstance(currencyCode.name).defaultFractionDigits
-            val preferredDigits = when (formatting) {
-                is Formatting.Length -> formatting.decimalPlaces
-                Formatting.None -> decimalDigits
-                Formatting.Truncated -> {
+            val preferredDigits = when (rule) {
+                is FormattingRule.Length -> rule.decimalPlaces
+                FormattingRule.None -> decimalDigits
+                FormattingRule.Truncated -> {
                     if (shouldTruncate) 0 else decimalDigits
                 }
             }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/LocalFiat.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/model/financial/LocalFiat.kt
@@ -3,7 +3,7 @@ package com.getcode.opencode.model.financial
 import com.flipcash.libs.currency.math.Estimator
 import com.flipcash.libs.currency.math.divideWithHighPrecision
 import com.flipcash.libs.currency.math.units
-import com.getcode.opencode.model.financial.Fiat.Formatting
+import com.getcode.opencode.model.financial.Fiat.FormattingRule
 import com.getcode.opencode.model.transactions.ExchangeData
 import com.getcode.services.opencode.BuildConfig
 import com.getcode.solana.keys.Mint
@@ -157,7 +157,7 @@ data class LocalFiat(
                 println("calculated quarks: $quarks")
                 println("units: $units")
                 println("fx: $fx")
-                println("sell estimate: ${sellEstimate.formatted(formatting = Formatting.Length(token.decimals))}")
+                println("sell estimate: ${sellEstimate.formatted(rule = FormattingRule.Length(token.decimals))}")
                 println("##################################################")
             }
 
@@ -175,7 +175,7 @@ data class LocalFiat(
                     "calculated quarks" to quarks
                     "units" to units
                     "fx" to fx
-                    "sell estimate" to sellEstimate.formatted(formatting = Formatting.Length(token.decimals))
+                    "sell estimate" to sellEstimate.formatted(rule = FormattingRule.Length(token.decimals))
                 }
             )
         }
diff --git a/services/opencode/src/test/kotlin/com/getcode/opencode/model/financial/FiatTests.kt b/services/opencode/src/test/kotlin/com/getcode/opencode/model/financial/FiatTests.kt

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ fun Int.withCommas(): String {`
`40`	`40`	`return this.toString().reversed().chunked(3).joinToString(",").reversed()`
`41`	`41`	`}`
`42`	`42`
`43`		`-fun LocalFiat.formatted(formatting: Fiat.Formatting = Fiat.Formatting.None): String {`
`44`		`- return nativeAmount.formatted(formatting = formatting)`
	`43`	`+fun LocalFiat.formatted(formatting: Fiat.FormattingRule = Fiat.FormattingRule.None): String {`
	`44`	`+ return nativeAmount.formatted(rule = formatting)`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ internal fun PoolSummaryRow(`
`87`	`87`	`text = stringResource(`
`88`	`88`	`R.string.subtitle_totalInPool,`
`89`	`89`	`pool.totalPoolAmount.formatted(`
`90`		`- formatting = Fiat.Formatting.Truncated`
	`90`	`+ rule = Fiat.FormattingRule.Truncated`
`91`	`91`	`)`
`92`	`92`	`),`
`93`	`93`	`style = CodeTheme.typography.textSmall,`