sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-24 12:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename amount controls to coin

Browse source
This commit is contained in:
Craig Raw 2020-07-09 10:17:54 +02:00
parent 765a4f4c82
commit e21dbf87ef
7 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/control/AddressTreeTable.java
View file

@ -47,7 +47,7 @@ public class AddressTreeTable extends TreeTableView<Entry> {
amountCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Number> param) -> {
return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getValue());
});
amountCol.setCellFactory(p -> new AmountCell());
amountCol.setCellFactory(p -> new CoinCell());
amountCol.setSortable(false);
getColumns().add(amountCol);

6
src/main/java/com/sparrowwallet/sparrow/control/AmountCell.java → src/main/java/com/sparrowwallet/sparrow/control/CoinCell.java
View file

@ -12,10 +12,10 @@ import javafx.scene.layout.Region;
import java.util.Locale;
class AmountCell extends TreeTableCell<Entry, Number> {
public AmountCell() {
class CoinCell extends TreeTableCell<Entry, Number> {
public CoinCell() {
super();
getStyleClass().add("amount-cell");
getStyleClass().add("coin-cell");
}
@Override

18
src/main/java/com/sparrowwallet/sparrow/control/AmountFormatter.java → src/main/java/com/sparrowwallet/sparrow/control/CoinFormatter.java
View file

@ -8,15 +8,15 @@ import java.text.ParseException;
import java.util.function.UnaryOperator;
import java.util.regex.Pattern;
public class AmountFormatter extends TextFormatter<String> {
private static final Pattern AMOUNT_VALIDATION = Pattern.compile("[\\d,]*(\\.\\d{0,8})?");
private static final DecimalFormat AMOUNT_FORMAT = new DecimalFormat("###,###.########");
public class CoinFormatter extends TextFormatter<String> {
private static final Pattern COIN_VALIDATION = Pattern.compile("[\\d,]*(\\.\\d{0,8})?");
private static final DecimalFormat COIN_FORMAT = new DecimalFormat("###,###.########");
public AmountFormatter() {
super(new AmountFilter());
public CoinFormatter() {
super(new CoinFilter());
}
private static class AmountFilter implements UnaryOperator<Change> {
private static class CoinFilter implements UnaryOperator<Change> {
@Override
public Change apply(Change change) {
String oldText = change.getControlText();
@ -34,7 +34,7 @@ public class AmountFormatter extends TextFormatter<String> {
commasRemoved = newText.length() - noFractionCommaText.length();
}
if(!AMOUNT_VALIDATION.matcher(noFractionCommaText).matches()) {
if(!COIN_VALIDATION.matcher(noFractionCommaText).matches()) {
return null;
}
@ -51,8 +51,8 @@ public class AmountFormatter extends TextFormatter<String> {
}
try {
Number value = AMOUNT_FORMAT.parse(noFractionCommaText);
String correct = AMOUNT_FORMAT.format(value.doubleValue());
Number value = COIN_FORMAT.parse(noFractionCommaText);
String correct = COIN_FORMAT.format(value.doubleValue());
String compare = newText;
if(compare.contains(".") && compare.endsWith("0")) {

4
src/main/java/com/sparrowwallet/sparrow/control/TransactionsTreeTable.java
View file

@ -38,7 +38,7 @@ public class TransactionsTreeTable extends TreeTableView<Entry> {
amountCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Number> param) -> {
return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getValue());
});
amountCol.setCellFactory(p -> new AmountCell());
amountCol.setCellFactory(p -> new CoinCell());
amountCol.setSortable(true);
getColumns().add(amountCol);
@ -46,7 +46,7 @@ public class TransactionsTreeTable extends TreeTableView<Entry> {
balanceCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Number> param) -> {
return param.getValue().getValue() instanceof TransactionEntry ? ((TransactionEntry)param.getValue().getValue()).balanceProperty() : new ReadOnlyObjectWrapper<>(null);
});
balanceCol.setCellFactory(p -> new AmountCell());
balanceCol.setCellFactory(p -> new CoinCell());
balanceCol.setSortable(true);
getColumns().add(balanceCol);

2
src/main/java/com/sparrowwallet/sparrow/control/UtxosTreeTable.java
View file

@ -63,7 +63,7 @@ public class UtxosTreeTable extends TreeTableView<Entry> {
amountCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Number> param) -> {
return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getValue());
});
amountCol.setCellFactory(p -> new AmountCell());
amountCol.setCellFactory(p -> new CoinCell());
amountCol.setSortable(true);
getColumns().add(amountCol);
setTreeColumn(amountCol);

4
src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java
View file

@ -141,7 +141,7 @@ public class SendController extends WalletFormController implements Initializabl
updateTransaction();
});
amount.setTextFormatter(new AmountFormatter());
amount.setTextFormatter(new CoinFormatter());
amount.textProperty().addListener(amountListener);
amountUnit.getSelectionModel().select(1);
@ -197,7 +197,7 @@ public class SendController extends WalletFormController implements Initializabl
setTargetBlocks(5);
fee.setTextFormatter(new AmountFormatter());
fee.setTextFormatter(new CoinFormatter());
fee.textProperty().addListener(feeListener);
feeAmountUnit.getSelectionModel().select(1);

6
src/main/resources/com/sparrowwallet/sparrow/wallet/wallet.css
View file

@ -53,15 +53,15 @@
-fx-padding: 0;
}
.amount-cell {
.coin-cell {
-fx-alignment: center-right;
}
.amount-cell.spent .text {
.coin-cell.spent .text {
-fx-strikethrough: true;
}
.amount-cell .confirmation-progress {
.coin-cell .confirmation-progress {
-fx-pref-width: 14;
-fx-padding: 0 8 0 0;
}