Skip to content

Extract hardcoded colors to colors.xml #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LeanBitLab merged 1 commit into from
May 3, 2026
+16 −7
Merged

Extract hardcoded colors to colors.xml #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/src/main/java/com/leanbitlab/lwidget/AwidgetProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,19 +322,19 @@ class AwidgetProvider : AppWidgetProvider() {
// Resolve background color (0=Default, 1=System Accent, 2=Custom)
fun resolveBgColor(idx: Int, isLight: Boolean): Int {
return when (idx) {
0 -> if (isLight) android.graphics.Color.WHITE else android.graphics.Color.parseColor("#212121")
0 -> if (isLight) android.graphics.Color.WHITE else context.getColor(R.color.widget_bg_dark)
1 -> if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
context.getColor(android.R.color.system_accent1_500)
} else {
android.graphics.Color.CYAN
context.getColor(R.color.widget_fallback_cyan)
}
2 -> {
val r = prefs.getInt("bg_color_r", 255)
val g = prefs.getInt("bg_color_g", 255)
val b = prefs.getInt("bg_color_b", 255)
android.graphics.Color.rgb(r, g, b)
}
else -> if (isLight) android.graphics.Color.WHITE else android.graphics.Color.parseColor("#212121")
else -> if (isLight) android.graphics.Color.WHITE else context.getColor(R.color.widget_bg_dark)
}
}

Expand All @@ -355,7 +355,7 @@ class AwidgetProvider : AppWidgetProvider() {
1 -> if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
context.getColor(android.R.color.system_accent1_500)
} else {
android.graphics.Color.CYAN
context.getColor(R.color.widget_fallback_cyan)
}
2 -> {
val r = prefs.getInt("outline_color_r", 255)
Expand Down Expand Up @@ -412,17 +412,17 @@ class AwidgetProvider : AppWidgetProvider() {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
context.getColor(android.R.color.system_accent2_500)
} else {
android.graphics.Color.YELLOW
context.getColor(R.color.widget_fallback_yellow)
}
}
else -> if (useLightTheme) android.graphics.Color.parseColor("#AA555544") else android.graphics.Color.parseColor("#BBDDDDCC")
else -> if (useLightTheme) context.getColor(R.color.widget_date_light) else context.getColor(R.color.widget_date_dark)
}
}
val alarmColor = if (useDynamicColors && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
// Cool tertiary accent for alarm
context.getColor(if (useLightTheme) android.R.color.system_accent3_700 else android.R.color.system_accent3_100)
} else {
if (useLightTheme) android.graphics.Color.parseColor("#AA445566") else android.graphics.Color.parseColor("#BBAACCDD")
if (useLightTheme) context.getColor(R.color.widget_alarm_light) else context.getColor(R.color.widget_alarm_dark)
}

// Background & outline dynamic color
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,13 @@
<!-- Light Theme Colors -->
<color name="widget_text_light">#FF1C1B1F</color>
<color name="widget_text_secondary_light">#FF49454F</color>

<!-- Widget Colors -->
<color name="widget_bg_dark">#212121</color>
<color name="widget_date_light">#AA555544</color>
<color name="widget_date_dark">#BBDDDDCC</color>
<color name="widget_alarm_light">#AA445566</color>
<color name="widget_alarm_dark">#BBAACCDD</color>
<color name="widget_fallback_cyan">#00FFFF</color>
<color name="widget_fallback_yellow">#FFFF00</color>
</resources>
Loading