From 36d22a0f0692b627bbda519fc902e97259773e93 Mon Sep 17 00:00:00 2001
From: Wintandre <84229910+Wintandre@users.noreply.github.com>
Date: Sun, 20 Mar 2022 16:58:22 +0000
Subject: [PATCH] Fix repeating and non-repeating UK holidays.

---
 app/src/main/assets/unitedkingdom.ics | 35 ++++++++++++++++++---------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/src/main/assets/unitedkingdom.ics b/app/src/main/assets/unitedkingdom.ics
index 92699da08..b24823fd5 100644
--- a/app/src/main/assets/unitedkingdom.ics
+++ b/app/src/main/assets/unitedkingdom.ics
@@ -58,12 +58,12 @@ DTSTART;VALUE=DATE:20300318
 DTEND;VALUE=DATE:20300319
 END:VEVENT
 BEGIN:VEVENT
-STATUS:CONFIRMED
+STATUS:CANCELLED
 UID:uni_9
 SUMMARY:Good Friday
-RRULE:FREQ=YEARLY
 DTSTART;VALUE=DATE:20210402
 DTEND;VALUE=DATE:20210403
+LAST-MODIFIED:20220301
 END:VEVENT
 BEGIN:VEVENT
 STATUS:CONFIRMED
@@ -129,12 +129,12 @@ DTSTART;VALUE=DATE:20300419
 DTEND;VALUE=DATE:20300420
 END:VEVENT
 BEGIN:VEVENT
-STATUS:CONFIRMED
+STATUS:CANCELLED
 UID:uni_19
 SUMMARY:Easter Monday
-RRULE:FREQ=YEARLY
 DTSTART;VALUE=DATE:20210405
 DTEND;VALUE=DATE:20210406
+LAST-MODIFIED:20220301
 END:VEVENT
 BEGIN:VEVENT
 STATUS:CONFIRMED
@@ -203,13 +203,24 @@ BEGIN:VEVENT
 STATUS:CONFIRMED
 UID:uni_29
 SUMMARY:Early May Bank Holiday
+RRULE:FREQ=YEARLY;BYDAY=1MO;BYMONTH=5
 DTSTART;VALUE=DATE:20220502
 DTEND;VALUE=DATE:20220503
+LAST-MODIFIED:20220301
 END:VEVENT
 BEGIN:VEVENT
 STATUS:CONFIRMED
 UID:uni_30
 SUMMARY:Spring Bank Holiday
+RRULE:FREQ=YEARLY;BYDAY=-1MO;BYMONTH=5
+DTSTART;VALUE=DATE:20230529
+DTEND;VALUE=DATE:20230530
+LAST-MODIFIED:20220301
+END:VEVENT
+BEGIN:VEVENT
+STATUS:CONFIRMED
+UID:uni_30a
+SUMMARY:Spring Bank Holiday
 DTSTART;VALUE=DATE:20220602
 DTEND;VALUE=DATE:20220603
 END:VEVENT
@@ -243,12 +254,12 @@ DTSTART;VALUE=DATE:20260713
 DTEND;VALUE=DATE:20260714
 END:VEVENT
 BEGIN:VEVENT
-STATUS:CONFIRMED
+STATUS:CANCELLED
 UID:uni_34
 SUMMARY:Summer Bank Holiday
-RRULE:FREQ=YEARLY;BYDAY=1MO;BYMONTH=8
 DTSTART;VALUE=DATE:20210802
 DTEND;VALUE=DATE:20210803
+LAST-MODIFIED:20220301
 END:VEVENT
 BEGIN:VEVENT
 STATUS:CONFIRMED
@@ -277,8 +288,9 @@ BEGIN:VEVENT
 STATUS:CONFIRMED
 UID:uni_38
 SUMMARY:Christmas Day (substitute)
-DTSTART;VALUE=DATE:20221226
-DTEND;VALUE=DATE:20221227
+DTSTART;VALUE=DATE:20221227
+DTEND;VALUE=DATE:20221228
+LAST-MODIFIED:20220301
 END:VEVENT
 BEGIN:VEVENT
 STATUS:CONFIRMED
@@ -303,11 +315,12 @@ DTSTART;VALUE=DATE:20211228
 DTEND;VALUE=DATE:20211229
 END:VEVENT
 BEGIN:VEVENT
-STATUS:CONFIRMED
+STATUS:CANCELLED
 UID:uni_42
 SUMMARY:Boxing Day (substitute)
-DTSTART;VALUE=DATE:20221227
-DTEND;VALUE=DATE:20221228
+DTSTART;VALUE=DATE:20211228
+DTEND;VALUE=DATE:20211229
+LAST-MODIFIED:20220301
 END:VEVENT
 BEGIN:VEVENT
 STATUS:CONFIRMED