diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart index 94fa5a5..4659a2d 100644 --- a/lib/generated_plugin_registrant.dart +++ b/lib/generated_plugin_registrant.dart @@ -4,21 +4,24 @@ // ignore_for_file: lines_longer_than_80_chars +import 'package:connectivity_for_web/connectivity_for_web.dart'; import 'package:file_picker/src/file_picker_web.dart'; import 'package:firebase_core_web/firebase_core_web.dart'; import 'package:firebase_messaging_web/firebase_messaging_web.dart'; +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; +import 'package:image_picker_for_web/image_picker_for_web.dart'; import 'package:shared_preferences_web/shared_preferences_web.dart'; import 'package:url_launcher_web/url_launcher_web.dart'; import 'package:video_player_web/video_player_web.dart'; import 'package:wakelock_web/wakelock_web.dart'; -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; - // ignore: public_member_api_docs void registerPlugins(Registrar registrar) { + ConnectivityPlugin.registerWith(registrar); FilePickerWeb.registerWith(registrar); FirebaseCoreWeb.registerWith(registrar); FirebaseMessagingWeb.registerWith(registrar); + ImagePickerPlugin.registerWith(registrar); SharedPreferencesPlugin.registerWith(registrar); UrlLauncherPlugin.registerWith(registrar); VideoPlayerPlugin.registerWith(registrar); diff --git a/lib/ui/widgets/forez_presence_calendar_widget.dart b/lib/ui/widgets/forez_presence_calendar_widget.dart index b501a04..7e05adf 100644 --- a/lib/ui/widgets/forez_presence_calendar_widget.dart +++ b/lib/ui/widgets/forez_presence_calendar_widget.dart @@ -35,30 +35,21 @@ class PresenceCalendarWidget extends StatefulWidget { } class _PresenceCalendarWidgetState extends State { - CalendarController _calendarController; - - @override - void initState() { - super.initState(); - _calendarController = CalendarController(); - } - - @override - void dispose() { - _calendarController.dispose(); - super.dispose(); - } + var selectedDay = DateTime.now(); @override Widget build(BuildContext context) { return TableCalendar( - calendarController: _calendarController, + firstDay: DateTime.utc(2020, 01, 01), + lastDay: DateTime.now().add(Duration(days: 365 * 2)), + selectedDayPredicate: (d) => d == selectedDay, locale: "fr_FR", weekendDays: [], onHeaderTapped: _pickDate, - builders: CalendarBuilders(dayBuilder: _dayBuilder), + calendarBuilders: CalendarBuilders(defaultBuilder: _dayBuilder), onDaySelected: _selectedDay, availableCalendarFormats: const {CalendarFormat.month: "Mois"}, + focusedDay: selectedDay, ); } @@ -70,14 +61,12 @@ class _PresenceCalendarWidgetState extends State { lastDate: DateTime.now().add(Duration(days: 365 * 5)), ); - if (pickedDate != null) { - _calendarController.setSelectedDay(pickedDate, animate: true); - setState(() {}); - } + setState(() { + if (pickedDate != null) selectedDay = pickedDate; + }); } - Widget _dayBuilder( - BuildContext context, DateTime date, List events) { + Widget _dayBuilder(BuildContext context, DateTime date, DateTime focusedDay) { if (widget.presenceSet.containsDate(date)) { // Show the number of users who are present if (widget.mode == CalendarDisplayMode.MULTIPLE_USERS) @@ -120,9 +109,9 @@ class _PresenceCalendarWidgetState extends State { ); } - void _selectedDay( - DateTime day, List events, List holidays) { - if (widget.onDayClicked != null) widget.onDayClicked(day); + void _selectedDay(DateTime selecteDay, DateTime focusedDay) { + if (widget.onDayClicked != null) widget.onDayClicked(selecteDay); + setState(() {}); } } diff --git a/pubspec.lock b/pubspec.lock index 8f3959a..3ef2a04 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,7 +21,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.6.1" boolean_selector: dependency: transitive description: @@ -56,7 +56,7 @@ packages: name: chewie url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.2.0" chewie_audio: dependency: "direct main" description: @@ -91,7 +91,14 @@ packages: name: connectivity url: "https://pub.dartlang.org" source: hosted - version: "3.0.2" + version: "3.0.6" + connectivity_for_web: + dependency: transitive + description: + name: connectivity_for_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.0" connectivity_macos: dependency: transitive description: @@ -133,14 +140,14 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.3" dio: dependency: "direct main" description: name: dio url: "https://pub.dartlang.org" source: hosted - version: "4.0.0-beta7" + version: "4.0.0" emoji_picker: dependency: "direct main" description: @@ -168,70 +175,70 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.1" file: dependency: transitive description: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "6.1.1" file_picker: dependency: "direct main" description: name: file_picker url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.2+2" filesize: dependency: "direct main" description: name: filesize url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.0.1" firebase_core: dependency: "direct main" description: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.2.0" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.0" firebase_messaging: dependency: "direct main" description: name: firebase_messaging url: "https://pub.dartlang.org" source: hosted - version: "9.0.0" + version: "10.0.0" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "3.0.0" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "2.0.0" flutter: dependency: "direct main" description: flutter @@ -257,7 +264,7 @@ packages: name: flutter_colorpicker url: "https://pub.dartlang.org" source: hosted - version: "0.3.5" + version: "0.4.0" flutter_emoji: dependency: "direct main" description: @@ -278,7 +285,7 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" flutter_test: dependency: "direct dev" description: flutter @@ -295,7 +302,7 @@ packages: name: flutter_webrtc url: "https://pub.dartlang.org" source: hosted - version: "0.5.8" + version: "0.6.3" html: dependency: "direct main" description: @@ -309,7 +316,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.0" + version: "0.13.3" http_parser: dependency: "direct main" description: @@ -344,14 +351,21 @@ packages: name: image_picker url: "https://pub.dartlang.org" source: hosted - version: "0.7.2+1" + version: "0.7.5+3" + image_picker_for_web: + dependency: transitive + description: + name: image_picker_for_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.1.0" intl: dependency: "direct main" description: @@ -387,6 +401,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" + nested: + dependency: transitive + description: + name: nested + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" octo_image: dependency: transitive description: @@ -400,7 +421,7 @@ packages: name: package_info url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" path: dependency: transitive description: @@ -414,7 +435,7 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" path_provider_linux: dependency: transitive description: @@ -442,7 +463,7 @@ packages: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.1" pedantic: dependency: transitive description: @@ -456,14 +477,14 @@ packages: name: permission_handler url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "8.0.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.5.0" petitparser: dependency: transitive description: @@ -505,7 +526,14 @@ packages: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.2.1" + provider: + dependency: transitive + description: + name: provider + url: "https://pub.dartlang.org" + source: hosted + version: "5.0.0" random_string: dependency: "direct main" description: @@ -533,7 +561,7 @@ packages: name: settings_ui url: "https://pub.dartlang.org" source: hosted - version: "0.6.0" + version: "1.0.0" shared_preferences: dependency: "direct main" description: @@ -568,7 +596,7 @@ packages: name: simple_gesture_detector url: "https://pub.dartlang.org" source: hosted - version: "0.1.6" + version: "0.2.0" sky_engine: dependency: transitive description: flutter @@ -580,14 +608,14 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" sqflite: dependency: "direct main" description: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "2.0.0+2" + version: "2.0.0+3" sqflite_common: dependency: transitive description: @@ -629,7 +657,7 @@ packages: name: table_calendar url: "https://pub.dartlang.org" source: hosted - version: "2.3.3" + version: "3.0.0" term_glyph: dependency: transitive description: @@ -643,7 +671,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: @@ -657,7 +685,7 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.2" + version: "6.0.4" url_launcher_linux: dependency: transitive description: @@ -678,7 +706,7 @@ packages: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" url_launcher_web: dependency: transitive description: @@ -713,21 +741,21 @@ packages: name: version url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "2.0.0" video_player: dependency: "direct main" description: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.1.4" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.1.0" video_player_web: dependency: transitive description: @@ -741,35 +769,42 @@ packages: name: video_thumbnail url: "https://pub.dartlang.org" source: hosted - version: "0.2.5+1" + version: "0.3.3" wakelock: dependency: "direct main" description: name: wakelock url: "https://pub.dartlang.org" source: hosted - version: "0.4.0" + version: "0.5.2" wakelock_macos: dependency: transitive description: name: wakelock_macos url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.1.0+1" wakelock_platform_interface: dependency: transitive description: name: wakelock_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.1+1" wakelock_web: dependency: transitive description: name: wakelock_web url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.0+1" + wakelock_windows: + dependency: transitive + description: + name: wakelock_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.0" web_socket_channel: dependency: "direct main" description: @@ -783,7 +818,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.1" xdg_directories: dependency: transitive description: @@ -806,5 +841,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.12.0 <3.0.0" - flutter: ">=1.24.0-10" + dart: ">=2.13.0 <3.0.0" + flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 0e528b5..7f87caa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -56,7 +56,7 @@ dependencies: flutter_emoji: ^2.2.1+1 # Build settings UI - settings_ui: ^0.6.0 + settings_ui: ^1.0.0 # Generate identicons identicon: ^0.1.1 @@ -77,10 +77,10 @@ dependencies: event_bus: ^2.0.0 # WebRTC calls - flutter_webrtc: ^0.5.8 + flutter_webrtc: ^0.6.3 # Prevent phone from auto-locking during calls - wakelock: ^0.4.0 + wakelock: ^0.5.2 # Pick any kind of file file_picker: ^3.0.0 @@ -89,13 +89,13 @@ dependencies: package_info: ^2.0.0 # Version manager - version: ^1.2.0 + version: ^2.0.0 # Get path to temporary files path_provider: ^2.0.1 # Format file size - filesize: ^1.0.4 + filesize: ^2.0.1 # Copy content to clipboard clipboard: ^0.1.2+8 @@ -103,35 +103,35 @@ dependencies: # Video / Audio player video_player: ^2.0.2 chewie_audio: ^1.1.2 - chewie: ^1.0.0 + chewie: ^1.2.0 # Determine file mime type mime: ^1.0.0 # Create video thumbnails - video_thumbnail: ^0.2.5+1 + video_thumbnail: ^0.3.3 # Record audio file record_mp3: ^2.1.0 # Request permissions - permission_handler: ^6.1.0 + permission_handler: ^8.0.0+2 # Emojies picker emoji_picker: ^0.1.0 # Color picker - flutter_colorpicker: ^0.3.5 + flutter_colorpicker: ^0.4.0 # Image cropper image_cropper: ^1.4.0 # Firebase cloud messaging (for push notifications) firebase_core: ^1.0.1 - firebase_messaging: ^9.0.0 + firebase_messaging: ^10.0.0 # Forez presence - table_calendar: ^2.3.3 + table_calendar: ^3.0.0 dev_dependencies: flutter_test: