diff options
author | Torsten Grote <t@grobox.de> | 2023-06-12 15:19:10 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2023-06-12 15:19:10 -0300 |
commit | b991a48dc206a006ff384a5194217e29b76dafd0 (patch) | |
tree | a1750e8bffebad1dac2ebabb973b0ff829bc13ba /wallet/src/main/java/net/taler/wallet/peer | |
parent | b064cb0fbbc90ed92539178075959a747c85b43c (diff) | |
download | taler-android-b991a48dc206a006ff384a5194217e29b76dafd0.tar.gz taler-android-b991a48dc206a006ff384a5194217e29b76dafd0.tar.bz2 taler-android-b991a48dc206a006ff384a5194217e29b76dafd0.zip |
Remove Amount#fromDouble() as it was buggy and isn't really needed
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/peer')
7 files changed, 21 insertions, 21 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt index 2e2ed8a..0c118e6 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/IncomingComposable.kt @@ -212,11 +212,11 @@ fun PeerPullCheckingPreview() { fun PeerPullTermsPreview() { Surface { val terms = IncomingTerms( - amountRaw = Amount.fromDouble("TESTKUDOS", 42.23), - amountEffective = Amount.fromDouble("TESTKUDOS", 42.423), + amountRaw = Amount.fromString("TESTKUDOS", "42.23"), + amountEffective = Amount.fromString("TESTKUDOS", "42.423"), contractTerms = PeerContractTerms( summary = "This is a long test summary that can be more than one line long for sure", - amount = Amount.fromDouble("TESTKUDOS", 23.42), + amount = Amount.fromString("TESTKUDOS", "23.42"), ), id = "ID123", ) @@ -232,11 +232,11 @@ fun PeerPullTermsPreview() { fun PeerPullAcceptingPreview() { Surface { val terms = IncomingTerms( - amountRaw = Amount.fromDouble("TESTKUDOS", 42.23), - amountEffective = Amount.fromDouble("TESTKUDOS", 42.123), + amountRaw = Amount.fromString("TESTKUDOS", "42.23"), + amountEffective = Amount.fromString("TESTKUDOS", "42.123"), contractTerms = PeerContractTerms( summary = "This is a long test summary that can be more than one line long for sure", - amount = Amount.fromDouble("TESTKUDOS", 23.42), + amount = Amount.fromString("TESTKUDOS", "23.42"), ), id = "ID123", ) diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt index f227dec..ff6e2ee 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt @@ -153,7 +153,7 @@ fun OutgoingPullIntroComposable( fun PreviewReceiveFundsCheckingIntro() { Surface { OutgoingPullIntroComposable( - Amount.fromDouble("TESTKUDOS", 42.23), + Amount.fromString("TESTKUDOS", "42.23"), if (Random.nextBoolean()) OutgoingIntro else OutgoingChecking, ) { _, _, _, _ -> } } @@ -163,11 +163,11 @@ fun PreviewReceiveFundsCheckingIntro() { @Composable fun PreviewReceiveFundsCheckedIntro() { Surface { - val amountRaw = Amount.fromDouble("TESTKUDOS", 42.42) - val amountEffective = Amount.fromDouble("TESTKUDOS", 42.23) + val amountRaw = Amount.fromString("TESTKUDOS", "42.42") + val amountEffective = Amount.fromString("TESTKUDOS", "42.23") val exchangeItem = ExchangeItem("https://example.org", "TESTKUDOS", emptyList()) OutgoingPullIntroComposable( - Amount.fromDouble("TESTKUDOS", 42.23), + Amount.fromString("TESTKUDOS", "42.23"), OutgoingChecked(amountRaw, amountEffective, exchangeItem) ) { _, _, _, _ -> } } diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt index 0bf835c..96af156 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt @@ -142,7 +142,7 @@ fun OutgoingPushIntroComposable( fun PeerPushIntroComposableCheckingPreview() { Surface { val state = if (Random.nextBoolean()) OutgoingIntro else OutgoingChecking - OutgoingPushIntroComposable(state, Amount.fromDouble("TESTKUDOS", 42.23)) { _, _, _ -> } + OutgoingPushIntroComposable(state, Amount.fromString("TESTKUDOS", "42.23")) { _, _, _ -> } } } @@ -150,8 +150,8 @@ fun PeerPushIntroComposableCheckingPreview() { @Composable fun PeerPushIntroComposableCheckedPreview() { Surface { - val amountEffective = Amount.fromDouble("TESTKUDOS", 42.42) - val amountRaw = Amount.fromDouble("TESTKUDOS", 42.23) + val amountEffective = Amount.fromString("TESTKUDOS", "42.42") + val amountRaw = Amount.fromString("TESTKUDOS", "42.23") val state = OutgoingChecked(amountRaw, amountEffective) OutgoingPushIntroComposable(state, amountEffective) { _, _, _ -> } } diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt index d6b798c..74e9f6c 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt @@ -87,8 +87,8 @@ fun TransactionPeerPullCreditPreview() { timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000), extendedStatus = Pending, exchangeBaseUrl = "https://exchange.example.org/", - amountRaw = Amount.fromDouble("TESTKUDOS", 42.23), - amountEffective = Amount.fromDouble("TESTKUDOS", 42.1337), + amountRaw = Amount.fromString("TESTKUDOS", "42.23"), + amountEffective = Amount.fromString("TESTKUDOS", "42.1337"), info = PeerInfoShort( expiration = Timestamp.fromMillis(System.currentTimeMillis() + 60 * 60 * 1000), summary = "test invoice", diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt index 1bbc223..5ed9c6c 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt @@ -67,8 +67,8 @@ fun TransactionPeerPullDebitPreview() { timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000), extendedStatus = Pending, exchangeBaseUrl = "https://exchange.example.org/", - amountRaw = Amount.fromDouble("TESTKUDOS", 42.1337), - amountEffective = Amount.fromDouble("TESTKUDOS", 42.23), + amountRaw = Amount.fromString("TESTKUDOS", "42.1337"), + amountEffective = Amount.fromString("TESTKUDOS", "42.23"), info = PeerInfoShort( expiration = Timestamp.fromMillis(System.currentTimeMillis() + 60 * 60 * 1000), summary = "test invoice", diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt index d6f4cab..8344d7a 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt @@ -67,8 +67,8 @@ fun TransactionPeerPushCreditPreview() { timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000), extendedStatus = Pending, exchangeBaseUrl = "https://exchange.example.org/", - amountRaw = Amount.fromDouble("TESTKUDOS", 42.23), - amountEffective = Amount.fromDouble("TESTKUDOS", 42.1337), + amountRaw = Amount.fromString("TESTKUDOS", "42.23"), + amountEffective = Amount.fromString("TESTKUDOS", "42.1337"), info = PeerInfoShort( expiration = Timestamp.fromMillis(System.currentTimeMillis() + 60 * 60 * 1000), summary = "test invoice", diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt index b8e8ff4..8f16746 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt @@ -85,8 +85,8 @@ fun TransactionPeerPushDebitPreview() { timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000), extendedStatus = Pending, exchangeBaseUrl = "https://exchange.example.org/", - amountRaw = Amount.fromDouble("TESTKUDOS", 42.1337), - amountEffective = Amount.fromDouble("TESTKUDOS", 42.23), + amountRaw = Amount.fromString("TESTKUDOS", "42.1337"), + amountEffective = Amount.fromString("TESTKUDOS", "42.23"), info = PeerInfoShort( expiration = Timestamp.fromMillis(System.currentTimeMillis() + 60 * 60 * 1000), summary = "test invoice", |