diff --git a/app/build.gradle b/app/build.gradle index 54a0e09a..b8a5b159 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,7 +36,6 @@ dependencies { compileOnly 'org.junit.jupiter:junit-jupiter-api:5.9.3' compileOnly 'org.junit.jupiter:junit-jupiter-params:5.9.3' - implementation 'com.dustinredmond.fxtrayicon:FXTrayIcon:4.0.1' implementation 'net.java.dev.jna:jna-jpms:5.13.0' implementation 'net.java.dev.jna:jna-platform-jpms:5.13.0' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.15.2" @@ -104,7 +103,6 @@ project.ext { "--add-opens", "java.base/java.lang.reflect=com.jfoenix", "--add-opens", "java.base/java.lang.reflect=com.jfoenix", "--add-opens", "java.base/java.lang=io.xpipe.core", - "--add-opens", "com.dustinredmond.fxtrayicon/com.dustinredmond.fxtrayicon=io.xpipe.app", "--add-opens", "java.desktop/java.awt=io.xpipe.app", "--add-opens", "net.synedra.validatorfx/net.synedra.validatorfx=io.xpipe.app", "--add-opens", 'com.dlsc.preferencesfx/com.dlsc.preferencesfx.view=io.xpipe.app', diff --git a/app/src/main/java/io/xpipe/app/core/mode/TrayMode.java b/app/src/main/java/io/xpipe/app/core/mode/TrayMode.java index dd4c874e..6358b9b7 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/TrayMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/TrayMode.java @@ -1,15 +1,16 @@ package io.xpipe.app.core.mode; -import com.dustinredmond.fxtrayicon.FXTrayIcon; import io.xpipe.app.core.AppTray; import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.issue.*; +import java.awt.*; + public class TrayMode extends PlatformMode { @Override public boolean isSupported() { - return super.isSupported() && FXTrayIcon.isSupported(); + return super.isSupported() && Desktop.isDesktopSupported() && SystemTray.isSupported(); } @Override diff --git a/app/src/main/java/module-info.java b/app/src/main/java/module-info.java index 992ffc05..41dbf808 100644 --- a/app/src/main/java/module-info.java +++ b/app/src/main/java/module-info.java @@ -57,7 +57,6 @@ open module io.xpipe.app { requires org.fxmisc.wellbehavedfx; requires org.kordamp.ikonli.feather; requires org.reactfx; - requires com.dustinredmond.fxtrayicon; requires io.xpipe.modulefs; requires io.xpipe.core; requires static lombok;