diff --git a/desktop/src/main/java/bisq/desktop/components/SeparatedPhaseBars.java b/desktop/src/main/java/bisq/desktop/components/SeparatedPhaseBars.java index c5daaa3d47d..6867df4b8a7 100644 --- a/desktop/src/main/java/bisq/desktop/components/SeparatedPhaseBars.java +++ b/desktop/src/main/java/bisq/desktop/components/SeparatedPhaseBars.java @@ -43,6 +43,8 @@ @Slf4j public class SeparatedPhaseBars extends VBox { + // Last day for creating github compensation request issue, as decided by general consensus + private static final double LAST_COMP_REQ_GH_ISSUE = (double) 18 / 25; private double labelMinWidth = 150; private double breakMinWidth = 20; private int totalDuration; @@ -68,11 +70,14 @@ public SeparatedPhaseBars(List items) { item.setTitleLabel(titleLabel); titlesBars.getChildren().addAll(titleLabel); - ProgressBar progressBar = new JFXProgressBar(); + JFXProgressBar progressBar = new JFXProgressBar(); progressBar.setMinHeight(9); progressBar.setMaxHeight(9); progressBar.progressProperty().bind(item.progressProperty); progressBar.setOpacity(item.isShowBlocks() ? 1 : 0.25); + if (item.phase.name().startsWith("PROPOSAL")) { + progressBar.setSecondaryProgress(LAST_COMP_REQ_GH_ISSUE); + } progressBars.getChildren().add(progressBar); item.setProgressBar(progressBar); }); @@ -141,6 +146,9 @@ public static class SeparatedPhaseBarsItem { private Label titleLabel; @Setter private ProgressBar progressBar; + @Setter + private int indicatorBlock; + private ProgressBar indicatorBar; public SeparatedPhaseBarsItem(DaoPhase.Phase phase, boolean showBlocks) { this.phase = phase; @@ -160,5 +168,6 @@ public void setPeriodRange(int firstBlock, int lastBlock, int duration) { lastBlockProperty.set(lastBlock); this.duration = duration; } + } } diff --git a/desktop/src/main/java/bisq/desktop/theme-dark.css b/desktop/src/main/java/bisq/desktop/theme-dark.css index 0bc812fdded..a811b47f0d2 100644 --- a/desktop/src/main/java/bisq/desktop/theme-dark.css +++ b/desktop/src/main/java/bisq/desktop/theme-dark.css @@ -527,3 +527,7 @@ .jfx-date-picker .left-button, .jfx-date-picker .right-button{ -fx-background-color: derive(-bs-color-gray-0, -10%); } + +.progress-bar > .secondary-bar { + -fx-background-color: -bs-color-gray-0; +} diff --git a/desktop/src/main/java/bisq/desktop/theme-light.css b/desktop/src/main/java/bisq/desktop/theme-light.css index 910f7f4233d..76c268cdf58 100644 --- a/desktop/src/main/java/bisq/desktop/theme-light.css +++ b/desktop/src/main/java/bisq/desktop/theme-light.css @@ -114,3 +114,7 @@ .warning-box { -fx-background-color: -bs-yellow-light; } + +.progress-bar > .secondary-bar { + -fx-background-color: -bs-color-gray-3; +}