From b0dbdeafa3e63e6815f99c7354cbdbfab3c8f76c Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Sat, 21 Feb 2026 18:25:17 +0100
Subject: [PATCH] Toggle

---
 .../ui2/components/inputs/Toggle.java         | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java b/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java
index 5436d42..c0cfcf6 100644
--- a/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java
+++ b/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java
@@ -1,22 +1,12 @@
 package org.saturnclient.ui2.components.inputs;
 
 import org.saturnclient.saturnclient.config.Property;
-import org.saturnclient.saturnclient.config.ThemeManager;
+import org.saturnclient.saturnclient.config.Theme;
 import org.saturnclient.ui2.Element;
 import org.saturnclient.ui2.ElementContext;
 import org.saturnclient.ui2.RenderScope;
 
 public class Toggle extends Element {
-    private static ThemeManager theme = new ThemeManager("Toggle", "hovering", "enabled");
-    private static Property<Integer> bgColor = theme.property("bg-color", Property.color(0xFF808080));
-    private static Property<Integer> fgColor = theme.property("fg-color", Property.color(0xFF909090));
-    private static Property<Integer> cornerRadius = theme.property("corner-radius", Property.integer(30));
-
-    static {
-        theme.propertyStateDefault("enabled", "bg-color", 0xaf8B5CF6);
-        theme.propertyStateDefault("enabled", "fg-color", 0xff8B5CF6);
-    }
-
     private Property<Boolean> prop;
 
     public Toggle(Property<Boolean> prop) {
@@ -27,19 +17,10 @@ public class Toggle extends Element {
 
     @Override
     public void render(RenderScope renderScope, ElementContext ctx) {
-        theme.setState(null);
-
-        if (prop.value) {
-            theme.setState("enabled");
-        }
-
-        if (ctx.isHovering()) {
-            theme.applyState("hovering");
-        }
-
-        renderScope.drawRoundedRectangle(0, 0, width, height, cornerRadius.value, bgColor.value);
-
-        renderScope.drawRoundedRectangle(prop.value ? 30 : 0, 0, 30, 30, 30, fgColor.value);
+        renderScope.drawRoundedRectangle(0, 0, width, height, height,
+                prop.value ? Theme.ACCENT.value : Theme.PRIMARY.value);
+        renderScope.drawRoundedRectangle(prop.value ? 30 : 0, 0, 30, 30, 30,
+                prop.value ? Theme.ACCENT.value : Theme.PRIMARY.value);
     }
 
     @Override