Merge pull request #5332 from BtcContributor/darkread

Fix dark mode readibility of specific texts - Part 2
This commit is contained in:
Christoph Atteneder 2021-03-24 21:33:44 +01:00 committed by GitHub
commit 3d1072e584
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions

View file

@ -483,7 +483,6 @@ public class ChatView extends AnchorPane {
visible = true; visible = true;
icon = AwesomeIcon.OK_SIGN; icon = AwesomeIcon.OK_SIGN;
text = Res.get("support.acknowledged"); text = Res.get("support.acknowledged");
} else if (message.ackErrorProperty().get() != null) { } else if (message.ackErrorProperty().get() != null) {
visible = true; visible = true;
icon = AwesomeIcon.EXCLAMATION_SIGN; icon = AwesomeIcon.EXCLAMATION_SIGN;
@ -494,12 +493,10 @@ public class ChatView extends AnchorPane {
visible = true; visible = true;
icon = AwesomeIcon.OK; icon = AwesomeIcon.OK;
text = Res.get("support.arrived"); text = Res.get("support.arrived");
statusHBox.setOpacity(0.5);
} else if (message.storedInMailboxProperty().get()) { } else if (message.storedInMailboxProperty().get()) {
visible = true; visible = true;
icon = AwesomeIcon.ENVELOPE; icon = AwesomeIcon.ENVELOPE;
text = Res.get("support.savedInMailbox"); text = Res.get("support.savedInMailbox");
statusHBox.setOpacity(0.5);
} else { } else {
visible = false; visible = false;
log.debug("updateMsgState called but no msg state available. message={}", message); log.debug("updateMsgState called but no msg state available. message={}", message);

View file

@ -1364,14 +1364,14 @@ public abstract class DisputeView extends ActivatableView<VBox, Void> {
listener = (observable, oldValue, newValue) -> { listener = (observable, oldValue, newValue) -> {
setText(newValue ? Res.get("support.closed") : Res.get("support.open")); setText(newValue ? Res.get("support.closed") : Res.get("support.open"));
if (getTableRow() != null) if (getTableRow() != null)
getTableRow().setOpacity(newValue ? 0.4 : 1); getTableRow().setOpacity(newValue && item.getBadgeCountProperty().get() == 0 ? 0.4 : 1);
}; };
closedProperty = item.isClosedProperty(); closedProperty = item.isClosedProperty();
closedProperty.addListener(listener); closedProperty.addListener(listener);
boolean isClosed = item.isClosed(); boolean isClosed = item.isClosed();
setText(isClosed ? Res.get("support.closed") : Res.get("support.open")); setText(isClosed ? Res.get("support.closed") : Res.get("support.open"));
if (getTableRow() != null) if (getTableRow() != null)
getTableRow().setOpacity(isClosed ? 0.4 : 1); getTableRow().setOpacity(isClosed && item.getBadgeCountProperty().get() == 0 ? 0.4 : 1);
} else { } else {
if (closedProperty != null) { if (closedProperty != null) {
closedProperty.removeListener(listener); closedProperty.removeListener(listener);