Merge branch 'master' into fix/taps_in_month_view

SimformSolutionsPvtLtd · Jan 2, 2025 · ff4eb4f · ff4eb4f
2 parents c600044 + af26492
commit ff4eb4f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
 - Adds `hideDaysNotInMonth` argument in `cellBuilder` in readme. [#433](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/433)
 - Fixes `titleColor` of date for `hideDaysNotInMonth: false`.
 - Fixes tap `onTileDoubleTap` & `onTileLongTap` issue for `hideDaysNotInMonth` in month view. [#435](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/435)
+- Fixes `startHour` and `endHour` not updating when rebuilding in week view. [#410](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/410)
+- Fixes issue of header icon `color` property in `IconDataConfig`.
 
 # [1.3.0 - 12 Nov 2024](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/tree/1.3.0)
 

diff --git a/lib/src/components/headers/calendar_page_header.dart b/lib/src/components/headers/calendar_page_header.dart
@@ -83,8 +83,7 @@ class CalendarPageHeader extends StatelessWidget {
     this.secondaryDate,
     @Deprecated("Use HeaderStyle.decoration to provide background")
     this.backgroundColor = Constants.headerBackground,
-    @Deprecated("Use HeaderStyle to provide icon color")
-    this.iconColor = Constants.black,
+    @Deprecated("Use HeaderStyle to provide icon color") this.iconColor,
     this.headerStyle = const HeaderStyle(),
   })  : assert(
             titleBuilder != null || dateStringBuilder != null,

diff --git a/lib/src/components/headers/day_page_header.dart b/lib/src/components/headers/day_page_header.dart
@@ -20,8 +20,7 @@ class DayPageHeader extends CalendarPageHeader {
     VoidCallback? onPreviousDay,
     StringProvider? dateStringBuilder,
     required DateTime date,
-    @Deprecated("Use HeaderStyle to provide icon color")
-    Color iconColor = Constants.black,
+    @Deprecated("Use HeaderStyle to provide icon color") Color? iconColor,
     @Deprecated("Use HeaderStyle to provide background")
     Color backgroundColor = Constants.headerBackground,
     HeaderStyle headerStyle = const HeaderStyle(),

diff --git a/lib/src/components/headers/month_page_header.dart b/lib/src/components/headers/month_page_header.dart
@@ -17,8 +17,7 @@ class MonthPageHeader extends CalendarPageHeader {
     VoidCallback? onNextMonth,
     AsyncCallback? onTitleTapped,
     VoidCallback? onPreviousMonth,
-    @Deprecated("Use HeaderStyle to provide icon color")
-    Color iconColor = Constants.black,
+    @Deprecated("Use HeaderStyle to provide icon color") Color? iconColor,
     @Deprecated("Use HeaderStyle to provide background color")
     Color backgroundColor = Constants.headerBackground,
     StringProvider? dateStringBuilder,

diff --git a/lib/src/components/headers/week_page_header.dart b/lib/src/components/headers/week_page_header.dart
@@ -19,8 +19,7 @@ class WeekPageHeader extends CalendarPageHeader {
     VoidCallback? onPreviousDay,
     required DateTime startDate,
     required DateTime endDate,
-    @Deprecated("Use HeaderStyle to provide icon color")
-    Color iconColor = Constants.black,
+    @Deprecated("Use HeaderStyle to provide icon color") Color? iconColor,
     @Deprecated("Use HeaderStyle to provide background color")
     Color backgroundColor = Constants.headerBackground,
     StringProvider? headerStringBuilder,

diff --git a/lib/src/week_view/week_view.dart b/lib/src/week_view/week_view.dart
@@ -468,6 +468,8 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
     }
 
     _eventArranger = widget.eventArranger ?? SideEventArranger<T>();
+    _startHour = widget.startHour;
+    _endHour = widget.endHour;
 
     // Update heights.
     _calculateHeights();