fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #1273, highlight weekends on the monthly widget too

Browse Source
This commit is contained in:
tibbi
2021-03-10 12:46:33 +01:00
parent d4fc30f3e9
commit c45a063369
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt
View File

@@ -116,10 +116,18 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
} }
} }
val weakTextColor = textColor.adjustAlpha(MEDIUM_ALPHA)
for (i in 0 until len) { for (i in 0 until len) {
val day = days[i] val day = days[i]
val currTextColor = if (day.isThisMonth) textColor else weakTextColor
val redTextColor = context.resources.getColor(R.color.red_text)
val dayTextColor = if (context.config.highlightWeekends && day.isWeekend) {
redTextColor
} else {
textColor
}
val weakTextColor = dayTextColor.adjustAlpha(MEDIUM_ALPHA)
val currTextColor = if (day.isThisMonth) dayTextColor else weakTextColor
val id = res.getIdentifier("day_$i", "id", packageName) val id = res.getIdentifier("day_$i", "id", packageName)
views.removeAllViews(id) views.removeAllViews(id)
addDayNumber(context, views, day, currTextColor, id) addDayNumber(context, views, day, currTextColor, id)
@@ -214,13 +222,22 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
} }
private fun updateDayLabels(context: Context, views: RemoteViews, resources: Resources, textColor: Int) { private fun updateDayLabels(context: Context, views: RemoteViews, resources: Resources, textColor: Int) {
val sundayFirst = context.config.isSundayFirst val config = context.config
val sundayFirst = config.isSundayFirst
val smallerFontSize = context.getWidgetFontSize() val smallerFontSize = context.getWidgetFontSize()
val packageName = context.packageName val packageName = context.packageName
val letters = context.resources.getStringArray(R.array.week_day_letters) val letters = context.resources.getStringArray(R.array.week_day_letters)
val redTextColor = resources.getColor(R.color.red_text)
for (i in 0..6) { for (i in 0..6) {
val id = resources.getIdentifier("label_$i", "id", packageName) val id = resources.getIdentifier("label_$i", "id", packageName)
views.setTextColor(id, textColor) val dayTextColor = if (config.highlightWeekends && isWeekend(i, sundayFirst)) {
redTextColor
} else {
textColor
}
views.setTextColor(id, dayTextColor)
views.setTextSize(id, smallerFontSize) views.setTextSize(id, smallerFontSize)
var index = i var index = i