Skip to content

Commit 77bf31e

Browse files
committed
fix: line lrc color in WtW mode
1 parent ed75f9c commit 77bf31e

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

  • decorations/src/main/java/app/simple/felicity/decorations/lrc/view

decorations/src/main/java/app/simple/felicity/decorations/lrc/view/LrcLineView.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public class LrcLineView extends View implements ThemeChangedListener {
6060
private static final float DEFAULT_TEXT_SIZE_SP = 16f;
6161

6262
/**
63-
* The color for words that haven't been sung yet. A bit dimmer than the
64-
* highlight so the active word stands out nicely.
63+
* The color for words that haven't been sung yet. Used as a fallback before
64+
* the theme is applied for the first time.
6565
*/
6666
private static final int DEFAULT_NORMAL_COLOR = 0xCCFFFFFF;
6767

@@ -87,8 +87,8 @@ public class LrcLineView extends View implements ThemeChangedListener {
8787
private int cachedLineIndex = Integer.MIN_VALUE;
8888
private int cachedWordIndex = Integer.MIN_VALUE;
8989
/**
90-
* The color for words that haven't been sung yet. Dimmer than the highlight color
91-
* so the active word stands out nicely against the album art.
90+
* The color for words that haven't been sung yet. Pulled from the theme's secondary
91+
* text color so it always looks intentional rather than just "dimmed white".
9292
*/
9393
@ColorInt
9494
private int normalColor = DEFAULT_NORMAL_COLOR;
@@ -164,6 +164,7 @@ protected void onAttachedToWindow() {
164164
ThemeManager.INSTANCE.addListener(this);
165165
// Apply the current theme right away so the first draw looks correct
166166
highlightColor = ThemeManager.INSTANCE.getTheme().getTextViewTheme().getPrimaryTextColor();
167+
normalColor = ThemeManager.INSTANCE.getTheme().getTextViewTheme().getSecondaryTextColor();
167168
accentColor = ThemeManager.INSTANCE.getAccent().getPrimaryAccentColor();
168169
backgroundColor = ThemeManager.INSTANCE.getTheme().getViewGroupTheme().getHighlightColor();
169170
applyBackgroundAlpha();
@@ -182,6 +183,7 @@ protected void onDetachedFromWindow() {
182183
public void onThemeChanged(@NonNull Theme theme, boolean animate) {
183184
// The user switched themes — grab the new primary text color and repaint
184185
highlightColor = theme.getTextViewTheme().getPrimaryTextColor();
186+
normalColor = theme.getTextViewTheme().getSecondaryTextColor();
185187
backgroundColor = theme.getViewGroupTheme().getHighlightColor();
186188
applyBackgroundAlpha();
187189
invalidateCache();

0 commit comments

Comments
 (0)