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

Merge pull request #2047 from Naveen3Singh/calendar_color_fix

Browse Source 
Disable color darkening for calendar colors
This commit is contained in:
Tibor Kaputa
2023-04-11 18:54:31 +02:00
committed by GitHub
parent cf94cf5ac2 e461bbf50c
commit 01771f4393
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/CalDAVHelper.kt
View File

@@ -85,9 +85,8 @@ class CalDAVHelper(val context: Context) {
val accountType = cursor.getStringValue(Calendars.ACCOUNT_TYPE) val accountType = cursor.getStringValue(Calendars.ACCOUNT_TYPE)
val ownerName = cursor.getStringValue(Calendars.OWNER_ACCOUNT) ?: "" val ownerName = cursor.getStringValue(Calendars.OWNER_ACCOUNT) ?: ""
val color = cursor.getIntValue(Calendars.CALENDAR_COLOR) val color = cursor.getIntValue(Calendars.CALENDAR_COLOR)
val displayColor = getDisplayColorFromColor(color)
val accessLevel = cursor.getIntValue(Calendars.CALENDAR_ACCESS_LEVEL) val accessLevel = cursor.getIntValue(Calendars.CALENDAR_ACCESS_LEVEL)
val calendar = CalDAVCalendar(id, displayName, accountName, accountType, ownerName, displayColor, accessLevel) val calendar = CalDAVCalendar(id, displayName, accountName, accountType, ownerName, color, accessLevel)
calendars.add(calendar) calendars.add(calendar)
} }
@@ -141,7 +140,11 @@ class CalDAVHelper(val context: Context) {
context.queryCursor(uri, projection, selection, selectionArgs) { cursor -> context.queryCursor(uri, projection, selection, selectionArgs) { cursor ->
val colorKey = cursor.getStringValue(Colors.COLOR_KEY) val colorKey = cursor.getStringValue(Colors.COLOR_KEY)
val color = cursor.getIntValue(Colors.COLOR) val color = cursor.getIntValue(Colors.COLOR)
val displayColor = getDisplayColorFromColor(color) val displayColor = if (colorType == Colors.TYPE_CALENDAR) {
color
} else {
getDisplayColorFromColor(color)
}
colors[displayColor] = colorKey colors[displayColor] = colorKey
} }
return colors.toSortedMap(HsvColorComparator()) return colors.toSortedMap(HsvColorComparator())