From e6cf90ab9daa4939e9ced3c741577b0f6a3793f1 Mon Sep 17 00:00:00 2001 From: Hyo Chan Jang Date: Sat, 12 Oct 2019 18:58:00 +0900 Subject: [PATCH] Release/1.4.0 (#160) * Resolve #154 * Release 1.4.0 --- CHANGELOG.md | 2 ++ example/lib/main.dart | 3 ++- example/pubspec.lock | 2 +- lib/flutter_calendar_carousel.dart | 4 ++-- pubspec.yaml | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c50761b..a7fae13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [1.4.0] ++ Resolve [#154](https://github.com/dooboolab/flutter_calendar_carousel/issues/154). ## [1.3.29] + Resolve [#157](https://github.com/dooboolab/flutter_calendar_carousel/issues/157). ## [1.3.28] diff --git a/example/lib/main.dart b/example/lib/main.dart index f5e24d7..d75a8da 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -199,12 +199,13 @@ class _MyHomePageState extends State { events.forEach((event) => print(event.title)); }, daysHaveCircularBorder: true, - showOnlyCurrentMonthDate: true, + showOnlyCurrentMonthDate: false, weekendTextStyle: TextStyle( color: Colors.red, ), thisMonthDayBorderColor: Colors.grey, weekFormat: false, +// firstDayOfWeek: 4, markedDatesMap: _markedDateMap, height: 420.0, selectedDateTime: _currentDate2, diff --git a/example/pubspec.lock b/example/pubspec.lock index 495df9f..6276ea9 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -47,7 +47,7 @@ packages: path: ".." relative: true source: path - version: "1.3.29" + version: "1.4.0" flutter_test: dependency: "direct dev" description: flutter diff --git a/lib/flutter_calendar_carousel.dart b/lib/flutter_calendar_carousel.dart index 230902c..659d091 100644 --- a/lib/flutter_calendar_carousel.dart +++ b/lib/flutter_calendar_carousel.dart @@ -748,11 +748,11 @@ class _CalendarState extends State List week1 = _getDaysInWeek(now); List week2 = _getDaysInWeek(now.add(new Duration(days: 7))); - _startWeekday = date1.weekday - firstDayOfWeek; + _startWeekday = date1.weekday - firstDayOfWeek - 1; if (widget.showOnlyCurrentMonthDate && _startWeekday == 7) { _startWeekday = 0; } - _endWeekday = date2.weekday - firstDayOfWeek; + _endWeekday = date2.weekday - firstDayOfWeek - 1; this._dates = [ date0, date1, diff --git a/pubspec.yaml b/pubspec.yaml index fcf29e7..8f593a4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_calendar_carousel description: Calendar widget for flutter that is swipeable. This widget can help you build customizable calendar with scrollable actions. -version: 1.3.29 +version: 1.4.0 author: dooboolab homepage: https://github.com/dooboolab/flutter_calendar_carousel