Skip to content

Commit

Permalink
Merge pull request #83 from edTheGuy00/fix/wrong-weekday-order
Browse files Browse the repository at this point in the history 
fix #79 and #80
  • Loading branch information
@hyochan
hyochan committed Mar 10, 2019
2 parents 83be6ad + 5718eec commit b244fcb
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 32 deletions.
1 change: 1 addition & 0 deletions lib/flutter_calendar_carousel.dart
View file
Expand Up @@ -220,6 +220,7 @@ class _CalendarState<T> extends State<CalendarCarousel<T>> {
: () => _selectDateFromPicker(),
),
WeekdayRow(
firstDayOfWeek,
showWeekdays: widget.showWeekDays,
weekdayFormat: widget.weekDayFormat,
weekdayMargin: widget.weekDayMargin,
Expand Down
103 changes: 72 additions & 31 deletions lib/src/weekday_row.dart
View file
Expand Up @@ -6,6 +6,7 @@ import 'package:intl/intl.dart';

class WeekdayRow extends StatelessWidget {
WeekdayRow(
this.firstDayOfWeek,
{@required this.showWeekdays,
@required this.weekdayFormat,
@required this.weekdayMargin,
Expand All @@ -17,6 +18,7 @@ class WeekdayRow extends StatelessWidget {
final EdgeInsets weekdayMargin;
final TextStyle weekdayTextStyle;
final DateFormat localeDate;
final int firstDayOfWeek;

Widget _weekdayContainer(String weekDay) => Expanded(
child: Container(
Expand All @@ -32,44 +34,83 @@ class WeekdayRow extends StatelessWidget {
),
));

List<Widget> _generateWeekdays() {
switch (weekdayFormat) {
case WeekdayFormat.weekdays:
return localeDate.dateSymbols.WEEKDAYS
.map<Widget>(_weekdayContainer)
.toList();
case WeekdayFormat.standalone:
return localeDate.dateSymbols.STANDALONEWEEKDAYS
.map<Widget>(_weekdayContainer)
.toList();
case WeekdayFormat.short:
return localeDate.dateSymbols.SHORTWEEKDAYS
.map<Widget>(_weekdayContainer)
.toList();
case WeekdayFormat.standaloneShort:
return localeDate.dateSymbols.STANDALONESHORTWEEKDAYS
.map<Widget>(_weekdayContainer)
.toList();
case WeekdayFormat.narrow:
return localeDate.dateSymbols.NARROWWEEKDAYS
.map<Widget>(_weekdayContainer)
.toList();
case WeekdayFormat.standaloneNarrow:
return localeDate.dateSymbols.STANDALONENARROWWEEKDAYS
.map<Widget>(_weekdayContainer)
.toList();
default:
return localeDate.dateSymbols.STANDALONEWEEKDAYS
.map<Widget>(_weekdayContainer)
.toList();
// List<Widget> _generateWeekdays() {
// switch (weekdayFormat) {
// case WeekdayFormat.weekdays:
// return localeDate.dateSymbols.WEEKDAYS
// .map<Widget>(_weekdayContainer)
// .toList();
// case WeekdayFormat.standalone:
// return localeDate.dateSymbols.STANDALONEWEEKDAYS
// .map<Widget>(_weekdayContainer)
// .toList();
// case WeekdayFormat.short:
// return localeDate.dateSymbols.SHORTWEEKDAYS
// .map<Widget>(_weekdayContainer)
// .toList();
// case WeekdayFormat.standaloneShort:
// return localeDate.dateSymbols.STANDALONESHORTWEEKDAYS
// .map<Widget>(_weekdayContainer)
// .toList();
// case WeekdayFormat.narrow:
// return localeDate.dateSymbols.NARROWWEEKDAYS
// .map<Widget>(_weekdayContainer)
// .toList();
// case WeekdayFormat.standaloneNarrow:
// return localeDate.dateSymbols.STANDALONENARROWWEEKDAYS
// .map<Widget>(_weekdayContainer)
// .toList();
// default:
// return localeDate.dateSymbols.STANDALONEWEEKDAYS
// .map<Widget>(_weekdayContainer)
// .toList();
// }
// }

// TODO - locale issues
List<Widget> _renderWeekDays() {
List<Widget> list = [];

/// because of number of days in a week is 7, so it would be easier to count it til 7.
for (var i = firstDayOfWeek, count = 0;
count < 7;
i = (i + 1) % 7, count++) {
String weekDay;

switch (weekdayFormat) {
case WeekdayFormat.weekdays:
weekDay = localeDate.dateSymbols.WEEKDAYS[i];
break;
case WeekdayFormat.standalone:
weekDay = localeDate.dateSymbols.STANDALONEWEEKDAYS[i];
break;
case WeekdayFormat.short:
weekDay = localeDate.dateSymbols.SHORTWEEKDAYS[i];
break;
case WeekdayFormat.standaloneShort:
weekDay = localeDate.dateSymbols.STANDALONESHORTWEEKDAYS[i];
break;
case WeekdayFormat.narrow:
weekDay = localeDate.dateSymbols.NARROWWEEKDAYS[i];
break;
case WeekdayFormat.standaloneNarrow:
weekDay = localeDate.dateSymbols.STANDALONENARROWWEEKDAYS[i];
break;
default:
weekDay = localeDate.dateSymbols.STANDALONEWEEKDAYS[i];
break;
}
list.add(_weekdayContainer(weekDay));
}

return list;
}

@override
Widget build(BuildContext context) => showWeekdays
? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: _generateWeekdays(),
children: _renderWeekDays(),
)
: Container();
}
6 changes: 5 additions & 1 deletion test/src/weekday_row_test.dart
View file
Expand Up @@ -13,6 +13,7 @@ void main() {
testWidgets('test short weekday row', (WidgetTester tester) async {
await tester.pumpWidget(wrapped(
WeekdayRow(
0,
showWeekdays: true,
weekdayFormat: WeekdayFormat.short,
weekdayMargin: margin,
Expand All @@ -32,6 +33,7 @@ void main() {

testWidgets('test narrow weekday row', (WidgetTester tester) async {
await tester.pumpWidget(wrapped(WeekdayRow(
0,
showWeekdays: true,
weekdayFormat: WeekdayFormat.standaloneNarrow,
weekdayMargin: margin,
Expand All @@ -51,6 +53,7 @@ void main() {

testWidgets('test standalone weekday row', (WidgetTester tester) async {
await tester.pumpWidget(wrapped(WeekdayRow(
0,
showWeekdays: true,
weekdayFormat: WeekdayFormat.standalone,
weekdayMargin: margin,
Expand All @@ -69,6 +72,7 @@ void main() {

testWidgets('test standalone short weekday row', (WidgetTester tester) async {
await tester.pumpWidget(wrapped(WeekdayRow(
0,
showWeekdays: true,
weekdayFormat: WeekdayFormat.standaloneShort,
weekdayMargin: margin,
Expand All @@ -86,7 +90,7 @@ void main() {
});

testWidgets('test row does not render', (WidgetTester tester) async {
final emptyContainer = WeekdayRow(showWeekdays: false);
final emptyContainer = WeekdayRow(0, showWeekdays: false);

await tester.pumpWidget(emptyContainer);

Expand Down

0 comments on commit b244fcb

Please sign in to comment.