From 4358268d88049933fecb80ac3f91b0ff5f71d488 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 24 Aug 2014 22:38:33 +0200 Subject: [PATCH] add qr code support and payment url to wallet app --- .../gui/components/btc/AddressTextField.java | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/bitsquare/gui/components/btc/AddressTextField.java b/src/main/java/io/bitsquare/gui/components/btc/AddressTextField.java index 39806bd121..8e1c64b1ee 100644 --- a/src/main/java/io/bitsquare/gui/components/btc/AddressTextField.java +++ b/src/main/java/io/bitsquare/gui/components/btc/AddressTextField.java @@ -1,10 +1,12 @@ package io.bitsquare.gui.components.btc; +import com.google.bitcoin.core.Coin; import com.google.bitcoin.uri.BitcoinURI; import de.jensd.fx.fontawesome.AwesomeDude; import de.jensd.fx.fontawesome.AwesomeIcon; import io.bitsquare.BitSquare; import io.bitsquare.gui.components.Popups; +import io.bitsquare.gui.util.BitSquareFormatter; import java.awt.Desktop; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -32,6 +34,7 @@ public class AddressTextField extends AnchorPane private final Label addressLabel; private final Label qrCode; private String address; + private String amountToPay; /////////////////////////////////////////////////////////////////////////////////////////// // Constructor @@ -111,13 +114,9 @@ public class AddressTextField extends AnchorPane }); } - private String getBitcoinURI() - { - return BitcoinURI.convertToBitcoinURI(address, null, BitSquare.getAppName(), null); - } /////////////////////////////////////////////////////////////////////////////////////////// - // Setters + // Getters/Setters /////////////////////////////////////////////////////////////////////////////////////////// public void setAddress(String address) @@ -126,4 +125,20 @@ public class AddressTextField extends AnchorPane addressLabel.setText(address); } + public void setAmountToPay(String amountToPay) + { + this.amountToPay = amountToPay; + } + + /////////////////////////////////////////////////////////////////////////////////////////// + // Private + /////////////////////////////////////////////////////////////////////////////////////////// + + private String getBitcoinURI() + { + Coin d = BitSquareFormatter.parseToCoin(amountToPay); + return BitcoinURI.convertToBitcoinURI(address, BitSquareFormatter.parseToCoin(amountToPay), BitSquare.getAppName(), null); + } + + }