refactor: custom numberpad

Author: ovitrif

app/src/androidTest/java/to/bitkit/ui/components/KeyboardTest.kt

@@ -6,14 +6,13 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import org.junit.Rule
 import org.junit.Test
-import to.bitkit.models.BitcoinDisplayUnit
 import to.bitkit.models.NodeLifecycleState
 import to.bitkit.models.PrimaryDisplay
-import to.bitkit.viewmodels.CurrencyUiState
+import to.bitkit.repositories.CurrencyState
 import to.bitkit.viewmodels.MainUiState
-import to.bitkit.viewmodels.SendEvent
 import to.bitkit.viewmodels.SendMethod
 import to.bitkit.viewmodels.SendUiState
+import to.bitkit.viewmodels.previewAmountInputViewModel
 
 class SendAmountContentTest {
 
@@ -22,8 +21,7 @@ class SendAmountContentTest {
 
     private val testUiState = SendUiState(
         payMethod = SendMethod.LIGHTNING,
-        amountInput = "100",
-        isAmountInputValid = true,
+        amount = 100u,
         isUnified = true
     )
 
@@ -35,21 +33,15 @@ class SendAmountContentTest {
     fun whenScreenLoaded_shouldShowAllComponents() {
         composeTestRule.setContent {
             SendAmountContent(
-                input = "100",
-                uiState = testUiState,
                 walletUiState = testWalletState,
-                currencyUiState = CurrencyUiState(primaryDisplay = PrimaryDisplay.BITCOIN),
-                displayUnit = BitcoinDisplayUnit.MODERN,
-                primaryDisplay = PrimaryDisplay.BITCOIN,
-                onInputChanged = {},
-                onEvent = {},
-                onBack = {}
+                uiState = testUiState,
+                amountInputViewModel = previewAmountInputViewModel(),
             )
         }
 
         composeTestRule.onNodeWithTag("send_amount_screen").assertExists()
-//        composeTestRule.onNodeWithTag("amount_input_field").assertExists() doesn't displayed because of viewmodel injection
-        composeTestRule.onNodeWithTag("available_balance").assertExists()
+        composeTestRule.onNodeWithTag("SendNumberField").assertExists()
+        composeTestRule.onNodeWithTag("available_balance", useUnmergedTree = true).assertExists()
         composeTestRule.onNodeWithTag("AssetButton-switch").assertExists()
         composeTestRule.onNodeWithTag("ContinueAmount").assertExists()
         composeTestRule.onNodeWithTag("SendAmountNumberPad").assertExists()
@@ -59,42 +51,27 @@ class SendAmountContentTest {
     fun whenNodeNotRunning_shouldShowSyncView() {
         composeTestRule.setContent {
             SendAmountContent(
-                input = "100",
-                uiState = testUiState,
                 walletUiState = MainUiState(
                     nodeLifecycleState = NodeLifecycleState.Initializing
                 ),
-                displayUnit = BitcoinDisplayUnit.MODERN,
-                primaryDisplay = PrimaryDisplay.BITCOIN,
-                currencyUiState = CurrencyUiState(),
-                onInputChanged = {},
-                onEvent = {},
-                onBack = {}
+                uiState = testUiState,
+                amountInputViewModel = previewAmountInputViewModel(),
             )
         }
 
         composeTestRule.onNodeWithTag("sync_node_view").assertExists()
-        composeTestRule.onNodeWithTag("amount_input_field").assertDoesNotExist()
+        composeTestRule.onNodeWithTag("SendNumberField").assertDoesNotExist()
     }
 
     @Test
     fun whenPaymentMethodButtonClicked_shouldTriggerEvent() {
         var eventTriggered = false
         composeTestRule.setContent {
             SendAmountContent(
-                input = "100",
-                uiState = testUiState,
                 walletUiState = testWalletState,
-                currencyUiState = CurrencyUiState(),
-                onInputChanged = {},
-                onEvent = { event ->
-                    if (event is SendEvent.PaymentMethodSwitch) {
-                        eventTriggered = true
-                    }
-                },
-                displayUnit = BitcoinDisplayUnit.MODERN,
-                primaryDisplay = PrimaryDisplay.BITCOIN,
-                onBack = {}
+                uiState = testUiState,
+                amountInputViewModel = previewAmountInputViewModel(),
+                onClickPayMethod = { eventTriggered = true }
             )
         }
 
@@ -109,23 +86,14 @@ class SendAmountContentTest {
         var eventTriggered = false
         composeTestRule.setContent {
             SendAmountContent(
-                input = "100",
-                uiState = testUiState.copy(isAmountInputValid = true),
                 walletUiState = testWalletState,
-                currencyUiState = CurrencyUiState(),
-                onInputChanged = {},
-                onEvent = { event ->
-                    if (event is SendEvent.AmountContinue) {
-                        eventTriggered = true
-                    }
-                },
-                displayUnit = BitcoinDisplayUnit.MODERN,
-                primaryDisplay = PrimaryDisplay.BITCOIN,
-                onBack = {}
+                uiState = testUiState,
+                amountInputViewModel = previewAmountInputViewModel(),
+                onContinue = { eventTriggered = true }
             )
         }
 
-        composeTestRule.onNodeWithTag("continue_button")
+        composeTestRule.onNodeWithTag("ContinueAmount")
             .performClick()
 
         assert(eventTriggered)
@@ -135,18 +103,12 @@ class SendAmountContentTest {
     fun whenAmountInvalid_continueButtonShouldBeDisabled() {
         composeTestRule.setContent {
             SendAmountContent(
-                input = "100",
-                uiState = testUiState.copy(isAmountInputValid = false),
                 walletUiState = testWalletState,
-                currencyUiState = CurrencyUiState(),
-                onInputChanged = {},
-                onEvent = {},
-                displayUnit = BitcoinDisplayUnit.MODERN,
-                primaryDisplay = PrimaryDisplay.BITCOIN,
-                onBack = {}
+                uiState = testUiState.copy(amount = 0u),
+                amountInputViewModel = previewAmountInputViewModel(),
             )
         }
 
-        composeTestRule.onNodeWithTag("continue_button").assertIsNotEnabled()
+        composeTestRule.onNodeWithTag("ContinueAmount").assertIsNotEnabled()
     }
 }

app/src/androidTest/java/to/bitkit/ui/screens/wallets/send/SendAmountContentTest.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.AmountInputHandler
+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
+    @Suppress("unused")
+    @Binds
+    abstract fun bindAmountInputHandler(currencyRepo: CurrencyRepo): AmountInputHandler
+
+    companion object {
+        @Suppress("FunctionOnlyReturningConstant")
+        @Provides
+        @Named("enablePolling")
+        fun provideEnablePolling(): Boolean = true
+    }
 }

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

@@ -8,10 +8,16 @@ import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.util.Locale
 
+const val STUB_RATE = 115_150.0
 const val BITCOIN_SYMBOL = "₿"
+const val USD_SYMBOL = "$"
 const val SATS_IN_BTC = 100_000_000
 const val BTC_SCALE = 8
-const val GROUPING_SEPARATOR = ' '
+const val SATS_GROUPING_SEPARATOR = ' '
+const val FIAT_GROUPING_SEPARATOR = ','
+const val DECIMAL_SEPARATOR = '.'
+const val CLASSIC_DECIMALS = 8
+const val FIAT_DECIMALS = 2
 
 @Serializable
 data class FxRateResponse(
@@ -87,10 +93,10 @@ data class ConvertedAmount(
 
 fun Long.formatToModernDisplay(locale: Locale = Locale.getDefault()): String {
     val sats = this
-    val formatSymbols = DecimalFormatSymbols(locale).apply {
-        groupingSeparator = GROUPING_SEPARATOR
+    val symbols = DecimalFormatSymbols(locale).apply {
+        groupingSeparator = SATS_GROUPING_SEPARATOR
     }
-    val formatter = DecimalFormat("#,###", formatSymbols).apply {
+    val formatter = DecimalFormat("#,###", symbols).apply {
         isGroupingUsed = true
     }
     return formatter.format(sats)
@@ -100,10 +106,28 @@ fun ULong.formatToModernDisplay(locale: Locale = Locale.getDefault()): String =
 
 fun Long.formatToClassicDisplay(locale: Locale = Locale.getDefault()): String {
     val sats = this
-    val formatSymbols = DecimalFormatSymbols(locale)
-    val formatter = DecimalFormat("###.########", formatSymbols)
+    val symbols = DecimalFormatSymbols(locale).apply {
+        decimalSeparator = DECIMAL_SEPARATOR
+    }
+    val formatter = DecimalFormat("###.########", symbols)
     return formatter.format(sats.asBtc())
 }
 
+fun BigDecimal.formatCurrency(decimalPlaces: Int = FIAT_DECIMALS, locale: Locale = Locale.getDefault()): String? {
+    val symbols = DecimalFormatSymbols(locale).apply {
+        decimalSeparator = DECIMAL_SEPARATOR
+        groupingSeparator = FIAT_GROUPING_SEPARATOR
+    }
+
+    val decimalPlacesString = "0".repeat(decimalPlaces)
+    val formatter = DecimalFormat("#,##0.$decimalPlacesString", symbols).apply {
+        minimumFractionDigits = decimalPlaces
+        maximumFractionDigits = decimalPlaces
+        isGroupingUsed = true
+    }
+
+    return runCatching { formatter.format(this) }.getOrNull()
+}
+
 /** Represent this sat value in Bitcoin BigDecimal. */
 fun Long.asBtc(): BigDecimal = BigDecimal(this).divide(BigDecimal(SATS_IN_BTC), BTC_SCALE, RoundingMode.HALF_UP)