♻️ refactor recurrence handling

Author: Shubham Jitiya

example/lib/widgets/add_event_form.dart

@@ -145,6 +145,7 @@ class _AddOrEditEventFormState extends State<AddOrEditEventForm> {
                       ));
                     } else {
                       _endDate = date.withoutTime;
+                      _recurrenceEndDate = _endDate;
                       updateWeekdaysSelection();
                     }
 

lib/src/event_controller.dart

@@ -138,7 +138,8 @@ class EventController<T extends Object?> extends ChangeNotifier {
         return currentDate.day == startDate.day;
       case RecurrenceEnd.on:
         return recurrenceEndDate != null &&
-            (currentDate.day == startDate.day) &&
+            (currentDate.day >= startDate.day &&
+                currentDate.isBefore(recurrenceEndDate)) &&
             currentDate.isBefore(recurrenceEndDate.add(
               Duration(days: 1),
             ));
@@ -165,6 +166,43 @@ class EventController<T extends Object?> extends ChangeNotifier {
             ));
     }
   }
+
+  bool _handleRecurrence({
+    required DateTime currentDate,
+    required DateTime eventStartDate,
+    required DateTime eventEndDate,
+    required RecurrenceSettings recurrenceSettings,
+  }) {
+    switch (recurrenceSettings.frequency) {
+      case RepeatFrequency.daily:
+        final isDailyRecurrence = _isDailyRecurrence(
+          currentDate: currentDate,
+          eventEnd: eventEndDate,
+          recurrenceSettings: recurrenceSettings,
+        );
+        return isDailyRecurrence;
+      case RepeatFrequency.weekly:
+        final isWeeklyRecurrence = _isWeeklyRecurrence(
+          currentDate: currentDate,
+          eventStartDate: eventStartDate,
+          recurrenceSettings: recurrenceSettings,
+        );
+        return isWeeklyRecurrence;
+      case RepeatFrequency.monthly:
+        final isMonthlyRecurrence = _isMonthlyRecurrence(
+          currentDate: currentDate,
+          startDate: eventStartDate,
+          recurrenceSettings: recurrenceSettings,
+        );
+        return isMonthlyRecurrence;
+      case RepeatFrequency.yearly:
+        // TODO(Shubham): Handle this case.
+        break;
+      case RepeatFrequency.doNotRepeat:
+        break;
+    }
+    return false;
+  }
   //#endregion
 
   //#region Public Methods
@@ -268,42 +306,14 @@ class EventController<T extends Object?> extends ChangeNotifier {
       if (recurrenceSettings == null) {
         continue;
       }
-      switch (recurrenceSettings.frequency) {
-        case RepeatFrequency.daily:
-          final isDailyRecurrence = _isDailyRecurrence(
-            currentDate: date,
-            eventEnd: event.endDate,
-            recurrenceSettings: recurrenceSettings,
-          );
-          if (isDailyRecurrence) {
-            events.add(event);
-          }
-          break;
-        case RepeatFrequency.weekly:
-          final isWeeklyRecurrence = _isWeeklyRecurrence(
-            currentDate: date,
-            eventStartDate: event.date,
-            recurrenceSettings: recurrenceSettings,
-          );
-          if (isWeeklyRecurrence) {
-            events.add(event);
-          }
-          break;
-        case RepeatFrequency.monthly:
-          final isWeeklyRecurrence = _isMonthlyRecurrence(
-            currentDate: date,
-            startDate: event.date,
-            recurrenceSettings: recurrenceSettings,
-          );
-          if (isWeeklyRecurrence) {
-            events.add(event);
-          }
-          break;
-        case RepeatFrequency.yearly:
-          // TODO: Handle this case.
-          break;
-        case RepeatFrequency.doNotRepeat:
-          break;
+      final isRecurrence = _handleRecurrence(
+        currentDate: date,
+        eventStartDate: event.date,
+        eventEndDate: event.endDate,
+        recurrenceSettings: recurrenceSettings,
+      );
+      if (isRecurrence) {
+        events.add(event);
       }
     }
     return events;