diff options
author | Iván Ávalos <avalos@disroot.org> | 2024-02-20 11:54:14 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2024-03-26 08:07:55 -0600 |
commit | 04da36054f8996b1e9d70f84506bf8be2ba3abe6 (patch) | |
tree | f75da2ad6089b279a17f32dbe565f65ee44c7f3e /wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt | |
parent | c734c227737cc961252f8e20ec5249893cf87ab3 (diff) | |
download | taler-android-04da36054f8996b1e9d70f84506bf8be2ba3abe6.tar.gz taler-android-04da36054f8996b1e9d70f84506bf8be2ba3abe6.tar.bz2 taler-android-04da36054f8996b1e9d70f84506bf8be2ba3abe6.zip |
[wallet] Display transactions by scopeInfo instead of currency
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt index a25c352..7b9e985 100644 --- a/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/ReceiveFundsFragment.kt @@ -51,6 +51,7 @@ import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import net.taler.common.Amount +import net.taler.common.CurrencySpecification import net.taler.wallet.compose.AmountInputField import net.taler.wallet.compose.TalerSurface import net.taler.wallet.exchanges.ExchangeItem @@ -59,16 +60,20 @@ class ReceiveFundsFragment : Fragment() { private val model: MainViewModel by activityViewModels() private val exchangeManager get() = model.exchangeManager private val withdrawManager get() = model.withdrawManager + private val balanceManager get() = model.balanceManager private val peerManager get() = model.peerManager + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?, ): View = ComposeView(requireContext()).apply { setContent { TalerSurface { + val scopeInfo = model.transactionManager.selectedScope ?: error("No scope selected") ReceiveFundsIntro( - model.transactionManager.selectedCurrency ?: error("No currency selected"), + scopeInfo.currency, + model.balanceManager.getSpecForScopeInfo(scopeInfo), this@ReceiveFundsFragment::onManualWithdraw, this@ReceiveFundsFragment::onPeerPull, ) @@ -113,6 +118,7 @@ class ReceiveFundsFragment : Fragment() { @Composable private fun ReceiveFundsIntro( currency: String, + spec: CurrencySpecification?, onManualWithdraw: (Amount) -> Unit, onPeerPull: (Amount) -> Unit, ) { @@ -146,7 +152,7 @@ private fun ReceiveFundsIntro( ) Text( modifier = Modifier, - text = currency, + text = spec?.symbol(Amount.zero(currency)) ?: currency, softWrap = false, style = MaterialTheme.typography.titleLarge, ) @@ -189,6 +195,6 @@ private fun ReceiveFundsIntro( @Composable fun PreviewReceiveFundsIntro() { Surface { - ReceiveFundsIntro("TESTKUDOS", {}) {} + ReceiveFundsIntro("TESTKUDOS", null, {}) {} } } |