From abc55bbf2c239c5f5deeca91e7d54debde0b7e68 Mon Sep 17 00:00:00 2001
From: Mehul Kabaria <mehul.kabaria@gmail.com>
Date: Thu, 17 Nov 2022 22:28:51 +0530
Subject: [PATCH] #61 (#116)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Enhancement/remove where (#53)

* Add removeWhere to EventController

* Fix merge and remove events

* 🐛 : Duplicate item in cells while adding events in the same session #61

Signed-off-by: Mehul Kabaria <mehul.kabaria@gmail.com>

Signed-off-by: Mehul Kabaria <mehul.kabaria@gmail.com>
Co-authored-by: Alexandre <97731236+AlexandreMaul@users.noreply.github.com>
---
 README.md                                     |  1 +
 .../android/app/src/main/AndroidManifest.xml  |  1 +
 lib/src/event_controller.dart                 | 31 ++++++++++---------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 00bbf3f6..83544f90 100644
--- a/README.md
+++ b/README.md
@@ -291,6 +291,7 @@ Above code will create `WeekView` with only five days, from monday to friday.
     <td align="center"><a href="https://github.com/ParthBaraiya"><img src="https://avatars.githubusercontent.com/u/36261739?v=4" width="100px;" alt=""/><br /><sub><b>Parth Baraiya</b></sub></a></td>
     <td align="center"><a href="https://github.com/ujas-m-simformsolutions"><img src="https://avatars.githubusercontent.com/u/76939001?v=4" width="100px;" alt=""/><br /><sub><b>Ujas Majithiya</b></sub></a></td>
     <td align="center"><a href="https://github.com/AnkitPanchal10"><img src="https://avatars.githubusercontent.com/u/38405884?s=100" width="100px;" alt=""/><br /><sub><b>Ankit Panchal</b></sub></a></td>
+    <td align="center"><a href="https://github.com/MehulKK"><img src="https://avatars.githubusercontent.com/u/60209725?s=100" width="100px;" alt=""/><br /><sub><b>Mehul Kabaria</b></sub></a></td>
     <td align="center"><a href="https://github.com/faiyaz-shaikh"><img src="https://avatars.githubusercontent.com/u/89002539?v=4" width="100px;" alt=""/><br /><sub><b>Faiyaz Shaikh</b></sub></a></td>
 </tr>
 </table>
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 3ced93b6..83117998 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/lib/src/event_controller.dart b/lib/src/event_controller.dart
index cf454892..8b0cffdd 100644
--- a/lib/src/event_controller.dart
+++ b/lib/src/event_controller.dart
@@ -96,6 +96,16 @@ class EventController<T extends Object?> extends ChangeNotifier {
     }
   }
 
+  /// Removes multiple [event] from this controller.
+  void removeWhere(bool Function(CalendarEventData<T> element) test) {
+    for (final e in _events.values) {
+      e.removeWhere(test);
+    }
+    _rangingEventList.removeWhere(test);
+    _eventList.removeWhere(test);
+    notifyListeners();
+  }
+
   /// Returns events on given day.
   ///
   /// To overwrite default behaviour of this function,
@@ -109,21 +119,12 @@ class EventController<T extends Object?> extends ChangeNotifier {
       events.addAll(_events[date]!);
     }
 
-    final daysFromRange = <DateTime>[];
     for (final rangingEvent in _rangingEventList) {
-      for (var i = 0;
-          i <= rangingEvent.endDate.difference(rangingEvent.date).inDays;
-          i++) {
-        daysFromRange.add(rangingEvent.date.add(Duration(days: i)));
-      }
-      if (rangingEvent.date.isBefore(rangingEvent.endDate)) {
-        for (final eventDay in daysFromRange) {
-          if (eventDay.year == date.year &&
-              eventDay.month == date.month &&
-              eventDay.day == date.day) {
-            events.add(rangingEvent);
-          }
-        }
+      if (date == rangingEvent.date ||
+          date == rangingEvent.endDate ||
+          (date.isBefore(rangingEvent.endDate) &&
+              date.isAfter(rangingEvent.date))) {
+        events.add(rangingEvent);
       }
     }
 
@@ -163,5 +164,5 @@ class EventController<T extends Object?> extends ChangeNotifier {
     notifyListeners();
   }
 
-  //#endregion
+//#endregion
 }