From b5542f86ab8363a546747e1df04d26238f5a3614 Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Mon, 13 May 2024 17:36:46 +0200 Subject: [PATCH] Fix week system in calendar week view --- api/pubspec.lock | 4 ++-- api/pubspec.yaml | 2 +- app/lib/pages/calendar/week.dart | 12 +++++------- app/pubspec.lock | 19 +++++++++---------- app/pubspec.yaml | 7 ++----- .../metadata/android/en-US/changelogs/7.txt | 1 + 6 files changed, 20 insertions(+), 25 deletions(-) diff --git a/api/pubspec.lock b/api/pubspec.lock index 1ceb702b3c7..83e41366328 100644 --- a/api/pubspec.lock +++ b/api/pubspec.lock @@ -165,8 +165,8 @@ packages: dependency: "direct main" description: path: "packages/dart_leap" - ref: "992f8062618ef1e78ee92efc7a709eb0d476e1d0" - resolved-ref: "992f8062618ef1e78ee92efc7a709eb0d476e1d0" + ref: f80aea0ab6cdc6df7c8e6ef54d6f3ed1efd1704d + resolved-ref: f80aea0ab6cdc6df7c8e6ef54d6f3ed1efd1704d url: "https://github.com/LinwoodDev/dart_pkgs" source: git version: "1.0.0" diff --git a/api/pubspec.yaml b/api/pubspec.yaml index e4893d28f76..7c830458b9f 100644 --- a/api/pubspec.yaml +++ b/api/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: dart_leap: git: url: https://github.com/LinwoodDev/dart_pkgs - ref: 992f8062618ef1e78ee92efc7a709eb0d476e1d0 + ref: f80aea0ab6cdc6df7c8e6ef54d6f3ed1efd1704d path: packages/dart_leap dev_dependencies: build_runner: ^2.4.9 diff --git a/app/lib/pages/calendar/week.dart b/app/lib/pages/calendar/week.dart index 3bee44856c1..62117ef246a 100644 --- a/app/lib/pages/calendar/week.dart +++ b/app/lib/pages/calendar/week.dart @@ -31,7 +31,7 @@ class CalendarWeekView extends StatefulWidget { class _CalendarWeekViewState extends State { late final FlowCubit _cubit; - int _week = 0, _year = 0, _startOfWeek = 0; + int _week = 0, _year = 0; late Future>>> _appointments; final _columnScrollController = ScrollController(), @@ -44,13 +44,11 @@ class _CalendarWeekViewState extends State { final now = DateTime.now(); _week = now.week; _year = now.year; - _startOfWeek = context.read().state.startOfWeek; _appointments = _fetchCalendarItems(); } - DateTime get _date => DateTime(_year, 1, 1) - .nextStartOfWeek - .addDays((_week - 1) * 7 + _startOfWeek); + DateTime get _date => + DateTime(_year, 1, 1).nextStartOfWeek.addDays((_week - 2) * 7); Future>>> _fetchCalendarItems() async { @@ -91,7 +89,7 @@ class _CalendarWeekViewState extends State { void _addWeek(int add) { setState(() { - final dateTime = DateTime(_year, 1, 1).addDays((_week + add) * 7); + final dateTime = _date.addDays(add * 7); _week = dateTime.week; _year = dateTime.year; _appointments = _fetchCalendarItems(); @@ -112,7 +110,7 @@ class _CalendarWeekViewState extends State { @override Widget build(BuildContext context) { - final now = DateTime.now().addDays(-_startOfWeek); + final now = DateTime.now(); return LayoutBuilder( builder: (context, constraints) => CreateEventScaffold( diff --git a/app/pubspec.lock b/app/pubspec.lock index 4b190d7206f..441c8a9a924 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -213,8 +213,8 @@ packages: dependency: transitive description: path: "packages/dart_leap" - ref: "992f8062618ef1e78ee92efc7a709eb0d476e1d0" - resolved-ref: "992f8062618ef1e78ee92efc7a709eb0d476e1d0" + ref: f80aea0ab6cdc6df7c8e6ef54d6f3ed1efd1704d + resolved-ref: f80aea0ab6cdc6df7c8e6ef54d6f3ed1efd1704d url: "https://github.com/LinwoodDev/dart_pkgs" source: git version: "1.0.0" @@ -642,8 +642,8 @@ packages: dependency: "direct main" description: path: "packages/material_leap" - ref: "9338503df442df2e9a156511de1e93dfee8c4257" - resolved-ref: "9338503df442df2e9a156511de1e93dfee8c4257" + ref: "11a97be0a5bd85c14bdbb6555da8e84bbdd41ccb" + resolved-ref: "11a97be0a5bd85c14bdbb6555da8e84bbdd41ccb" url: "https://github.com/LinwoodDev/dart_pkgs" source: git version: "0.0.1" @@ -770,12 +770,11 @@ packages: phosphor_flutter: dependency: "direct main" description: - path: "." - ref: f370dd2c25d3ea51ffb8f1c7c183bc9f33889c82 - resolved-ref: f370dd2c25d3ea51ffb8f1c7c183bc9f33889c82 - url: "https://github.com/CodeDoctorDE/phosphor-flutter" - source: git - version: "2.0.0" + name: phosphor_flutter + sha256: "8a14f238f28a0b54842c5a4dc20676598dd4811fcba284ed828bd5a262c11fde" + url: "https://pub.dev" + source: hosted + version: "2.1.0" platform: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index c4faf97d50f..3ef28a3eae8 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -37,12 +37,9 @@ dependencies: material_leap: git: url: https://github.com/LinwoodDev/dart_pkgs - ref: 9338503df442df2e9a156511de1e93dfee8c4257 + ref: 11a97be0a5bd85c14bdbb6555da8e84bbdd41ccb path: packages/material_leap - phosphor_flutter: - git: - url: https://github.com/CodeDoctorDE/phosphor-flutter - ref: f370dd2c25d3ea51ffb8f1c7c183bc9f33889c82 + phosphor_flutter: ^2.1.0 path: ^1.8.3 go_router: ^14.0.0 flex_color_scheme: ^7.3.1 diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt index 60de32e0b3c..e045caa02d4 100644 --- a/fastlane/metadata/android/en-US/changelogs/7.txt +++ b/fastlane/metadata/android/en-US/changelogs/7.txt @@ -13,5 +13,6 @@ * Unify select dialogs * Upgrade to flutter 3.19 * Fix locale translations +* Fix week system in calendar week view Read more here: https://linwood.dev/flow/0.3 \ No newline at end of file