Merge pull request #1 from codewave-tech/feature/event-handling

Feature/event handling

Author: t0uh33d

lib/src/calendar_view/calendar_view.dart

@@ -1,7 +1,10 @@
 library calendar_view;
 
 // import 'package:dotted_border/dotted_border.dart';
+import 'dart:math';
+
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 
 part 'controller.dart';
 part 'data.dart';

lib/src/calendar_view/controller.dart

@@ -1,6 +1,7 @@
 part of calendar_view;
 
 class CalendarViewController {
+  // 2D month array data
   late List<List<CalendarElemet?>> _monthArr;
 
   late DateTime _displayMonth;
@@ -124,6 +125,7 @@ class CalendarViewController {
     _calendarViewStateUpdator?.call(() {});
   }
 
+  // here we generate the 2D array which contains month elements
   void _generateMonthArr() {
     DateTime firstDayOfTheMonth =
         DateTime(_displayMonth.year, _displayMonth.month, 1);
@@ -151,6 +153,10 @@ class CalendarViewController {
     }
   }
 
+  // builds individual month elements goes from index 0 to 42
+  // when idx < 7 := we need to build the day
+  // and for the rest fill the elements of 2D array with monday day
+  // and the leading and trailing is filled as well
   Widget _buildMonthElemet(int index) {
     if (index < 7) {
       return SizedBox(
@@ -187,6 +193,12 @@ class CalendarViewController {
       return CalendarViewWidgets.isLeadingOrTrailingElement(calendarElemet);
     }
 
+    // render event
+    if (_eventExistsForDay(dateTime)) {
+      RangeMasonCalendarEvent event = _getEvent(dateTime);
+      return CalendarViewWidgets.event(event);
+    }
+
     if (!_rangeSelectionMode && _isEqual(dateTime, _singleDateSelectionDate)) {
       return CalendarViewWidgets.selectedDate(calendarElemet);
     }
@@ -198,6 +210,7 @@ class CalendarViewController {
       );
     }
 
+    // range selection mode check
     if (_rangeSelectionMode &&
         (_isEqual(dateTime, _rangeStartDate) ||
             _isEqual(dateTime, _rangeEndDate))) {
@@ -270,4 +283,31 @@ class CalendarViewController {
       return 1;
     }
   }
+
+  // calendar event functionality
+
+  // event map
+  final Map<String, RangeMasonCalendarEvent> _eventMap = {};
+
+  bool _eventExistsForDay(DateTime dateTime) {
+    return _eventMap.containsKey(_generateEventMapKey(dateTime));
+  }
+
+  RangeMasonCalendarEvent _getEvent(DateTime dateTime) {
+    return _eventMap[_generateEventMapKey(dateTime)]!;
+  }
+
+  String _generateEventMapKey(DateTime dateTime) {
+    return DateFormat("dd MMM yyyy").format(dateTime);
+  }
+
+  void addEvent(RangeMasonCalendarEvent event) {
+    _eventMap[_generateEventMapKey(event.dateTime)] = event;
+  }
+
+  void addEvents(List<RangeMasonCalendarEvent> events) {
+    for (int idx = 0; idx < events.length; idx++) {
+      addEvent(events[idx]);
+    }
+  }
 }

lib/src/calendar_view/data_modelling.dart

@@ -29,3 +29,15 @@ typedef CalendarViewStateUpdator = void Function(void Function() fn);
 typedef CalendarClick = void Function(CalendarElemet calendarElemet);
 typedef CalendarHover = void Function(
     CalendarElemet calendarElemet, bool value);
+
+class RangeMasonCalendarEvent {
+  final DateTime dateTime;
+  final TextStyle textStyle;
+  final BoxDecoration boxDecoration;
+
+  RangeMasonCalendarEvent({
+    required this.dateTime,
+    required this.textStyle,
+    required this.boxDecoration,
+  });
+}

lib/src/calendar_view/widgets.dart

@@ -188,4 +188,27 @@ class CalendarViewWidgets {
       )),
     );
   }
+
+  // for events
+  static Widget event(RangeMasonCalendarEvent event) {
+    return Container(
+      height: 24,
+      width: 24,
+      decoration: event.boxDecoration,
+      // BoxDecoration(
+      //   borderRadius: BorderRadius.circular(4),
+      //   color: isSelectable
+      //       ? _colorScheme.possibleSelectionColor
+      //       : _colorScheme.selectedColor,
+      // ),
+      margin: const EdgeInsets.all(4),
+      child: Center(
+          child: Text(
+        '${event.dateTime.day}',
+        style: event.textStyle,
+        maxLines: 1,
+        overflow: TextOverflow.ellipsis,
+      )),
+    );
+  }
 }

lib/src/date_selector/date_selector.dart

@@ -11,10 +11,10 @@ import '../calendar_view/calendar_view.dart';
 // part 'junky_logic.dart';
 // part 'range_selector_logic.dart';
 
-typedef BottomBarSelectorBuilder = Widget Function(
-  CalendarViewController logic,
-  BuildContext context,
-);
+typedef ControllerCreationCallBack = void Function(
+    CalendarViewController controller);
+
+typedef OnCalendarUpdate = void Function(int month, int year);
 
 class DateSelector extends StatefulWidget {
   final double width;
@@ -23,16 +23,20 @@ class DateSelector extends StatefulWidget {
   final Color dividerColor;
   final TextStyle? headerTextStyle;
   final CalendarColorScheme? colorScheme;
-  final BottomBarSelectorBuilder? bottomBar;
+  final Widget? bottomBar;
+  final CalendarViewController controller;
+  final OnCalendarUpdate? onCalendarUpdate;
   const DateSelector({
     super.key,
+    required this.controller,
     this.width = 250,
     this.padding,
     this.crossAxisPadding = 12,
     this.dividerColor = Colors.grey,
     this.headerTextStyle,
     this.colorScheme,
     this.bottomBar,
+    this.onCalendarUpdate,
   });
 
   @override
@@ -44,10 +48,10 @@ class _DateSelectorState extends State<DateSelector> {
   late double calendarViewWidth;
 
   // final RangeSelectorLogic logic = RangeSelectorLogic();
-  final CalendarViewController controller = CalendarViewController(
-    id: "data_selector",
-    enableRangeSelectionMode: false,
-  );
+  // final CalendarViewController controller = CalendarViewController(
+  //   id: "data_selector",
+  //   enableRangeSelectionMode: false,
+  // );
 
   late ValueNotifier<String> calendarNotifier;
 
@@ -59,19 +63,25 @@ class _DateSelectorState extends State<DateSelector> {
     maxWidth = widget.width + widget.crossAxisPadding;
     calendarViewWidth = maxWidth - 40;
 
-    calendarNotifier = ValueNotifier<String>(_format(controller.displayDate!));
+    calendarNotifier =
+        ValueNotifier<String>(_format(widget.controller.displayDate!));
+
+    // widget.onControllerCreated?.call(controller);
+
     super.initState();
   }
 
   void _updateCalendarDateDisplay() {
-    calendarNotifier.value = _format(controller.displayDate!);
+    calendarNotifier.value = _format(widget.controller.displayDate!);
+    DateTime dateTime = widget.controller.displayDate!;
+    widget.onCalendarUpdate?.call(dateTime.month, dateTime.year);
   }
 
   @override
   Widget build(BuildContext context) {
     return Container(
       decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(4),
+        borderRadius: BorderRadius.circular(8),
         color: Colors.white,
       ),
       padding: widget.padding,
@@ -81,22 +91,21 @@ class _DateSelectorState extends State<DateSelector> {
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           _calendarControls(
-            controller: controller,
+            controller: widget.controller,
             notifier: calendarNotifier,
           ),
           Divider(
             color: widget.dividerColor,
             height: 0,
           ),
           const SizedBox(height: 7),
-          _calendarView(controller),
+          _calendarView(widget.controller),
           const SizedBox(height: 7),
           Divider(
             color: widget.dividerColor,
             height: 0,
           ),
-          if (widget.bottomBar != null)
-            widget.bottomBar!.call(controller, context),
+          if (widget.bottomBar != null) widget.bottomBar!
         ],
       ),
     );