diff options
| author | Ricki Hirner <hirner@bitfire.at> | 2022-03-11 14:10:42 +0300 |
|---|---|---|
| committer | Ricki Hirner <hirner@bitfire.at> | 2022-03-11 14:10:42 +0300 |
| commit | 73058b1ca618a465559be47ecd1be398b4ea3505 (patch) | |
| tree | 7d78ac52c81ef97b77c6f5152c06cfeac528d47a | |
| parent | fac1c9cfb11e16168798be447bc75239cb3cf8b0 (diff) | |
Support calendar colors
| -rw-r--r-- | src/main/java/at/bitfire/ical4android/ICalendar.kt | 6 | ||||
| -rw-r--r-- | src/test/java/at/bitfire/ical4android/ICalendarTest.kt | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/main/java/at/bitfire/ical4android/ICalendar.kt b/src/main/java/at/bitfire/ical4android/ICalendar.kt index d9e0788..a6ea234 100644 --- a/src/main/java/at/bitfire/ical4android/ICalendar.kt +++ b/src/main/java/at/bitfire/ical4android/ICalendar.kt @@ -44,7 +44,7 @@ open class ICalendar { // known iCalendar properties const val CALENDAR_NAME = "X-WR-CALNAME" - const val CALENDAR_COLOR = "COLOR" + const val CALENDAR_COLOR = "X-APPLE-CALENDAR-COLOR" /** * Default PRODID used when generating iCalendars. If you want another value, set it @@ -95,6 +95,10 @@ open class ICalendar { calendar.getProperty<Property>(CALENDAR_NAME)?.let { calName -> properties[CALENDAR_NAME] = calName.value } + + calendar.getProperty<Property>(Color.PROPERTY_NAME)?.let { calColor -> + properties[Color.PROPERTY_NAME] = calColor.value + } calendar.getProperty<Property>(CALENDAR_COLOR)?.let { calColor -> properties[CALENDAR_COLOR] = calColor.value } diff --git a/src/test/java/at/bitfire/ical4android/ICalendarTest.kt b/src/test/java/at/bitfire/ical4android/ICalendarTest.kt index 8d49a4e..f2693be 100644 --- a/src/test/java/at/bitfire/ical4android/ICalendarTest.kt +++ b/src/test/java/at/bitfire/ical4android/ICalendarTest.kt @@ -12,6 +12,7 @@ import net.fortuna.ical4j.model.Property import net.fortuna.ical4j.model.component.VAlarm import net.fortuna.ical4j.model.component.VTimeZone import net.fortuna.ical4j.model.parameter.Related +import net.fortuna.ical4j.model.property.Color import net.fortuna.ical4j.model.property.DtEnd import net.fortuna.ical4j.model.property.DtStart import net.fortuna.ical4j.model.property.Due @@ -50,17 +51,20 @@ class ICalendarTest { } @Test - fun testFromReader_calendarColor() { + fun testFromReader_calendarProperties() { val calendar = ICalendar.fromReader( StringReader("BEGIN:VCALENDAR\n" + "VERSION:2.0\n" + "METHOD:PUBLISH\n" + "PRODID:something\n" + - "COLOR:#000000\n" + - "X-WR-CALNAME:Some CALNAME\n" + + "X-WR-CALNAME:Some Calendar\n" + + "COLOR:darkred\n" + + "X-APPLE-CALENDAR-COLOR:#123456\n" + "END:VCALENDAR" )) - assertEquals(calendar.getProperty<Property?>("COLOR").value, "#000000") + assertEquals("Some Calendar", calendar.getProperty<Property>(ICalendar.CALENDAR_NAME).value) + assertEquals("darkred", calendar.getProperty<Property>(Color.PROPERTY_NAME).value) + assertEquals("#123456", calendar.getProperty<Property>(ICalendar.CALENDAR_COLOR).value) } @Test |