From 4fca3fe0c517f4753d6fa353a4746741b95035b5 Mon Sep 17 00:00:00 2001 From: crschnick Date: Wed, 6 Aug 2025 19:09:06 +0000 Subject: [PATCH] Fixes [stage] --- app/build.gradle | 4 +--- .../java/io/xpipe/app/browser/menu/impl/BackMenuProvider.java | 2 +- .../io/xpipe/app/browser/menu/impl/ForwardMenuProvider.java | 2 +- .../app/hub/action/impl/HostAddressSwitchBranchProvider.java | 2 +- app/src/main/java/module-info.java | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index efec2f96b..01405bfad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,10 +64,8 @@ dependencies { api group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "2.19.1" api group: 'org.kordamp.ikonli', name: 'ikonli-material2-pack', version: "12.4.0" api group: 'org.kordamp.ikonli', name: 'ikonli-materialdesign2-pack', version: "12.4.0" - api group: 'org.kordamp.ikonli', name: 'ikonli-javafx', version: "12.4.0" - api group: 'org.kordamp.ikonli', name: 'ikonli-material-pack', version: "12.4.0" - api group: 'org.kordamp.ikonli', name: 'ikonli-feather-pack', version: "12.4.0" api 'org.kordamp.ikonli:ikonli-bootstrapicons-pack:12.4.0' + api group: 'org.kordamp.ikonli', name: 'ikonli-javafx', version: "12.4.0" api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.17' api group: 'org.slf4j', name: 'slf4j-jdk-platform-logging', version: '2.0.17' api 'io.xpipe:modulefs:0.1.6' diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/BackMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/BackMenuProvider.java index d21b5a690..7b6051b0f 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/BackMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/BackMenuProvider.java @@ -29,7 +29,7 @@ public class BackMenuProvider implements BrowserMenuLeafProvider { @Override public LabelGraphic getIcon(BrowserFileSystemTabModel model, List entries) { - return new LabelGraphic.IconGraphic("fth-arrow-left"); + return new LabelGraphic.IconGraphic("mdi2a-arrow-left"); } @Override diff --git a/app/src/main/java/io/xpipe/app/browser/menu/impl/ForwardMenuProvider.java b/app/src/main/java/io/xpipe/app/browser/menu/impl/ForwardMenuProvider.java index c7e485204..aebc527d7 100644 --- a/app/src/main/java/io/xpipe/app/browser/menu/impl/ForwardMenuProvider.java +++ b/app/src/main/java/io/xpipe/app/browser/menu/impl/ForwardMenuProvider.java @@ -29,7 +29,7 @@ public class ForwardMenuProvider implements BrowserMenuLeafProvider { @Override public LabelGraphic getIcon(BrowserFileSystemTabModel model, List entries) { - return new LabelGraphic.IconGraphic("fth-arrow-right"); + return new LabelGraphic.IconGraphic("mdi2a-arrow-right"); } @Override diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/HostAddressSwitchBranchProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/HostAddressSwitchBranchProvider.java index f591bc7b2..aa97af0d6 100644 --- a/app/src/main/java/io/xpipe/app/hub/action/impl/HostAddressSwitchBranchProvider.java +++ b/app/src/main/java/io/xpipe/app/hub/action/impl/HostAddressSwitchBranchProvider.java @@ -44,7 +44,7 @@ public class HostAddressSwitchBranchProvider implements HubBranchProvider store) { - return active ? new LabelGraphic.IconGraphic("fth-arrow-right") : LabelGraphic.none(); + return active ? new LabelGraphic.IconGraphic("mdi2a-arrow-right") : LabelGraphic.none(); } @Override diff --git a/app/src/main/java/module-info.java b/app/src/main/java/module-info.java index 1b3437dee..7754bc3eb 100644 --- a/app/src/main/java/module-info.java +++ b/app/src/main/java/module-info.java @@ -67,7 +67,6 @@ open module io.xpipe.app { requires com.fasterxml.jackson.databind; requires com.fasterxml.jackson.annotation; requires net.synedra.validatorfx; - requires org.kordamp.ikonli.feather; requires io.xpipe.modulefs; requires io.xpipe.core; requires static lombok; @@ -80,7 +79,6 @@ open module io.xpipe.app { requires javafx.web; requires javafx.graphics; requires org.kordamp.ikonli.javafx; - requires org.kordamp.ikonli.material; requires io.sentry; requires io.xpipe.beacon; requires info.picocli; @@ -106,6 +104,7 @@ open module io.xpipe.app { requires jdk.accessibility; requires org.kordamp.ikonli.material2; requires org.kordamp.ikonli.materialdesign2; + requires org.kordamp.ikonli.bootstrapicons; requires jdk.zipfs; uses TerminalLauncher;