Merge pull request #2891 from HenrikJannsen/fix-version-distribution

Fix version distribution
bisq-network · Sep 30, 2024 · 5e3357d · 5e3357d
2 parents 9147543 + c5f6b10
commit 5e3357d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/...desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/SystemLoad.java b/...desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/SystemLoad.java
@@ -139,7 +139,7 @@ private View(Model model, Controller controller) {
  powHeadline.getStyleClass().add("rich-table-headline");
 
  pow = new Label();
- pow.getStyleClass().add("rich-table-view");
+ pow.getStyleClass().add("network-details-view");
  pow.setPadding(new Insets(10));
  pow.setAlignment(Pos.TOP_LEFT);
  pow.setPrefWidth(4000);
@@ -148,7 +148,7 @@ private View(Model model, Controller controller) {
  systemLoadHeadline.getStyleClass().add("rich-table-headline");
 
  systemLoad = new Label();
- systemLoad.getStyleClass().add("rich-table-view");
+ systemLoad.getStyleClass().add("network-details-view");
  systemLoad.setPadding(new Insets(10));
  systemLoad.setAlignment(Pos.TOP_LEFT);
  systemLoad.setPrefWidth(4000);

diff --git a/...op/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/Traffic.java b/...op/desktop/src/main/java/bisq/desktop/main/content/network/my_node/transport/Traffic.java
@@ -187,7 +187,7 @@ private VBox getVBox(Label headline, Label details) {
  headline.getStyleClass().add("rich-table-headline");
  VBox vBox = new VBox(10, headline, details);
  vBox.setAlignment(Pos.TOP_LEFT);
- details.getStyleClass().add("rich-table-view");
+ details.getStyleClass().add("network-details-view");
  details.setPadding(new Insets(10, 10, 15, 10));
  details.setAlignment(Pos.TOP_LEFT);
  details.setPrefWidth(4000);

diff --git a/...ain/java/bisq/desktop/main/content/network/p2p/version/VersionDistributionController.java b/...ain/java/bisq/desktop/main/content/network/p2p/version/VersionDistributionController.java
@@ -18,6 +18,7 @@
 package bisq.desktop.main.content.network.p2p.version;
 
 import bisq.common.data.Pair;
+import bisq.common.platform.Version;
 import bisq.desktop.ServiceProvider;
 import bisq.desktop.common.view.Controller;
 import bisq.desktop.main.content.network.my_node.transport.TransportController;
@@ -61,7 +62,7 @@ public void onActivate() {
  TreeMap<String, Set<UserProfile>> map = new TreeMap<>();
  userProfileService.getUserProfiles().forEach(userProfile -> {
  String version = userProfile.getApplicationVersion();
- if (version.isEmpty()) {
+ if (version.isEmpty() || new Version(version).belowOrEqual(new Version("2.0.4"))) {
  version = Res.get("network.version.versionDistribution.oldVersions");
  }
  map.putIfAbsent(version, new HashSet<>());

diff --git a/apps/desktop/desktop/src/main/resources/css/application.css b/apps/desktop/desktop/src/main/resources/css/application.css
@@ -408,3 +408,9 @@
 .popup-bg .bisq-common-bg {
  -fx-padding: 10 30 30 30 !important;
 }
+
+.network-details-view {
+ -fx-background-color: -bisq-dark-grey-20;
+ -fx-border-color: transparent;
+ -fx-padding: 10;
+}