From e9c2e395ff50f2c1440fb4acfa899fd52fc3fbb5 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 7 Sep 2025 23:30:14 +0000 Subject: [PATCH] Rework loading icon --- .../xpipe/app/comp/base/AppMainWindowContentComp.java | 11 ++++++----- build.gradle | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java b/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java index 64e5e3cf8..02395621d 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/AppMainWindowContentComp.java @@ -6,6 +6,7 @@ import io.xpipe.app.core.*; import io.xpipe.app.core.window.AppDialog; import io.xpipe.app.core.window.AppMainWindow; import io.xpipe.app.issue.TrackEvent; +import io.xpipe.app.platform.ColorHelper; import io.xpipe.app.platform.PlatformThread; import io.xpipe.app.prefs.AppPrefs; @@ -40,12 +41,12 @@ public class AppMainWindowContentComp extends SimpleComp { var loadingIcon = new ImageView(); loadingIcon.setFitWidth(80); loadingIcon.setFitHeight(80); - loadingIcon.setOpacity(0.9); - var color = - AppPrefs.get() != null && AppPrefs.get().theme().getValue().isDark() - ? Color.web("#0b898aff").darker() - : Color.web("#0b898aff"); + var dark = AppPrefs.get() != null && AppPrefs.get().theme().getValue().isDark(); + loadingIcon.setOpacity(dark ? 0.95 : 0.93); + + var color = AppPrefs.get() != null ? ColorHelper.withOpacity(AppPrefs.get().theme().getValue().getEmphasisColor().get(), + dark ? 0.7 : 0.85) : Color.TRANSPARENT; DropShadow shadow = new DropShadow(); shadow.setRadius(10); shadow.setColor(color); diff --git a/build.gradle b/build.gradle index 30f584065..1cb4a91a8 100644 --- a/build.gradle +++ b/build.gradle @@ -197,7 +197,7 @@ project.ext { isFullRelease = System.getenv('RELEASE') != null && Boolean.parseBoolean(System.getenv('RELEASE')) isStage = System.getenv('STAGE') != null && Boolean.parseBoolean(System.getenv('STAGE')) ci = System.getenv('CI') != null - obfuscate = false + obfuscate = true bundleCds = ci && fullVersion // Names