From 6a19f7ccd34be0a1e26e64c081de755287460347 Mon Sep 17 00:00:00 2001
From: dzaima
Date: Thu, 26 Feb 2026 00:57:39 +0200
Subject: Separate colors for pressed vs activated labels (#1193)
---
res/values/themes.xml | 2 ++
srcs/juloo.keyboard2/Keyboard2View.java | 3 ++-
srcs/juloo.keyboard2/Theme.java | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 566c875..98d4937 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -9,6 +9,7 @@
+
@@ -282,6 +283,7 @@
- #ffffff
- #ffffff
- ?colorKey
+ - ?colorKey
- #f5060b
- ?colorLabel
- 1dp
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index d93c8bb..5d6e0fa 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -413,8 +413,9 @@ public class Keyboard2View extends View
{
if ((flags & Pointers.FLAG_P_LOCKED) != 0)
return _theme.lockedColor;
+ return _theme.activatedColor;
}
- return _theme.activatedColor;
+ return _theme.pressedColor;
}
if (k.hasFlagsAny(KeyValue.FLAG_SECONDARY | KeyValue.FLAG_GREYED))
{
diff --git a/srcs/juloo.keyboard2/Theme.java b/srcs/juloo.keyboard2/Theme.java
index f291f36..6824e57 100644
--- a/srcs/juloo.keyboard2/Theme.java
+++ b/srcs/juloo.keyboard2/Theme.java
@@ -16,6 +16,7 @@ public class Theme
// Label colors
public final int lockedColor;
public final int activatedColor;
+ public final int pressedColor;
public final int labelColor;
public final int subLabelColor;
public final int secondaryLabelColor;
@@ -44,6 +45,7 @@ public class Theme
isLightNavBar = s.getBoolean(R.styleable.keyboard_windowLightNavigationBar, false);
labelColor = s.getColor(R.styleable.keyboard_colorLabel, 0);
activatedColor = s.getColor(R.styleable.keyboard_colorLabelActivated, 0);
+ pressedColor = s.getColor(R.styleable.keyboard_colorLabelPressed, labelColor);
lockedColor = s.getColor(R.styleable.keyboard_colorLabelLocked, 0);
subLabelColor = s.getColor(R.styleable.keyboard_colorSubLabel, 0);
secondaryLabelColor = adjustLight(labelColor,
--
cgit v1.2.3