Merge pull request #382 from synonymdev/feat/use-custom-numpad

feat: use custom numberpad in all flows

Author: jvsena42

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

@@ -512,6 +512,7 @@ class LightningRepo @Inject constructor(
             Result.success(paymentId)
         }
 
+    @Suppress("LongParameterList")
     suspend fun sendOnChain(
         address: Address,
         sats: ULong,

app/src/main/java/to/bitkit/ui/components/AmountInput.kt

@@ -253,7 +253,6 @@ private fun PreviewClassic() {
                 currencies = CurrencyState(
                     displayUnit = BitcoinDisplayUnit.CLASSIC,
                 ),
-                modifier = Modifier.fillMaxWidth(),
             )
         }
     }
@@ -270,7 +269,6 @@ private fun PreviewFiat() {
                 currencies = CurrencyState(
                     primaryDisplay = PrimaryDisplay.FIAT,
                 ),
-                modifier = Modifier.fillMaxWidth(),
             )
         }
     }
@@ -284,7 +282,6 @@ private fun PreviewSmall() {
             FillHeight()
             NumberPad(
                 viewModel = previewAmountInputViewModel(),
-                modifier = Modifier.fillMaxWidth(),
             )
         }
     }

app/src/main/java/to/bitkit/ui/components/NumberPad.kt

@@ -12,18 +12,15 @@ import to.bitkit.R
 import to.bitkit.models.PrimaryDisplay
 import to.bitkit.repositories.CurrencyState
 import to.bitkit.ui.LocalCurrencies
-import to.bitkit.ui.currencyViewModel
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
-import to.bitkit.viewmodels.CurrencyViewModel
 
 @Composable
 fun UnitButton(
+    onClick: () -> Unit,
     modifier: Modifier = Modifier,
     color: Color = Colors.Brand,
     currencies: CurrencyState = LocalCurrencies.current,
-    currencyVM: CurrencyViewModel? = currencyViewModel,
-    onClick: () -> Unit = { currencyVM?.switchUnit() },
 ) {
     NumberPadActionButton(
         text = if (currencies.primaryDisplay == PrimaryDisplay.BITCOIN) "Bitcoin" else currencies.selectedCurrency,
@@ -42,8 +39,8 @@ private fun Preview() {
             verticalArrangement = Arrangement.spacedBy(16.dp),
             modifier = Modifier.padding(16.dp)
         ) {
-            UnitButton(currencies = CurrencyState(primaryDisplay = PrimaryDisplay.BITCOIN))
-            UnitButton(currencies = CurrencyState(primaryDisplay = PrimaryDisplay.FIAT))
+            UnitButton(currencies = CurrencyState(primaryDisplay = PrimaryDisplay.BITCOIN), onClick = {})
+            UnitButton(currencies = CurrencyState(primaryDisplay = PrimaryDisplay.FIAT), onClick = {})
         }
     }
 }