Merge pull request #10 from harshyadavDeveloper/develop

New version

Author: harshyadavDeveloper

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 2.6.0
+
+* SmartParser — Gujarati, Bengali, Tamil parsing
+* SmartParser — new English expressions:
+  * "first/last monday of month"
+  * "2 mondays ago", "in 2 fridays"
+  * "beginning/end of next month"
+  * "this coming monday"
+  * "q1", "q2", "quarter 3"
+* SmartCalendar — range selection mode
+  * `rangeSelectionMode` param
+  * `onRangeSelected` callback
+  * Visual range highlight in month view
+* SmartCalendar — event overlap detection in week view
+* `supportedParseLocales` updated — now includes gu, bn, ta
+
 ## 2.5.0
 
 - Added `themeMode` to SmartCalendar — light/dark/system

README.md

@@ -19,6 +19,9 @@
   <a href="https://github.com/harshyadavDeveloper/smart_date_formatter/actions">
     <img src="https://github.com/harshyadavDeveloper/smart_date_formatter/actions/workflows/ci.yml/badge.svg" alt="CI"/>
   </a>
+  <a href="https://pub.dev/packages/smart_date_formatter/score">
+    <img src="https://img.shields.io/pub/points/smart_date_formatter?color=2E8B57&label=pub%20points" alt="Pub Points"/>
+  </a>
 </p>
 
 <p align="center">

example/pubspec.lock

@@ -21,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.0"
   clock:
     dependency: transitive
     description:
@@ -111,26 +111,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.19"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.16.0"
   path:
     dependency: transitive
     description:
@@ -166,7 +166,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.3.0"
+    version: "2.6.0"
   source_span:
     dependency: transitive
     description:
@@ -211,10 +211,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.11"
+    version: "0.7.6"
   vector_math:
     dependency: transitive
     description:
@@ -248,5 +248,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.10.0-0 <4.0.0"
+  dart: ">=3.9.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"

lib/src/calendar/smart_calendar.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:smart_date_formatter/smart_date_formatter.dart';
 import 'package:smart_date_formatter/src/calendar/views/agenda_view.dart';
-import 'calendar_event.dart';
-import 'calendar_controller.dart';
 import 'views/month_view.dart';
 import 'views/week_view.dart';
 import 'views/day_view.dart';
@@ -96,6 +95,12 @@ class SmartCalendar extends StatefulWidget {
   /// Theme mode for calendar
   final ThemeMode themeMode;
 
+  /// Enable range selection mode
+  final bool rangeSelectionMode;
+
+  /// Called when range is selected in calendar
+  final void Function(DateTime start, DateTime end)? onRangeSelected;
+
   /// Custom cell builder for month view dates.
   ///
   /// ```dart
@@ -155,6 +160,8 @@ class SmartCalendar extends StatefulWidget {
     this.showWeekNumbers = false,
     this.themeMode = ThemeMode.light,
     this.cellBuilder,
+    this.rangeSelectionMode = false,
+    this.onRangeSelected,
   });
 
   @override
@@ -165,6 +172,9 @@ class _SmartCalendarState extends State<SmartCalendar> {
   late SmartCalendarController _controller;
   late CalendarView _currentView;
   bool _ownsController = false;
+  DateTime? _rangeStart;
+  DateTime? _rangeEnd;
+  // bool _selectingRangeStart = true;
 
   @override
   void initState() {
@@ -204,6 +214,26 @@ class _SmartCalendarState extends State<SmartCalendar> {
   Color get _subtleTextColor =>
       _isDark ? Colors.grey.shade400 : Colors.grey.shade600;
 
+  // void _handleRangeTap(DateTime date) {
+  //   setState(() {
+  //     if (_selectingRangeStart || _rangeEnd != null) {
+  //       _rangeStart = date;
+  //       _rangeEnd = null;
+  //       _selectingRangeStart = false;
+  //     } else {
+  //       if (date.isBefore(_rangeStart!)) {
+  //         _rangeEnd = _rangeStart;
+  //         _rangeStart = date;
+  //       } else {
+  //         _rangeEnd = date;
+  //       }
+  //       _selectingRangeStart = true;
+  //       widget.onRangeSelected?.call(_rangeStart!, _rangeEnd!);
+  //     }
+  //     _controller.selectDate(date);
+  //   });
+  // }
+
   @override
   void dispose() {
     if (_ownsController) _controller.dispose();
@@ -240,6 +270,40 @@ class _SmartCalendarState extends State<SmartCalendar> {
                       ),
                   ],
                 ),
+              // After view switcher row
+              if (widget.rangeSelectionMode) ...[
+                Container(
+                  margin: const EdgeInsets.only(bottom: 8),
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+                  decoration: BoxDecoration(
+                    color: widget.selectedColor.withValues(alpha: 0.08),
+                    borderRadius: BorderRadius.circular(8),
+                  ),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      Icon(Icons.date_range,
+                          size: 14, color: widget.selectedColor),
+                      const SizedBox(width: 6),
+                      Text(
+                        _rangeStart == null
+                            ? 'Tap to select start date'
+                            : _rangeEnd == null
+                                ? 'Tap to select end date'
+                                : '${_rangeStart!.format('dd MMM')} → '
+                                    '${_rangeEnd!.format('dd MMM')} '
+                                    '(${_rangeEnd!.daysUntil(_rangeStart!) * -1 + 1} days)',
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: widget.selectedColor,
+                          fontWeight: FontWeight.w500,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
 
               // Calendar view
               _buildCurrentView(),
@@ -343,6 +407,8 @@ class _SmartCalendarState extends State<SmartCalendar> {
           showWeekNumbers: widget.showWeekNumbers,
           isDark: _isDark,
           cellBuilder: widget.cellBuilder,
+          rangeStart: widget.rangeSelectionMode ? _rangeStart : null, // 👈 new
+          rangeEnd: widget.rangeSelectionMode ? _rangeEnd : null,
         );
       case CalendarView.week:
         return WeekView(

lib/src/calendar/views/month_view.dart

@@ -52,6 +52,12 @@ class MonthView extends StatelessWidget {
   /// Whether dark theme is active
   final bool isDark;
 
+  /// Range selection start date
+  final DateTime? rangeStart;
+
+  /// Range selection end date
+  final DateTime? rangeEnd;
+
   /// Custom cell builder for month view dates.
   ///
   /// ```dart
@@ -94,6 +100,8 @@ class MonthView extends StatelessWidget {
     this.showWeekNumbers = false,
     this.isDark = false,
     this.cellBuilder,
+    this.rangeStart,
+    this.rangeEnd,
   });
 
   List<DateTime> _daysInMonth(DateTime month) {
@@ -243,22 +251,8 @@ class MonthView extends StatelessWidget {
                           isToday,
                         ),
                       )
-                    : DayCell(
-                        date: date,
-                        events: dayEvents,
-                        isSelected: isSelected,
-                        isToday: isToday,
-                        isCurrentMonth: isCurrentMonth,
-                        isWeekend: isWeekend,
-                        markerStyle: markerStyle,
-                        selectedColor: selectedColor,
-                        todayColor: todayColor,
-                        isDark: isDark,
-                        onTap: () {
-                          controller.selectDate(date);
-                          onDateSelected?.call(date, dayEvents);
-                        },
-                      ),
+                    : _buildRangeCell(date, dayEvents, isSelected, isToday,
+                        isCurrentMonth, isWeekend),
               );
             }),
           ],
@@ -272,4 +266,73 @@ class MonthView extends StatelessWidget {
     final dayOfYear = date.difference(firstDayOfYear).inDays + 1;
     return ((dayOfYear + firstDayOfYear.weekday - 2) / 7).ceil().clamp(1, 53);
   }
+
+  bool _isInSelectedRange(DateTime date) {
+    if (rangeStart == null || rangeEnd == null) return false;
+    final d = DateTime(date.year, date.month, date.day);
+    final s = DateTime(rangeStart!.year, rangeStart!.month, rangeStart!.day);
+    final e = DateTime(rangeEnd!.year, rangeEnd!.month, rangeEnd!.day);
+    return d.isAfter(s) && d.isBefore(e);
+  }
+
+  bool _isRangeStart(DateTime date) =>
+      rangeStart != null && date.isSameDay(rangeStart!);
+
+  bool _isRangeEnd(DateTime date) =>
+      rangeEnd != null && date.isSameDay(rangeEnd!);
+
+  Widget _buildRangeCell(
+    DateTime date,
+    List<CalendarEvent> events,
+    bool isSelected,
+    bool isToday,
+    bool isCurrentMonth,
+    bool isWeekend,
+  ) {
+    final inRange = _isInSelectedRange(date);
+    final isStart = _isRangeStart(date);
+    final isEnd = _isRangeEnd(date);
+
+    return GestureDetector(
+      onTap: () {
+        controller.selectDate(date);
+        onDateSelected?.call(date, events);
+      },
+      child: Container(
+        margin: EdgeInsets.zero,
+        decoration: BoxDecoration(
+          color: isStart || isEnd
+              ? selectedColor
+              : inRange
+                  ? selectedColor.withValues(alpha: 0.12)
+                  : Colors.transparent,
+          borderRadius: isStart
+              ? const BorderRadius.only(
+                  topLeft: Radius.circular(8),
+                  bottomLeft: Radius.circular(8),
+                )
+              : isEnd
+                  ? const BorderRadius.only(
+                      topRight: Radius.circular(8),
+                      bottomRight: Radius.circular(8),
+                    )
+                  : inRange
+                      ? BorderRadius.zero
+                      : BorderRadius.circular(8),
+        ),
+        child: DayCell(
+          date: date,
+          events: events,
+          isSelected: isSelected || isStart || isEnd,
+          isToday: isToday,
+          isCurrentMonth: isCurrentMonth,
+          isWeekend: isWeekend,
+          markerStyle: markerStyle,
+          selectedColor: selectedColor,
+          todayColor: todayColor,
+          isDark: isDark,
+        ),
+      ),
+    );
+  }
 }