Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-11-29 07:56:39 -05:00
Code Issues Projects Releases Packages Wiki Activity

show number of offers in payment method pulldown (#2032)

Browse source
This commit is contained in:
woodser 2025-10-29 09:19:03 -04:00 • committed by GitHub
parent c9535e9967
commit fd985b0c9a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBook.java
View file

@ -232,15 +232,22 @@ public class OfferBook {
buyOfferCountMap.clear();
sellOfferCountMap.clear();
final String[] ccyCode = new String[1];
final String[] paymentMethod = new String[1];
final int[] offerCount = new int[1];
final int[] paymentMethodOfferCount = new int[1];
offerBookListItems.forEach(o -> {
paymentMethod[0] = o.getOffer().getPaymentMethod().getId();
ccyCode[0] = o.getOffer().getCounterCurrencyCode();
if (o.getOffer().getDirection() == BUY) {
offerCount[0] = buyOfferCountMap.getOrDefault(ccyCode[0], 0) + 1;
paymentMethodOfferCount[0] = buyOfferCountMap.getOrDefault(paymentMethod[0], 0) + 1;
buyOfferCountMap.put(ccyCode[0], offerCount[0]);
buyOfferCountMap.put(paymentMethod[0], paymentMethodOfferCount[0]);
} else {
offerCount[0] = sellOfferCountMap.getOrDefault(ccyCode[0], 0) + 1;
paymentMethodOfferCount[0] = sellOfferCountMap.getOrDefault(paymentMethod[0], 0) + 1;
sellOfferCountMap.put(ccyCode[0], offerCount[0]);
sellOfferCountMap.put(paymentMethod[0], paymentMethodOfferCount[0]);
}
});
log.debug("buyOfferCountMap.size {} sellOfferCountMap.size {}",

5
desktop/src/main/java/haveno/desktop/main/offer/offerbook/OfferBookView.java
View file

@ -183,7 +183,6 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
Tuple3<VBox, Label, AutocompleteComboBox<PaymentMethod>> paymentBoxTuple = FormBuilder.addTopLabelAutocompleteComboBox(
Res.get("offerbook.filterByPaymentMethod"));
paymentMethodComboBox = paymentBoxTuple.third;
paymentMethodComboBox.setCellFactory(GUIUtil.getPaymentMethodCellFactory());
paymentMethodComboBox.setPrefWidth(250);
paymentMethodComboBox.getStyleClass().add("input-with-border");
@ -383,6 +382,10 @@ abstract public class OfferBookView<R extends GridPane, M extends OfferBookViewM
}
});
paymentMethodComboBox.setCellFactory(GUIUtil.getPaymentMethodCellFactory(Res.get("shared.oneOffer"),
Res.get("shared.multipleOffers"),
offerCounts));
paymentMethodComboBox.setConverter(new PaymentMethodStringConverter(paymentMethodComboBox));
paymentMethodComboBox.getEditor().getStyleClass().add("combo-box-editor-bold");

14
desktop/src/main/java/haveno/desktop/util/GUIUtil.java
View file

@ -561,7 +561,9 @@ public class GUIUtil {
};
}
public static Callback<ListView<PaymentMethod>, ListCell<PaymentMethod>> getPaymentMethodCellFactory() {
public static Callback<ListView<PaymentMethod>, ListCell<PaymentMethod>> getPaymentMethodCellFactory(String postFixSingle,
String postFixMulti,
Map<String, Integer> offerCounts) {
return p -> new ListCell<>() {
@Override
protected void updateItem(PaymentMethod method, boolean empty) {
@ -572,16 +574,24 @@ public class GUIUtil {
HBox box = new HBox();
box.setSpacing(20);
box.setAlignment(Pos.CENTER_LEFT);
Label paymentType = new AutoTooltipLabel(getCurrencyType(method));
paymentType.getStyleClass().add("currency-label-small");
Label paymentMethod = new AutoTooltipLabel(Res.get(id));
paymentMethod.getStyleClass().add("currency-label");
box.getChildren().addAll(paymentType, paymentMethod);
Label numOffersLabel = new AutoTooltipLabel();
box.getChildren().addAll(paymentType, paymentMethod, numOffersLabel);
if (id.equals(GUIUtil.SHOW_ALL_FLAG)) {
paymentType.setText(Res.get("shared.all"));
paymentMethod.setText(Res.get("list.currency.showAll"));
}
Optional<Integer> offerCountOptional = Optional.ofNullable(offerCounts.get(id));
offerCountOptional.ifPresent(numOffers -> {
HBox.setMargin(numOffersLabel, new Insets(0, 0, 0, NUM_OFFERS_TRANSLATE_X));
numOffersLabel.getStyleClass().add("offer-label");
numOffersLabel.setText(numOffers + " " + (numOffers == 1 ? postFixSingle : postFixMulti));
});
setGraphic(box);