mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add isNotPublished method (will be combined later with bsq swap checks)

Browse Source 
Cleanups
This commit is contained in:
chimp1984 2021-10-21 11:07:00 +02:00
parent c60df6e978
commit 9fb6a6ca9f
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
View File

@ -122,7 +122,9 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
private ChangeListener<Number> widthListener;
@Inject
public OpenOffersView(OpenOffersViewModel model, Navigation navigation, OfferDetailsWindow offerDetailsWindow) {
public OpenOffersView(OpenOffersViewModel model,
Navigation navigation,
OfferDetailsWindow offerDetailsWindow) {
super(model);
this.navigation = navigation;
this.offerDetailsWindow = offerDetailsWindow;
@ -187,7 +189,8 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
editItem.setOnAction((event) -> {
try {
OfferPayload offerPayload = row.getItem().getOffer().getOfferPayload();
navigation.navigateToWithData(offerPayload, MainView.class, PortfolioView.class, DuplicateOfferView.class);
navigation.navigateToWithData(offerPayload, MainView.class, PortfolioView.class,
DuplicateOfferView.class);
} catch (NullPointerException e) {
log.warn("Unable to get offerPayload - {}", e.toString());
}
@ -347,7 +350,8 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
if (model.getDirectionLabel(item).contains(filterString)) {
return true;
}
if (offer.getOfferFeePaymentTxId().contains(filterString)) {
if (offer.getOfferFeePaymentTxId() != null &&
offer.getOfferFeePaymentTxId().contains(filterString)) {
return true;
}
return false;
@ -442,7 +446,6 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
@Override
public void updateItem(final OpenOfferListItem item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty) {
field = new HyperlinkWithIcon(model.getOfferId(item));
field.setOnAction(event -> offerDetailsWindow.show(item.getOffer()));
@ -472,7 +475,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
super.updateItem(item, empty);
getStyleClass().removeAll("offer-disabled");
if (item != null) {
if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
if (model.isNotPublished(item)) getStyleClass().add("offer-disabled");
setGraphic(new AutoTooltipLabel(model.getDate(item)));
} else {
setGraphic(null);
@ -497,7 +500,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
getStyleClass().removeAll("offer-disabled");
if (item != null) {
if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
if (model.isNotPublished(item)) getStyleClass().add("offer-disabled");
setGraphic(new AutoTooltipLabel(model.getAmount(item)));
} else {
setGraphic(null);
@ -522,7 +525,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
getStyleClass().removeAll("offer-disabled");
if (item != null) {
if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
if (model.isNotPublished(item)) getStyleClass().add("offer-disabled");
setGraphic(new AutoTooltipLabel(model.getPrice(item)));
} else {
setGraphic(null);
@ -547,7 +550,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
getStyleClass().removeAll("offer-disabled");
if (item != null) {
if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
if (model.isNotPublished(item)) getStyleClass().add("offer-disabled");
AutoTooltipLabel autoTooltipLabel = new AutoTooltipLabel(model.getPriceDeviation(item));
autoTooltipLabel.setOpacity(item.getOffer().isUseMarketBasedPrice() ? 1 : 0.4);
setGraphic(autoTooltipLabel);
@ -598,7 +601,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
getStyleClass().removeAll("offer-disabled");
if (item != null) {
if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
if (model.isNotPublished(item)) getStyleClass().add("offer-disabled");
setGraphic(new AutoTooltipLabel(model.getVolume(item)));
} else {
setGraphic(null);
@ -623,7 +626,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
getStyleClass().removeAll("offer-disabled");
if (item != null) {
if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
if (model.isNotPublished(item)) getStyleClass().add("offer-disabled");
setGraphic(new AutoTooltipLabel(model.getPaymentMethod(item)));
} else {
setGraphic(null);
@ -648,7 +651,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
getStyleClass().removeAll("offer-disabled");
if (item != null) {
if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
if (model.isNotPublished(item)) getStyleClass().add("offer-disabled");
setGraphic(new AutoTooltipLabel(model.getDirectionLabel(item)));
} else {
setGraphic(null);
@ -673,7 +676,7 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
getStyleClass().removeAll("offer-disabled");
if (item != null) {
if (model.isDeactivated(item)) getStyleClass().add("offer-disabled");
if (model.isNotPublished(item)) getStyleClass().add("offer-disabled");
setGraphic(new AutoTooltipLabel(model.getMarketLabel(item)));
} else {
setGraphic(null);
@ -827,9 +830,9 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
if (button == null) {
button = getRegularIconButton(MaterialDesignIcon.PENCIL);
button.setTooltip(new Tooltip(Res.get("shared.editOffer")));
button.setOnAction(event -> onEditOpenOffer(item.getOpenOffer()));
setGraphic(button);
}
button.setOnAction(event -> onEditOpenOffer(item.getOpenOffer()));
} else {
setGraphic(null);
if (button != null) {

8
desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersViewModel.java
View File

@ -160,8 +160,14 @@ class OpenOffersViewModel extends ActivatableWithDataModel<OpenOffersDataModel>
return DisplayUtils.formatDateTime(item.getOffer().getDate());
}
boolean isNotPublished(OpenOfferListItem item) {
return isDeactivated(item);
}
boolean isDeactivated(OpenOfferListItem item) {
return item != null && item.getOpenOffer() != null && item.getOpenOffer().isDeactivated();
return item != null &&
item.getOpenOffer() != null &&
item.getOpenOffer().isDeactivated();
}
boolean isBootstrappedOrShowPopup() {