From 183782982c1b4e6e7c67c5a7e7ab9ea73c3a0404 Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 9 Jun 2025 06:51:59 -0400 Subject: [PATCH 1/4] fix display name of non-fiat traditional currencies --- core/src/main/java/haveno/core/locale/CurrencyUtil.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/src/main/java/haveno/core/locale/CurrencyUtil.java b/core/src/main/java/haveno/core/locale/CurrencyUtil.java index 911bb65d..c94d55c7 100644 --- a/core/src/main/java/haveno/core/locale/CurrencyUtil.java +++ b/core/src/main/java/haveno/core/locale/CurrencyUtil.java @@ -406,6 +406,13 @@ public class CurrencyUtil { removedCryptoCurrency.isPresent() ? removedCryptoCurrency.get().getName() : Res.get("shared.na"); return getCryptoCurrency(currencyCode).map(TradeCurrency::getName).orElse(xmrOrRemovedAsset); } + if (isTraditionalNonFiatCurrency(currencyCode)) { + return getTraditionalNonFiatCurrencies().stream() + .filter(currency -> currency.getCode().equals(currencyCode)) + .findAny() + .map(TradeCurrency::getName) + .orElse(currencyCode); + } try { return Currency.getInstance(currencyCode).getDisplayName(); } catch (Throwable t) { From 62d5eb4bc35121018dfa3e502adf808f0b466ac4 Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 9 Jun 2025 07:05:46 -0400 Subject: [PATCH 2/4] fix distorted confirm payment sent checkbox in windows dark mode --- desktop/src/main/java/haveno/desktop/haveno.css | 1 + 1 file changed, 1 insertion(+) diff --git a/desktop/src/main/java/haveno/desktop/haveno.css b/desktop/src/main/java/haveno/desktop/haveno.css index 7c24526a..7fc6948f 100644 --- a/desktop/src/main/java/haveno/desktop/haveno.css +++ b/desktop/src/main/java/haveno/desktop/haveno.css @@ -2283,6 +2283,7 @@ textfield */ -fx-background-insets: 44; -fx-background-radius: 15; -fx-border-radius: 15; + -fx-effect: dropshadow(gaussian, -bs-text-color-dropshadow-light-mode, 44, 0, 0, 0); } .notification-popup-bg, .peer-info-popup-bg { From 53e2c5cc243c8f8b0d0914af7ea109e2869c34c9 Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 9 Jun 2025 07:06:00 -0400 Subject: [PATCH 3/4] center the top nav buttons when window is small --- desktop/src/main/java/haveno/desktop/main/MainView.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop/src/main/java/haveno/desktop/main/MainView.java b/desktop/src/main/java/haveno/desktop/main/MainView.java index ee743432..2a5b994c 100644 --- a/desktop/src/main/java/haveno/desktop/main/MainView.java +++ b/desktop/src/main/java/haveno/desktop/main/MainView.java @@ -305,8 +305,12 @@ public class MainView extends InitializableView { } }); + // add spacer to center the nav buttons when window is small + Region rightSpacer = new Region(); + HBox.setHgrow(rightSpacer, Priority.ALWAYS); + HBox primaryNav = new HBox(getLogoPane(), marketButton, getNavigationSpacer(), buyButton, getNavigationSpacer(), - sellButton, getNavigationSpacer(), portfolioButtonWithBadge, getNavigationSpacer(), fundsButton); + sellButton, getNavigationSpacer(), portfolioButtonWithBadge, getNavigationSpacer(), fundsButton, rightSpacer); primaryNav.setAlignment(Pos.CENTER_LEFT); primaryNav.getStyleClass().add("nav-primary"); From e4e118f70cfdd6d84728d340b2940a8b09484c76 Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 9 Jun 2025 07:06:43 -0400 Subject: [PATCH 4/4] rename logos with dark_mode and light_mode postfix --- .../main/java/haveno/desktop/app/HavenoAppMain.java | 2 +- desktop/src/main/java/haveno/desktop/theme-dark.css | 6 +++--- .../src/main/java/haveno/desktop/theme-light.css | 6 +++--- ...dscape_dark.png => logo_landscape_dark_mode.png} | Bin ...cape_light.png => logo_landscape_light_mode.png} | Bin ...go_splash_dark.png => logo_splash_dark_mode.png} | Bin ..._splash_light.png => logo_splash_light_mode.png} | Bin ...t_dark.png => logo_splash_testnet_dark_mode.png} | Bin ...light.png => logo_splash_testnet_light_mode.png} | Bin 9 files changed, 7 insertions(+), 7 deletions(-) rename desktop/src/main/resources/images/{logo_landscape_dark.png => logo_landscape_dark_mode.png} (100%) rename desktop/src/main/resources/images/{logo_landscape_light.png => logo_landscape_light_mode.png} (100%) rename desktop/src/main/resources/images/{logo_splash_dark.png => logo_splash_dark_mode.png} (100%) rename desktop/src/main/resources/images/{logo_splash_light.png => logo_splash_light_mode.png} (100%) rename desktop/src/main/resources/images/{logo_splash_testnet_dark.png => logo_splash_testnet_dark_mode.png} (100%) rename desktop/src/main/resources/images/{logo_splash_testnet_light.png => logo_splash_testnet_light_mode.png} (100%) diff --git a/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java b/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java index 73e78ab6..c6217cfe 100644 --- a/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java +++ b/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java @@ -216,7 +216,7 @@ public class HavenoAppMain extends HavenoExecutable { // Set the dialog content VBox vbox = new VBox(10); - ImageView logoImageView = new ImageView(ImageUtil.getImageByPath("logo_splash_light.png")); + ImageView logoImageView = new ImageView(ImageUtil.getImageByPath("logo_splash_light_mode.png")); logoImageView.setFitWidth(342); logoImageView.setPreserveRatio(true); vbox.getChildren().addAll(logoImageView, passwordField, errorMessageField, versionField); diff --git a/desktop/src/main/java/haveno/desktop/theme-dark.css b/desktop/src/main/java/haveno/desktop/theme-dark.css index 1e568142..5316735b 100644 --- a/desktop/src/main/java/haveno/desktop/theme-dark.css +++ b/desktop/src/main/java/haveno/desktop/theme-dark.css @@ -578,15 +578,15 @@ } #image-logo-splash { - -fx-image: url("../../images/logo_splash_dark.png"); + -fx-image: url("../../images/logo_splash_dark_mode.png"); } #image-logo-splash-testnet { - -fx-image: url("../../images/logo_splash_testnet_dark.png"); + -fx-image: url("../../images/logo_splash_testnet_dark_mode.png"); } #image-logo-landscape { - -fx-image: url("../../images/logo_landscape_dark.png"); + -fx-image: url("../../images/logo_landscape_dark_mode.png"); } .table-view .placeholder { diff --git a/desktop/src/main/java/haveno/desktop/theme-light.css b/desktop/src/main/java/haveno/desktop/theme-light.css index 160a21e3..99bc71a4 100644 --- a/desktop/src/main/java/haveno/desktop/theme-light.css +++ b/desktop/src/main/java/haveno/desktop/theme-light.css @@ -144,15 +144,15 @@ } #image-logo-splash { - -fx-image: url("../../images/logo_splash_light.png"); + -fx-image: url("../../images/logo_splash_light_mode.png"); } #image-logo-splash-testnet { - -fx-image: url("../../images/logo_splash_testnet_light.png"); + -fx-image: url("../../images/logo_splash_testnet_light_mode.png"); } #image-logo-landscape { - -fx-image: url("../../images/logo_landscape_light.png"); + -fx-image: url("../../images/logo_landscape_light_mode.png"); } #charts .default-color0.chart-series-area-fill { diff --git a/desktop/src/main/resources/images/logo_landscape_dark.png b/desktop/src/main/resources/images/logo_landscape_dark_mode.png similarity index 100% rename from desktop/src/main/resources/images/logo_landscape_dark.png rename to desktop/src/main/resources/images/logo_landscape_dark_mode.png diff --git a/desktop/src/main/resources/images/logo_landscape_light.png b/desktop/src/main/resources/images/logo_landscape_light_mode.png similarity index 100% rename from desktop/src/main/resources/images/logo_landscape_light.png rename to desktop/src/main/resources/images/logo_landscape_light_mode.png diff --git a/desktop/src/main/resources/images/logo_splash_dark.png b/desktop/src/main/resources/images/logo_splash_dark_mode.png similarity index 100% rename from desktop/src/main/resources/images/logo_splash_dark.png rename to desktop/src/main/resources/images/logo_splash_dark_mode.png diff --git a/desktop/src/main/resources/images/logo_splash_light.png b/desktop/src/main/resources/images/logo_splash_light_mode.png similarity index 100% rename from desktop/src/main/resources/images/logo_splash_light.png rename to desktop/src/main/resources/images/logo_splash_light_mode.png diff --git a/desktop/src/main/resources/images/logo_splash_testnet_dark.png b/desktop/src/main/resources/images/logo_splash_testnet_dark_mode.png similarity index 100% rename from desktop/src/main/resources/images/logo_splash_testnet_dark.png rename to desktop/src/main/resources/images/logo_splash_testnet_dark_mode.png diff --git a/desktop/src/main/resources/images/logo_splash_testnet_light.png b/desktop/src/main/resources/images/logo_splash_testnet_light_mode.png similarity index 100% rename from desktop/src/main/resources/images/logo_splash_testnet_light.png rename to desktop/src/main/resources/images/logo_splash_testnet_light_mode.png