refactor: custom numberpad

Author: ovitrif

app/src/androidTest/java/to/bitkit/ui/screens/wallets/send/SendAmountContentTest.kt

@@ -22,8 +22,7 @@ class SendAmountContentTest {
 
     private val testUiState = SendUiState(
         payMethod = SendMethod.LIGHTNING,
-        amountInput = "100",
-        isAmountInputValid = true,
+        amount = 100u,
         isUnified = true
     )
 
@@ -110,7 +109,7 @@ class SendAmountContentTest {
         composeTestRule.setContent {
             SendAmountContent(
                 input = "100",
-                uiState = testUiState.copy(isAmountInputValid = true),
+                uiState = testUiState,
                 walletUiState = testWalletState,
                 currencyUiState = CurrencyUiState(),
                 onInputChanged = {},
@@ -136,7 +135,7 @@ class SendAmountContentTest {
         composeTestRule.setContent {
             SendAmountContent(
                 input = "100",
-                uiState = testUiState.copy(isAmountInputValid = false),
+                uiState = testUiState.copy(amount = 0u),
                 walletUiState = testWalletState,
                 currencyUiState = CurrencyUiState(),
                 onInputChanged = {},

app/src/main/java/to/bitkit/di/RepoModule.kt

@@ -1,16 +1,26 @@
 package to.bitkit.di
 
+import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import to.bitkit.repositories.CurrencyConverter
+import to.bitkit.repositories.CurrencyRepo
 import javax.inject.Named
 
 @Module
 @InstallIn(SingletonComponent::class)
-object RepoModule {
+abstract class RepoModule {
 
-    @Provides
-    @Named("enablePolling")
-    fun provideEnablePolling(): Boolean = true
+    @Binds
+    abstract fun bindCurrencyConverter(
+        currencyRepo: CurrencyRepo
+    ): CurrencyConverter
+
+    companion object {
+        @Provides
+        @Named("enablePolling")
+        fun provideEnablePolling(): Boolean = true
+    }
 }

app/src/main/java/to/bitkit/models/AmountConstants.kt

@@ -0,0 +1,20 @@
+package to.bitkit.models
+
+enum class NumberPadType {
+    SIMPLE, // No special bottom-left button
+    INTEGER, // "000" button for modern Bitcoin
+    DECIMAL // "." button for classic Bitcoin/fiat
+}
+
+object AmountConstants {
+    const val MAX_RECEIVE_AMOUNT = 999_999_999L // sats
+    const val MAX_MODERN_BITCOIN_LENGTH = 10
+    const val MAX_DECIMAL_INPUT_LENGTH = 20
+    const val CLASSIC_BITCOIN_DECIMALS = 8
+    const val FIAT_DECIMALS = 2
+    const val ERROR_CLEAR_DELAY = 500L // ms
+
+    const val GROUPING_SEPARATOR_BITCOIN = " "
+    const val GROUPING_SEPARATOR_FIAT = ","
+    const val DECIMAL_SEPARATOR = "."
+}

app/src/main/java/to/bitkit/models/Currency.kt

@@ -13,6 +13,7 @@ const val SATS_IN_BTC = 100_000_000
 const val BTC_SCALE = 8
 const val BTC_PLACEHOLDER = "0.00000000"
 const val SATS_PLACEHOLDER = "0"
+const val GROUPING_SEPARATOR = ' '
 
 @Serializable
 data class FxRateResponse(
@@ -69,28 +70,17 @@ data class ConvertedAmount(
     val currency: String,
     val flag: String,
     val sats: Long,
+    val locale: Locale = Locale.getDefault(),
 ) {
-    val btcValue: BigDecimal = sats.asBtc()
-
     data class BitcoinDisplayComponents(
         val symbol: String,
         val value: String,
     )
 
     fun bitcoinDisplay(unit: BitcoinDisplayUnit): BitcoinDisplayComponents {
-        val spaceSeparator = ' '
         val formattedValue = when (unit) {
-            BitcoinDisplayUnit.MODERN -> {
-                sats.formatToModernDisplay()
-            }
-
-            BitcoinDisplayUnit.CLASSIC -> {
-                val formatSymbols = DecimalFormatSymbols(Locale.getDefault()).apply {
-                    groupingSeparator = spaceSeparator
-                }
-                val formatter = DecimalFormat("#,###.########", formatSymbols)
-                formatter.format(btcValue)
-            }
+            BitcoinDisplayUnit.MODERN -> sats.formatToModernDisplay(locale)
+            BitcoinDisplayUnit.CLASSIC -> sats.formatToClassicDisplay(locale)
         }
         return BitcoinDisplayComponents(
             symbol = BITCOIN_SYMBOL,
@@ -99,18 +89,37 @@ data class ConvertedAmount(
     }
 }
 
-fun Long.formatToModernDisplay(): String {
+fun Long.formatToModernDisplay(locale: Locale = Locale.getDefault()): String {
     val sats = this
-    val formatSymbols = DecimalFormatSymbols(Locale.getDefault()).apply {
-        groupingSeparator = ' '
+    val formatSymbols = DecimalFormatSymbols(locale).apply {
+        groupingSeparator = GROUPING_SEPARATOR
     }
     val formatter = DecimalFormat("#,###", formatSymbols).apply {
         isGroupingUsed = true
     }
     return formatter.format(sats)
 }
 
-fun ULong.formatToModernDisplay(): String = this.toLong().formatToModernDisplay()
+fun ULong.formatToModernDisplay(locale: Locale = Locale.getDefault()): String = toLong().formatToModernDisplay(locale)
+
+fun Long.formatToClassicDisplay(locale: Locale = Locale.getDefault()): String {
+    val sats = this
+    val formatSymbols = DecimalFormatSymbols(locale)
+    val formatter = DecimalFormat("###.########", formatSymbols)
+    return formatter.format(sats.asBtc())
+}
 
 /** Represent this sat value in Bitcoin BigDecimal. */
 fun Long.asBtc(): BigDecimal = BigDecimal(this).divide(BigDecimal(SATS_IN_BTC), BTC_SCALE, RoundingMode.HALF_UP)
+
+fun String.btcToSats(): Long {
+    if (isEmpty()) return 0L
+    return runCatching {
+        val btcBigDecimal = BigDecimal(this)
+        val satsBigDecimal = btcBigDecimal.multiply(BigDecimal(SATS_IN_BTC))
+        satsBigDecimal.toLong()
+    }.fold(
+        onSuccess = { it },
+        onFailure = { 0L },
+    )
+}

app/src/main/java/to/bitkit/repositories/CurrencyRepo.kt

@@ -37,6 +37,7 @@ import to.bitkit.ui.utils.formatCurrency
 import to.bitkit.utils.Logger
 import java.math.BigDecimal
 import java.math.RoundingMode
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
@@ -49,7 +50,7 @@ class CurrencyRepo @Inject constructor(
     private val cacheStore: CacheStore,
     @Named("enablePolling") private val enablePolling: Boolean,
     private val clock: Clock,
-) {
+) : CurrencyConverter {
     private val repoScope = CoroutineScope(bgDispatcher + SupervisorJob())
     private val _currencyState = MutableStateFlow(CurrencyState())
     val currencyState: StateFlow<CurrencyState> = _currencyState.asStateFlow()
@@ -177,10 +178,6 @@ class CurrencyRepo @Inject constructor(
         refresh()
     }
 
-    fun getCurrencySymbol(): String {
-        return _currencyState.value.currencySymbol
-    }
-
     fun getCurrentRate(currency: String): FxRate? {
         return _currencyState.value.rates.firstOrNull { it.quote == currency }
     }
@@ -235,19 +232,29 @@ class CurrencyRepo @Inject constructor(
 
     fun convertFiatToSats(
         fiatAmount: Double,
-        currency: String?
+        currency: String?,
     ): Result<ULong> {
         return convertFiatToSats(
             fiatValue = BigDecimal.valueOf(fiatAmount),
-            currency = currency
+            currency = currency,
         )
     }
 
     companion object {
         private const val TAG = "CurrencyRepo"
     }
+
+    // MARK: - CurrencyConverter
+    override fun convertFiatToSats(fiat: Double): Long =
+        convertFiatToSats(BigDecimal.valueOf(fiat)).getOrNull()?.toLong() ?: 0L
+
+    override fun convertSatsToFiatString(sats: Long): String =
+        convertSatsToFiat(sats, null).getOrNull()?.formatted ?: ""
+
 }
 
+// region contract
+
 data class CurrencyState(
     val rates: List<FxRate> = emptyList(),
     val error: Throwable? = null,
@@ -256,5 +263,18 @@ data class CurrencyState(
     val currencySymbol: String = "$",
     val displayUnit: BitcoinDisplayUnit = BitcoinDisplayUnit.MODERN,
     val primaryDisplay: PrimaryDisplay = PrimaryDisplay.BITCOIN,
-    val lastSuccessfulRefresh: Long? = null
+    val lastSuccessfulRefresh: Long? = null,
 )
+
+interface CurrencyConverter {
+    fun convertSatsToFiatString(sats: Long): String
+    fun convertFiatToSats(fiat: Double): Long
+}
+
+object NoopCurrencyConverter : CurrencyConverter {
+    const val RATE: Double = 100000.0
+    override fun convertSatsToFiatString(sats: Long): String = "%.2f".format(Locale.US, sats / RATE)
+    override fun convertFiatToSats(fiat: Double): Long = (fiat * RATE).toLong()
+}
+
+// endregion