Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: wrong day of week (#2468)

Browse Source
This commit is contained in:
Richard Shiue 2023-05-08 09:51:20 +08:00 committed by GitHub
parent 06f056aa4b
commit 6731037a8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart
View File

@ -171,8 +171,9 @@ class _CalendarPageState extends State<CalendarPage> {
} }
Widget _headerWeekDayBuilder(day) { Widget _headerWeekDayBuilder(day) {
// incoming day starts from Monday, the symbols start from Sunday
final symbols = DateFormat.EEEE(context.locale.toLanguageTag()).dateSymbols; final symbols = DateFormat.EEEE(context.locale.toLanguageTag()).dateSymbols;
final weekDayString = symbols.WEEKDAYS[day]; final weekDayString = symbols.WEEKDAYS[(day + 1) % 7];
return Center( return Center(
child: Padding( child: Padding(
padding: CalendarSize.daysOfWeekInsets, padding: CalendarSize.daysOfWeekInsets,
@ -216,8 +217,8 @@ class _CalendarPageState extends State<CalendarPage> {
} }
WeekDays _weekdayFromInt(int dayOfWeek) { WeekDays _weekdayFromInt(int dayOfWeek) {
// MonthView places the first day of week on the second column for some reason. // dayOfWeek starts from Sunday, WeekDays starts from Monday
return WeekDays.values[(dayOfWeek + 1) % 7]; return WeekDays.values[(dayOfWeek - 1) % 7];
} }
} }

2
frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/toolbar/calendar_layout_setting.dart
View File

@ -340,7 +340,7 @@ class FirstDayOfWeek extends StatelessWidget {
DateFormat.EEEE(context.locale.toLanguageTag()).dateSymbols; DateFormat.EEEE(context.locale.toLanguageTag()).dateSymbols;
// starts from sunday // starts from sunday
final items = symbols.WEEKDAYS.asMap().entries.map((entry) { final items = symbols.WEEKDAYS.asMap().entries.map((entry) {
final index = (entry.key - 1) % 7; final index = entry.key;
final string = entry.value; final string = entry.value;
return SizedBox( return SizedBox(
height: GridSize.popoverItemHeight, height: GridSize.popoverItemHeight,