diff --git a/desktop/src/main/java/haveno/desktop/images.css b/desktop/src/main/java/haveno/desktop/images.css index 1e36427ee9..c721f2ee7b 100644 --- a/desktop/src/main/java/haveno/desktop/images.css +++ b/desktop/src/main/java/haveno/desktop/images.css @@ -313,6 +313,10 @@ -fx-image: url("../../images/settings.png"); } +#image-fiat-logo { + -fx-image: url("../../images/fiat_logo_light_mode.png"); +} + #image-btc-logo { -fx-image: url("../../images/btc_logo.png"); } diff --git a/desktop/src/main/java/haveno/desktop/theme-dark.css b/desktop/src/main/java/haveno/desktop/theme-dark.css index 5316735b69..11fc14cdbf 100644 --- a/desktop/src/main/java/haveno/desktop/theme-dark.css +++ b/desktop/src/main/java/haveno/desktop/theme-dark.css @@ -643,3 +643,7 @@ .regular-text-color { -fx-text-fill: -bs-text-color; } + +#image-fiat-logo { + -fx-image: url("../../images/fiat_logo_dark_mode.png"); +} diff --git a/desktop/src/main/java/haveno/desktop/util/GUIUtil.java b/desktop/src/main/java/haveno/desktop/util/GUIUtil.java index 2710c00f6a..514b90d134 100644 --- a/desktop/src/main/java/haveno/desktop/util/GUIUtil.java +++ b/desktop/src/main/java/haveno/desktop/util/GUIUtil.java @@ -349,10 +349,11 @@ public class GUIUtil { break; default: - // use icons for crypto - if (CurrencyUtil.isCryptoCurrency(code)) { + // use icon if available + ImageView currencyIcon = getCurrencyIcon(code); + if (currencyIcon != null) { label1.setText(""); - StackPane iconWrapper = new StackPane(getCurrencyIcon(code)); // TODO: icon must be wrapped in StackPane for reliable rendering on linux + StackPane iconWrapper = new StackPane(currencyIcon); // TODO: icon must be wrapped in StackPane for reliable rendering on linux label1.setGraphic(iconWrapper); } @@ -459,10 +460,12 @@ public class GUIUtil { break; default: - // use icons for crypto - if (CurrencyUtil.isCryptoCurrency(item.getCode())) { + // use icon if available + ImageView currencyIcon = getCurrencyIcon(code); + if (currencyIcon != null) { label1.setText(""); - label1.setGraphic(getCurrencyIcon(item.getCode())); + StackPane iconWrapper = new StackPane(currencyIcon); // TODO: icon must be wrapped in StackPane for reliable rendering on linux + label1.setGraphic(iconWrapper); } boolean isCrypto = CurrencyUtil.isCryptoCurrency(code); @@ -502,10 +505,12 @@ public class GUIUtil { Label label2 = new AutoTooltipLabel(item.getNameAndCode()); label2.getStyleClass().add("currency-label"); - // use icons for crypto - if (CurrencyUtil.isCryptoCurrency(item.getCode())) { + // use icon if available + ImageView currencyIcon = getCurrencyIcon(item.getCode()); + if (currencyIcon != null) { label1.setText(""); - label1.setGraphic(getCurrencyIcon(item.getCode())); + StackPane iconWrapper = new StackPane(currencyIcon); // TODO: icon must be wrapped in StackPane for reliable rendering on linux + label1.setGraphic(iconWrapper); } box.getChildren().addAll(label1, label2); @@ -1284,12 +1289,14 @@ public class GUIUtil { public static ImageView getCurrencyIcon(String currencyCode, double size) { if (currencyCode == null) return null; + String imageId = getImageId(currencyCode); + if (imageId == null) return null; ImageView iconView = new ImageView(); iconView.setFitWidth(size); iconView.setPreserveRatio(true); iconView.setSmooth(true); iconView.setCache(true); - iconView.setId(getImageId(currencyCode)); + iconView.setId(imageId); return iconView; } @@ -1327,7 +1334,9 @@ public class GUIUtil { private static String getImageId(String currencyCode) { if (currencyCode == null) return null; - return "image-" + currencyCode.toLowerCase() + "-logo"; + if (CurrencyUtil.isCryptoCurrency(currencyCode)) return "image-" + currencyCode.toLowerCase() + "-logo"; + if (CurrencyUtil.isFiatCurrency(currencyCode)) return "image-fiat-logo"; + return null; } public static void adjustHeightAutomatically(TextArea textArea) { diff --git a/desktop/src/main/resources/images/fiat_logo_dark_mode.png b/desktop/src/main/resources/images/fiat_logo_dark_mode.png new file mode 100644 index 0000000000..b6fbaf02f3 Binary files /dev/null and b/desktop/src/main/resources/images/fiat_logo_dark_mode.png differ diff --git a/desktop/src/main/resources/images/fiat_logo_light_mode.png b/desktop/src/main/resources/images/fiat_logo_light_mode.png new file mode 100644 index 0000000000..a40b3e632d Binary files /dev/null and b/desktop/src/main/resources/images/fiat_logo_light_mode.png differ