diff --git a/.github/workflows/safe_app_ci.yml b/.github/workflows/safe_app_ci.yml index bc1cb0743..7aaf88fa8 100644 --- a/.github/workflows/safe_app_ci.yml +++ b/.github/workflows/safe_app_ci.yml @@ -178,10 +178,14 @@ jobs: flutter pub global activate --source path "$CI_CD_DART_SCRIPTS_PACKAGE_PATH" echo $(pwd)/bin >> $GITHUB_PATH + # Running with -c 1 as using -c 4 would lead to to this dependency error: + # https://github.com/SharezoneApp/sharezone-app/pull/1322#issuecomment-1981410505 + # We don't know why this happens. + # In the future please try to use a higher concurrency value again. - name: Run tests via "sz test" run: | sz test \ - -c 4 \ + -c 1 \ --package-timeout-minutes 15 \ --only-goldens diff --git a/app/lib/blackboard/blackboard_dialog.dart b/app/lib/blackboard/blackboard_dialog.dart index 752226467..20a958354 100644 --- a/app/lib/blackboard/blackboard_dialog.dart +++ b/app/lib/blackboard/blackboard_dialog.dart @@ -21,7 +21,6 @@ import 'package:sharezone/filesharing/dialog/attach_file.dart'; import 'package:sharezone/filesharing/dialog/course_tile.dart'; import 'package:sharezone/main/application_bloc.dart'; import 'package:sharezone/markdown/markdown_analytics.dart'; -import 'package:sharezone/widgets/material/list_tile_with_description.dart'; import 'package:sharezone/widgets/material/save_button.dart'; import 'package:sharezone_common/api_errors.dart'; import 'package:sharezone_widgets/sharezone_widgets.dart'; diff --git a/app/lib/filesharing/dialog/course_tile.dart b/app/lib/filesharing/dialog/course_tile.dart index a24c67639..9f3fa8fc3 100644 --- a/app/lib/filesharing/dialog/course_tile.dart +++ b/app/lib/filesharing/dialog/course_tile.dart @@ -10,11 +10,10 @@ import 'package:bloc_provider/bloc_provider.dart'; import 'package:common_domain_models/common_domain_models.dart'; import 'package:flutter/material.dart'; import 'package:group_domain_models/group_domain_models.dart'; -import 'package:sharezone/main/application_bloc.dart'; import 'package:sharezone/groups/group_join/group_join_page.dart'; import 'package:sharezone/groups/group_permission.dart'; import 'package:sharezone/groups/src/pages/course/create/course_template_page.dart'; -import 'package:sharezone/homework/homework_dialog/homework_dialog.dart'; +import 'package:sharezone/main/application_bloc.dart'; import 'package:sharezone/util/api.dart'; import 'package:sharezone_widgets/sharezone_widgets.dart'; @@ -90,36 +89,6 @@ class CourseTile extends StatelessWidget { } } -class CourseTileBase extends StatelessWidget { - final String? courseName; - final String? errorText; - - /// If null disables tile. - final VoidCallback? onTap; - - const CourseTileBase({ - required this.courseName, - required this.errorText, - required this.onTap, - super.key, - }); - - @override - Widget build(BuildContext context) { - return ListTile( - leading: const Icon(Icons.book), - title: const Text("Kurs"), - subtitle: Text( - errorText ?? courseName ?? HwDialogErrorStrings.emptyCourse, - style: errorText != null ? const TextStyle(color: Colors.red) : null, - ), - trailing: const Icon(Icons.keyboard_arrow_down), - enabled: onTap != null, - onTap: () => onTap!(), - ); - } -} - class _CourseList extends StatelessWidget { const _CourseList({ required this.courseList, diff --git a/app/lib/homework/homework_dialog/homework_dialog.dart b/app/lib/homework/homework_dialog/homework_dialog.dart index 672d02b3b..b83c71f27 100644 --- a/app/lib/homework/homework_dialog/homework_dialog.dart +++ b/app/lib/homework/homework_dialog/homework_dialog.dart @@ -962,7 +962,8 @@ class _SendNotification extends StatelessWidget { child: SafeArea( top: false, bottom: false, - child: _SendNotificationBase( + child: SendNotificationBase( + listTileKey: HwDialogKeys.notifyCourseMembersTile, title: "Kursmitglieder ${state.isEditing ? "über die Änderungen " : ""}benachrichtigen", onChanged: (newValue) => @@ -977,35 +978,6 @@ class _SendNotification extends StatelessWidget { } } -class _SendNotificationBase extends StatelessWidget { - const _SendNotificationBase({ - required this.title, - required this.sendNotification, - required this.onChanged, - this.description, - }); - - final String title; - final String? description; - final bool sendNotification; - final Function(bool) onChanged; - - @override - Widget build(BuildContext context) { - return ListTile( - key: HwDialogKeys.notifyCourseMembersTile, - leading: const Icon(Icons.notifications_active), - title: Text(title), - trailing: Switch.adaptive( - onChanged: onChanged, - value: sendNotification, - ), - onTap: () => onChanged(!sendNotification), - subtitle: description != null ? Text(description!) : null, - ); - } -} - class _DescriptionField extends StatelessWidget { const _DescriptionField({required this.state}); @@ -1014,7 +986,9 @@ class _DescriptionField extends StatelessWidget { @override Widget build(BuildContext context) { final bloc = bloc_lib.BlocProvider.of(context); - return _DescriptionFieldBase( + return DescriptionFieldBase( + textFieldKey: HwDialogKeys.descriptionField, + hintText: 'Zusatzinformationen eingeben', onChanged: (newDescription) => bloc.add(DescriptionChanged(newDescription)), prefilledDescription: state.description, @@ -1022,34 +996,6 @@ class _DescriptionField extends StatelessWidget { } } -class _DescriptionFieldBase extends StatelessWidget { - const _DescriptionFieldBase({ - required this.onChanged, - required this.prefilledDescription, - }); - - final Function(String) onChanged; - final String? prefilledDescription; - - @override - Widget build(BuildContext context) { - return MarkdownField( - textFieldKey: HwDialogKeys.descriptionField, - inputDecoration: const InputDecoration( - hintText: "Zusatzinformationen eingeben", - border: InputBorder.none, - enabledBorder: InputBorder.none, - focusedBorder: InputBorder.none, - errorBorder: InputBorder.none, - fillColor: Colors.transparent, - ), - onChanged: onChanged, - prefilledText: prefilledDescription, - icon: const Icon(Icons.subject), - ); - } -} - class _AttachFile extends StatelessWidget { const _AttachFile({required this.state}); diff --git a/app/lib/settings/src/subpages/my_profile/my_profile_page.dart b/app/lib/settings/src/subpages/my_profile/my_profile_page.dart index ceace8865..8c4be0a65 100644 --- a/app/lib/settings/src/subpages/my_profile/my_profile_page.dart +++ b/app/lib/settings/src/subpages/my_profile/my_profile_page.dart @@ -29,7 +29,6 @@ import 'package:sharezone/settings/src/subpages/my_profile/change_password.dart' import 'package:sharezone/settings/src/subpages/my_profile/change_state.dart'; import 'package:sharezone/settings/src/subpages/my_profile/change_type_of_user/change_type_of_user_page.dart'; import 'package:sharezone/settings/src/subpages/my_profile/my_profile_bloc.dart'; -import 'package:sharezone/widgets/material/list_tile_with_description.dart'; import 'package:sharezone_common/api_errors.dart'; import 'package:sharezone_widgets/sharezone_widgets.dart'; import 'package:streaming_shared_preferences/streaming_shared_preferences.dart'; diff --git a/app/lib/settings/src/subpages/notification.dart b/app/lib/settings/src/subpages/notification.dart index 7a54e2762..49d7f9748 100644 --- a/app/lib/settings/src/subpages/notification.dart +++ b/app/lib/settings/src/subpages/notification.dart @@ -9,6 +9,7 @@ import 'package:bloc_provider/bloc_provider.dart'; import 'package:flutter/material.dart' hide TimePickerEntryMode; import 'package:interval_time_picker/interval_time_picker.dart'; +import 'package:platform_check/platform_check.dart'; import 'package:provider/provider.dart'; import 'package:sharezone/notifications/notifications_bloc.dart'; import 'package:sharezone/notifications/notifications_bloc_factory.dart'; @@ -16,8 +17,6 @@ import 'package:sharezone/sharezone_plus/page/sharezone_plus_page.dart'; import 'package:sharezone/sharezone_plus/subscription_service/subscription_service.dart'; import 'package:sharezone/timetable/src/edit_time.dart'; import 'package:sharezone/widgets/matching_type_of_user_builder.dart'; -import 'package:sharezone/widgets/material/list_tile_with_description.dart'; -import 'package:platform_check/platform_check.dart'; import 'package:sharezone_widgets/sharezone_widgets.dart'; import 'package:time/time.dart'; import 'package:user/user.dart'; diff --git a/app/lib/timetable/timetable_add_event/timetable_add_event_dialog.dart b/app/lib/timetable/timetable_add_event/timetable_add_event_dialog.dart index 383bd5d7b..dd91fd86f 100644 --- a/app/lib/timetable/timetable_add_event/timetable_add_event_dialog.dart +++ b/app/lib/timetable/timetable_add_event/timetable_add_event_dialog.dart @@ -19,7 +19,6 @@ import 'package:sharezone/filesharing/dialog/course_tile.dart'; import 'package:sharezone/homework/homework_dialog/homework_dialog.dart'; import 'package:sharezone/main/application_bloc.dart'; import 'package:sharezone/markdown/markdown_analytics.dart'; -import 'package:sharezone/widgets/material/list_tile_with_description.dart'; import 'package:sharezone/widgets/material/save_button.dart'; import 'package:sharezone_widgets/sharezone_widgets.dart'; import 'package:time/time.dart'; @@ -135,18 +134,7 @@ class TimetableAddEventDialog extends StatelessWidget { const _MobileDivider(), const _DateAndTimePicker(), const _MobileDivider(), - _DescriptionFieldBase( - textFieldKey: EventDialogKeys.descriptionTextField, - hintText: isExam - ? 'Themen der Prüfung' - : 'Zusatzinformationen', - onChanged: (newDescription) { - Provider.of(context, - listen: false) - .description = newDescription; - }, - prefilledDescription: '', - ), + _DescriptionField(isExam: isExam), const _MobileDivider(), const _Location(), const _MobileDivider(), @@ -536,44 +524,23 @@ class _DateAndTimeTile extends StatelessWidget { } } -class _DescriptionFieldBase extends StatelessWidget { - const _DescriptionFieldBase({ - required this.onChanged, - required this.prefilledDescription, - required this.hintText, - this.textFieldKey, - }); - - final Function(String) onChanged; - final String? prefilledDescription; - final String hintText; +class _DescriptionField extends StatelessWidget { + const _DescriptionField({required this.isExam}); - /// Key for the [PrefilledTextField] (used for testing). - /// - /// If the key is assigned to [_DescriptionFieldBase] from the outside via - /// this field to the [PrefilledTextField] then calling - /// `tester.enterText(Key('description'))` will fail because of "too many - /// elements" for the key. I don't really understand why this happens, but - /// assigning the key to the [PrefilledTextField] fixes the problem. - final Key? textFieldKey; + final bool isExam; @override Widget build(BuildContext context) { return Padding( padding: const EdgeInsets.only(top: 4), - child: MarkdownField( - textFieldKey: textFieldKey, - onChanged: onChanged, - icon: const Icon(Icons.subject), - prefilledText: prefilledDescription, - inputDecoration: InputDecoration( - hintText: hintText, - border: InputBorder.none, - enabledBorder: InputBorder.none, - focusedBorder: InputBorder.none, - errorBorder: InputBorder.none, - fillColor: Colors.transparent, - ), + child: DescriptionFieldBase( + textFieldKey: EventDialogKeys.descriptionTextField, + hintText: isExam ? 'Themen der Prüfung' : 'Zusatzinformationen', + onChanged: (newDescription) { + Provider.of(context, listen: false) + .description = newDescription; + }, + prefilledDescription: '', ), ); } @@ -585,38 +552,12 @@ class _Location extends StatelessWidget { @override Widget build(BuildContext context) { final controller = Provider.of(context); - return MaxWidthConstraintBox( - child: SafeArea( - top: false, - bottom: false, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ListTile( - leading: const Icon(Icons.location_pin), - title: PrefilledTextField( - key: EventDialogKeys.locationField, - prefilledText: controller.location, - maxLines: null, - scrollPadding: const EdgeInsets.all(16.0), - keyboardType: TextInputType.text, - decoration: const InputDecoration( - hintText: "Ort/Raum", - border: InputBorder.none, - enabledBorder: InputBorder.none, - focusedBorder: InputBorder.none, - errorBorder: InputBorder.none, - fillColor: Colors.transparent, - ), - onChanged: (newLocation) { - controller.location = newLocation; - }, - textCapitalization: TextCapitalization.sentences, - ), - ), - ], - ), - ), + return LocationBase( + textFieldKey: EventDialogKeys.locationField, + prefilledText: controller.location, + onChanged: (newLocation) { + controller.location = newLocation; + }, ); } } @@ -633,49 +574,21 @@ class _SendNotification extends StatelessWidget { child: SafeArea( top: false, bottom: false, - child: _SendNotificationBase( + child: SendNotificationBase( + switchKey: EventDialogKeys.notifyCourseMembersSwitch, title: "Kursmitglieder benachrichtigen", onChanged: (newValue) { controller.notifyCourseMembers = newValue; }, sendNotification: controller.notifyCourseMembers, description: - "Sende eine Benachrichtigung an deine Kursmitglieder, dass du ${isExam ? 'eine neue Klausur' : 'einen neuen Termin'} erstellt hast.", + "Kursmitglieder über ${isExam ? 'neue Klausur' : 'neuen Termin'} benachrichtigen.", ), ), ); } } -class _SendNotificationBase extends StatelessWidget { - const _SendNotificationBase({ - required this.title, - required this.sendNotification, - required this.onChanged, - this.description, - }); - - final String title; - final String? description; - final bool sendNotification; - final Function(bool) onChanged; - - @override - Widget build(BuildContext context) { - return ListTileWithDescription( - leading: const Icon(Icons.notifications_active), - title: Text(title), - trailing: Switch.adaptive( - key: EventDialogKeys.notifyCourseMembersSwitch, - onChanged: onChanged, - value: sendNotification, - ), - onTap: () => onChanged(!sendNotification), - description: description != null ? Text(description!) : null, - ); - } -} - class EventDialogKeys { static const Key saveButton = Key("save-button"); static const Key titleTextField = Key("title-field"); diff --git a/app/pubspec.lock b/app/pubspec.lock index cea83765c..272257b32 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -969,8 +969,8 @@ packages: dependency: "direct main" description: path: "packages/flutter_markdown" - ref: "494fa74182c1993cfd39d804f24c4ee136e3905a" - resolved-ref: "494fa74182c1993cfd39d804f24c4ee136e3905a" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" url: "https://github.com/SharezoneApp/packages" source: git version: "0.6.17+2" @@ -1407,10 +1407,10 @@ packages: dependency: "direct main" description: name: markdown - sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 url: "https://pub.dev" source: hosted - version: "7.1.1" + version: "7.2.2" matcher: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index de2915760..d721b9881 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -101,7 +101,7 @@ dependencies: git: url: https://github.com/SharezoneApp/packages path: packages/flutter_markdown - ref: 494fa74182c1993cfd39d804f24c4ee136e3905a + ref: 2f680bb80119f6fd037a7bda0984bc811b5dccb8 flutter_timezone: ^1.0.8 flutter_rating_bar: ^4.0.0 flutter_sfsymbols: ^2.0.0 diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.iphone11.png index d6a00950c..7eb92e56d 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.phone.png index 93ec546e6..caca28ada 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.tablet_landscape.png index 9246042b0..c1e933964 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.tablet_portrait.png index 1b868fb77..ebeed233b 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_event.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.iphone11.png index 4abd728d7..16b4f8546 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.phone.png index aa6c5ccd9..464697be9 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.tablet_landscape.png index 3f56e2881..fd1d04f84 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.tablet_portrait.png index deeab567f..de457b149 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_dark_exam.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.iphone11.png index 64cfbeb78..a0873199e 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.phone.png index 0e5d96dfb..a4c29381d 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.tablet_landscape.png index 55d0b3cd0..b13aafb30 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.tablet_portrait.png index e9ce477d6..7f46d63d7 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_event.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.iphone11.png index 4fab452e0..bc77be438 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.phone.png index ca34d92b9..da03db512 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.tablet_landscape.png index df6b5a41d..4a079b93a 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.tablet_portrait.png index ccf93e9a1..77e0ada75 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_empty_light_exam.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.iphone11.png index c851993d0..fe563510f 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.phone.png index 42fa3f7a6..d44078f5b 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.tablet_landscape.png index 65e070046..933f5b939 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.tablet_portrait.png index 876cb5af6..26c22de2c 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_event.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.iphone11.png index adcbac851..2371ad47a 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.phone.png index a26986c3d..56da9699c 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.tablet_landscape.png index bca01d72f..853727401 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.tablet_portrait.png index c50b48680..6c037667e 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_dark_exam.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.iphone11.png index 136e99802..2855e51af 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.phone.png index 8e3070a84..936bbb96f 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.tablet_landscape.png index 0b01aed02..94d3ae944 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.tablet_portrait.png index 366298f4a..a2cc7e850 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_event.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.iphone11.png index 7329a7095..680d6e0fe 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.phone.png index 28faa7745..9ceefc06c 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.tablet_landscape.png index e6701f249..e49bf9de6 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.tablet_portrait.png index 87afa1888..d391dac38 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_error_light_exam.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.iphone11.png index f1e54e3de..d21dd0f38 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.phone.png index 9f3884e88..5a739d50a 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.tablet_landscape.png index 864f77059..bd188b5de 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.tablet_portrait.png index 5a2ed1b17..f8f0a4b3e 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_event.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.iphone11.png index 67334ca2a..eda21d23d 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.phone.png index 3ab5fa9cf..bb8a38fa4 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.tablet_landscape.png index 6a7a389b5..b5e16ec3c 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.tablet_portrait.png index f6575b74c..e687c2e42 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_dark_exam.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.iphone11.png index ec759e8e4..7a7798565 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.phone.png index 892f593a6..7071955f9 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.tablet_landscape.png index 41c9a59eb..8d0fc5f45 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.tablet_portrait.png index 216de68c4..d01d0ad27 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_event.tablet_portrait.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.iphone11.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.iphone11.png index 947b40aa5..690f92f7b 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.iphone11.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.iphone11.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.phone.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.phone.png index 69e914105..78be936d5 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.phone.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.phone.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.tablet_landscape.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.tablet_landscape.png index 61cef3797..417b2bd83 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.tablet_landscape.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.tablet_landscape.png differ diff --git a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.tablet_portrait.png b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.tablet_portrait.png index bffe051d6..319d3e470 100644 Binary files a/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.tablet_portrait.png and b/app/test_goldens/timetable/timetable_dialog/goldens/event_dialog_add_full_light_exam.tablet_portrait.png differ diff --git a/lib/abgabe/abgabe_client_lib/pubspec.lock b/lib/abgabe/abgabe_client_lib/pubspec.lock index 5aec21af8..c3cac07d4 100644 --- a/lib/abgabe/abgabe_client_lib/pubspec.lock +++ b/lib/abgabe/abgabe_client_lib/pubspec.lock @@ -602,6 +602,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -833,6 +842,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -1136,6 +1153,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_common: dependency: transitive description: diff --git a/lib/app_functions/pubspec.lock b/lib/app_functions/pubspec.lock index a139985ba..078ffbf03 100644 --- a/lib/app_functions/pubspec.lock +++ b/lib/app_functions/pubspec.lock @@ -133,6 +133,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: transitive description: @@ -214,6 +223,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -285,6 +302,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_lints: dependency: "direct dev" description: @@ -410,4 +435,4 @@ packages: version: "6.5.0" sdks: dart: ">=3.2.3 <4.0.0" - flutter: ">=3.7.0-0" + flutter: ">=3.10.0" diff --git a/lib/authentification/authentification_base/pubspec.lock b/lib/authentification/authentification_base/pubspec.lock index 44d6e0af9..b97ff5d2a 100644 --- a/lib/authentification/authentification_base/pubspec.lock +++ b/lib/authentification/authentification_base/pubspec.lock @@ -335,6 +335,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: transitive description: @@ -488,6 +497,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -623,6 +640,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" shared_preferences: dependency: transitive description: diff --git a/lib/authentification/authentification_qrcode/pubspec.lock b/lib/authentification/authentification_qrcode/pubspec.lock index f5c4f3c0b..de1e62997 100644 --- a/lib/authentification/authentification_qrcode/pubspec.lock +++ b/lib/authentification/authentification_qrcode/pubspec.lock @@ -374,6 +374,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: transitive description: @@ -535,6 +544,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -686,6 +703,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" shared_preferences: dependency: transitive description: diff --git a/lib/design/pubspec.lock b/lib/design/pubspec.lock index 3b9184ee9..0f4b08473 100644 --- a/lib/design/pubspec.lock +++ b/lib/design/pubspec.lock @@ -259,6 +259,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: transitive description: @@ -348,6 +357,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -427,6 +444,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_common: dependency: "direct main" description: @@ -598,4 +623,4 @@ packages: version: "6.5.0" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.7.0-0" + flutter: ">=3.10.0" diff --git a/lib/filesharing/files_usecases/pubspec.lock b/lib/filesharing/files_usecases/pubspec.lock index 1e8cb0bf4..2ee446634 100644 --- a/lib/filesharing/files_usecases/pubspec.lock +++ b/lib/filesharing/files_usecases/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "1a5e13736d59235ce0139621b4bbe29bc89839e202409081bc667eb3cd20674c" + sha256: fe4c077084ddda88f327dc1c96d16631cd68d4948644593fcbcd911c2c89e2fa url: "https://pub.dev" source: hosted - version: "1.3.5" + version: "1.3.23" app_functions: dependency: transitive description: @@ -75,10 +75,10 @@ packages: dependency: transitive description: name: cloud_firestore - sha256: "21cffe06a212015950010ecb9adbf1eb9acaf294f2bd159bde7980aee37c997b" + sha256: "6f6a9e7f1c68f34ffe159c911a290fa7caf1a09b8a88aa1534c65f0246953970" url: "https://pub.dev" source: hosted - version: "4.9.0" + version: "4.15.6" cloud_firestore_helper: dependency: transitive description: @@ -90,42 +90,42 @@ packages: dependency: transitive description: name: cloud_firestore_platform_interface - sha256: "5749b81aea93afdce220e02d34369162010d210011054ac494b2c38c4e9ebeb7" + sha256: "4e92549af19f0d2eec7e379ca44f909caef8eb52295a0cde5467b018cfae0378" url: "https://pub.dev" source: hosted - version: "5.16.0" + version: "6.1.7" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web - sha256: fef99ad0599e983092adb1bb01f14a596dba601a7a8efaaffd7b2721d64e2c51 + sha256: "2b34cff977da11a4822151d967c5e6ce62640cbcb56d6e52a46382d2316350ac" url: "https://pub.dev" source: hosted - version: "3.7.0" + version: "3.10.6" cloud_functions: dependency: transitive description: name: cloud_functions - sha256: "6c5ce6c78bcf92b422b58e76dc33cd46b16cf421fc4d439fc77b7d44a74dc80d" + sha256: "44a88d02b1b1291bb291b8de756ff3f02d3a0c5c68dfc1c42c83c1529ba0416b" url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "4.6.6" cloud_functions_platform_interface: dependency: transitive description: name: cloud_functions_platform_interface - sha256: "2d6bf40c9b9db65f89e97f0e74833794191df4398f7e92a6b1dd3201ec70cfb7" + sha256: "9b02f827013f37824de5ec02bd2a1838e47c899edd39df642d1437c68b6f1c3c" url: "https://pub.dev" source: hosted - version: "5.5.0" + version: "5.5.17" cloud_functions_web: dependency: transitive description: name: cloud_functions_web - sha256: "3937c217f90a51e251c37fc15a4c1be563b50d1f4268284f3ebf83ed70ba1ff8" + sha256: "9ccd76057f2f5e20b8c2dc19e785993dd83edef1a9f49472cf0e12268da6781b" url: "https://pub.dev" source: hosted - version: "4.6.0" + version: "4.7.0" collection: dependency: "direct main" description: @@ -294,90 +294,90 @@ packages: dependency: transitive description: name: firebase_auth - sha256: "02d9cdf1305f0c22cde492802598a13a1975ec8aa05bf608be799f939352cbe8" + sha256: "6d8b4455524e2a619a135169a0ae817778d4acf56172188acae85f69f5e67185" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.17.6" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: "19f8d0762544b72471b85bb56469448c3dc9f98b8b8574f744873ec18e04e18c" + sha256: "3eed984830f610f43164d539ec6228820cf4936ab6ef491e1afcfaca80143c84" url: "https://pub.dev" source: hosted - version: "6.17.0" + version: "7.1.6" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: ae01b306ae03856c1f0682796ea87bacaab72da44e4b728271c806db99620712 + sha256: fcf4718abc722131218de3b84772d83019be48c9211dbd5998aece716c52ff31 url: "https://pub.dev" source: hosted - version: "5.7.0" + version: "5.9.6" firebase_core: dependency: transitive description: name: firebase_core - sha256: c78132175edda4bc532a71e01a32964e4b4fcf53de7853a422d96dac3725f389 + sha256: "797379ea206eaeeb62499775de812761493d0692890fdc7f90b6183a3369176d" url: "https://pub.dev" source: hosted - version: "2.15.1" + version: "2.25.5" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface - sha256: b63e3be6c96ef5c33bdec1aab23c91eb00696f6452f0519401d640938c94cba2 + sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63 url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "5.0.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - sha256: "4cf4d2161530332ddc3c562f19823fb897ff37a9a774090d28df99f47370e973" + sha256: c8e1d59385eee98de63c92f961d2a7062c5d9a65e7f45bdc7f1b0b205aab2492 url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "2.11.5" firebase_crashlytics: dependency: transitive description: name: firebase_crashlytics - sha256: fd9e1a1cb7cce3f9dd2358d8363d235f25f056981e23a333db1e57eca693913f + sha256: "0126fa101b74fb981796b3e6f47ccf7fc40237ec918327aaec7c0a06fd1bb4c1" url: "https://pub.dev" source: hosted - version: "3.3.5" + version: "3.4.16" firebase_crashlytics_platform_interface: dependency: transitive description: name: firebase_crashlytics_platform_interface - sha256: "0d19ef23cf7a917a357d2eb1807338ec536ec3232e729ebd769f5bb2aba9e085" + sha256: cdfa0a20d66e1b32de542883c0ddf651ee9b66b12cebf73067e4d2cdc0865d17 url: "https://pub.dev" source: hosted - version: "3.6.5" + version: "3.6.23" firebase_storage: dependency: transitive description: name: firebase_storage - sha256: "11423ac63c1ec566069c80b1d01bc3c9e12a8f106bbc4ba77fa150afb88488a3" + sha256: "261763ebb2722abb8d3c702f467a9efb1f4ac8978a94c03850b80cfa3009c400" url: "https://pub.dev" source: hosted - version: "11.2.6" + version: "11.6.7" firebase_storage_platform_interface: dependency: transitive description: name: firebase_storage_platform_interface - sha256: "2a8ee7b8a06ee5201f9a116db6972ba0020e3a314a5065acdcb616f4d6c99771" + sha256: "41e5832d930f668a62aa4fd3dc9778af3a301297170f549b882dad4c5b7d3bc7" url: "https://pub.dev" source: hosted - version: "4.4.5" + version: "5.1.10" firebase_storage_web: dependency: transitive description: name: firebase_storage_web - sha256: bd110daa180dc9c89abb490c8a330571e103291b348358d320f5b20a61cd46fc + sha256: "5eac3e415e01384e8a5fc92510db61fee3001d7008fa0209ff2290bcd051b6c7" url: "https://pub.dev" source: hosted - version: "3.6.6" + version: "3.7.1" flare_flutter: dependency: transitive description: @@ -447,6 +447,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -624,6 +633,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -871,6 +888,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_common: dependency: "direct main" description: @@ -1012,66 +1037,66 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e" + sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e" url: "https://pub.dev" source: hosted - version: "6.1.12" + version: "6.2.5" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025" + sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745 url: "https://pub.dev" source: hosted - version: "6.0.38" + version: "6.3.0" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" + sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "6.2.5" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" + sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.1.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1" + sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.1.0" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.3.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4 + sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b url: "https://pub.dev" source: hosted - version: "2.0.18" + version: "2.2.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422" + sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "3.1.1" uuid: dependency: transitive description: @@ -1176,6 +1201,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" + url: "https://pub.dev" + source: hosted + version: "0.4.2" win32: dependency: transitive description: @@ -1210,4 +1243,4 @@ packages: version: "6.3.0" sdks: dart: ">=3.2.3 <4.0.0" - flutter: ">=3.16.0" + flutter: ">=3.16.6" diff --git a/lib/filesharing/filesharing_logic/pubspec.lock b/lib/filesharing/filesharing_logic/pubspec.lock index d57052677..23a0e8298 100644 --- a/lib/filesharing/filesharing_logic/pubspec.lock +++ b/lib/filesharing/filesharing_logic/pubspec.lock @@ -447,6 +447,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -624,6 +633,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -871,6 +888,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_common: dependency: transitive description: diff --git a/lib/group_domain_implementation/pubspec.lock b/lib/group_domain_implementation/pubspec.lock index c4869e429..a0e3c7b24 100644 --- a/lib/group_domain_implementation/pubspec.lock +++ b/lib/group_domain_implementation/pubspec.lock @@ -319,6 +319,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: transitive description: @@ -431,6 +440,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -526,6 +543,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_common: dependency: "direct main" description: @@ -718,4 +743,4 @@ packages: version: "6.5.0" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.7.0-0" + flutter: ">=3.10.0" diff --git a/lib/group_domain_models/pubspec.lock b/lib/group_domain_models/pubspec.lock index b3ef7e8d4..3b07881ef 100644 --- a/lib/group_domain_models/pubspec.lock +++ b/lib/group_domain_models/pubspec.lock @@ -319,6 +319,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: transitive description: @@ -424,6 +433,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -519,6 +536,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_common: dependency: "direct main" description: @@ -711,4 +736,4 @@ packages: version: "6.5.0" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.7.0-0" + flutter: ">=3.10.0" diff --git a/lib/holidays/pubspec.lock b/lib/holidays/pubspec.lock index f7e245297..4b1f2f1af 100644 --- a/lib/holidays/pubspec.lock +++ b/lib/holidays/pubspec.lock @@ -284,6 +284,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: transitive description: @@ -436,6 +445,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -555,6 +572,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_lints: dependency: "direct dev" description: @@ -752,4 +777,4 @@ packages: version: "3.1.2" sdks: dart: ">=3.2.3 <4.0.0" - flutter: ">=3.7.0-0" + flutter: ">=3.10.0" diff --git a/lib/last_online_reporting/pubspec.lock b/lib/last_online_reporting/pubspec.lock index 90cf10f68..1e2b4f4f0 100644 --- a/lib/last_online_reporting/pubspec.lock +++ b/lib/last_online_reporting/pubspec.lock @@ -290,6 +290,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: transitive description: @@ -395,6 +404,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -490,6 +507,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_common: dependency: "direct main" description: @@ -668,4 +693,4 @@ packages: version: "6.5.0" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.7.0-0" + flutter: ">=3.10.0" diff --git a/lib/sharezone_common/pubspec.lock b/lib/sharezone_common/pubspec.lock index 7f80d7b4c..802a7be82 100644 --- a/lib/sharezone_common/pubspec.lock +++ b/lib/sharezone_common/pubspec.lock @@ -251,6 +251,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: transitive + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: transitive description: @@ -340,6 +349,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -419,6 +436,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_lints: dependency: "direct dev" description: @@ -583,4 +608,4 @@ packages: version: "6.5.0" sdks: dart: ">=3.3.0 <4.0.0" - flutter: ">=3.7.0-0" + flutter: ">=3.10.0" diff --git a/lib/sharezone_plus/sharezone_plus_page_ui/pubspec.lock b/lib/sharezone_plus/sharezone_plus_page_ui/pubspec.lock index 8953362b0..03b8c1433 100644 --- a/lib/sharezone_plus/sharezone_plus_page_ui/pubspec.lock +++ b/lib/sharezone_plus/sharezone_plus_page_ui/pubspec.lock @@ -89,8 +89,8 @@ packages: dependency: "direct main" description: path: "packages/flutter_markdown" - ref: "494fa74182c1993cfd39d804f24c4ee136e3905a" - resolved-ref: "494fa74182c1993cfd39d804f24c4ee136e3905a" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" url: "https://github.com/SharezoneApp/packages" source: git version: "0.6.17+2" @@ -179,10 +179,10 @@ packages: dependency: transitive description: name: markdown - sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 url: "https://pub.dev" source: hosted - version: "7.1.1" + version: "7.2.2" matcher: dependency: transitive description: diff --git a/lib/sharezone_plus/sharezone_plus_page_ui/pubspec.yaml b/lib/sharezone_plus/sharezone_plus_page_ui/pubspec.yaml index 5269331a1..8941bedd1 100644 --- a/lib/sharezone_plus/sharezone_plus_page_ui/pubspec.yaml +++ b/lib/sharezone_plus/sharezone_plus_page_ui/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: git: url: https://github.com/SharezoneApp/packages path: packages/flutter_markdown - ref: 494fa74182c1993cfd39d804f24c4ee136e3905a + ref: 2f680bb80119f6fd037a7bda0984bc811b5dccb8 sharezone_widgets: path: ../../sharezone_widgets url_launcher: ^6.2.5 diff --git a/lib/sharezone_widgets/lib/sharezone_widgets.dart b/lib/sharezone_widgets/lib/sharezone_widgets.dart index da6119b6a..675f75b25 100644 --- a/lib/sharezone_widgets/lib/sharezone_widgets.dart +++ b/lib/sharezone_widgets/lib/sharezone_widgets.dart @@ -42,9 +42,15 @@ export 'src/dimensions.dart'; // form export 'src/form.dart'; +// list_tile_with_description +export 'src/list_tile_with_description.dart'; + // placeholder export 'src/placeholder.dart'; +// creation_editing_dialogs +export 'src/creation_editing_dialog_widgets/creation_editing_dialog_widgets.dart'; + // rounded_simple_dialog export 'src/rounded_simple_dialog.dart'; @@ -101,7 +107,3 @@ export 'src/expanded_chip.dart'; // wrapper export 'src/wrapper.dart'; - -// markdown -export 'src/markdown/markdown_field.dart'; -export 'src/markdown/markdown_support.dart'; diff --git a/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/course_tile_base.dart b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/course_tile_base.dart new file mode 100644 index 000000000..ec3569946 --- /dev/null +++ b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/course_tile_base.dart @@ -0,0 +1,39 @@ +// Copyright (c) 2024 Sharezone UG (haftungsbeschränkt) +// Licensed under the EUPL-1.2-or-later. +// +// You may obtain a copy of the Licence at: +// https://joinup.ec.europa.eu/software/page/eupl +// +// SPDX-License-Identifier: EUPL-1.2 + +import 'package:flutter/material.dart'; + +class CourseTileBase extends StatelessWidget { + final String? courseName; + final String? errorText; + + /// If null disables tile. + final VoidCallback? onTap; + + const CourseTileBase({ + required this.courseName, + required this.errorText, + required this.onTap, + super.key, + }); + + @override + Widget build(BuildContext context) { + return ListTile( + leading: const Icon(Icons.book), + title: const Text("Kurs"), + subtitle: Text( + errorText ?? courseName ?? "Keinen Kurs ausgewählt", + style: errorText != null ? const TextStyle(color: Colors.red) : null, + ), + trailing: const Icon(Icons.keyboard_arrow_down), + enabled: onTap != null, + onTap: () => onTap!(), + ); + } +} diff --git a/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/creation_editing_dialog_widgets.dart b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/creation_editing_dialog_widgets.dart new file mode 100644 index 000000000..23197539c --- /dev/null +++ b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/creation_editing_dialog_widgets.dart @@ -0,0 +1,14 @@ +// Copyright (c) 2024 Sharezone UG (haftungsbeschränkt) +// Licensed under the EUPL-1.2-or-later. +// +// You may obtain a copy of the Licence at: +// https://joinup.ec.europa.eu/software/page/eupl +// +// SPDX-License-Identifier: EUPL-1.2 + +export 'course_tile_base.dart'; +export 'description_field_base.dart'; +export 'location_base.dart'; +export 'markdown_field.dart'; +export 'markdown_support.dart'; +export 'send_notification_base.dart'; diff --git a/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/description_field_base.dart b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/description_field_base.dart new file mode 100644 index 000000000..cbd6ce972 --- /dev/null +++ b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/description_field_base.dart @@ -0,0 +1,51 @@ +// Copyright (c) 2024 Sharezone UG (haftungsbeschränkt) +// Licensed under the EUPL-1.2-or-later. +// +// You may obtain a copy of the Licence at: +// https://joinup.ec.europa.eu/software/page/eupl +// +// SPDX-License-Identifier: EUPL-1.2 + +import 'package:flutter/material.dart'; +import 'package:sharezone_widgets/sharezone_widgets.dart'; + +class DescriptionFieldBase extends StatelessWidget { + const DescriptionFieldBase({ + super.key, + required this.onChanged, + required this.prefilledDescription, + required this.hintText, + this.textFieldKey, + }); + + final Function(String) onChanged; + final String? prefilledDescription; + final String hintText; + + /// Key for the [PrefilledTextField] (used for testing). + /// + /// If the key is assigned to [_DescriptionFieldBase] from the outside via + /// this field to the [PrefilledTextField] then calling + /// `tester.enterText(Key('description'))` will fail because of "too many + /// elements" for the key. I don't really understand why this happens, but + /// assigning the key to the [PrefilledTextField] fixes the problem. + final Key? textFieldKey; + + @override + Widget build(BuildContext context) { + return MarkdownField( + textFieldKey: textFieldKey, + inputDecoration: InputDecoration( + hintText: hintText, + border: InputBorder.none, + enabledBorder: InputBorder.none, + focusedBorder: InputBorder.none, + errorBorder: InputBorder.none, + fillColor: Colors.transparent, + ), + onChanged: onChanged, + prefilledText: prefilledDescription, + icon: const Icon(Icons.subject), + ); + } +} diff --git a/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/location_base.dart b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/location_base.dart new file mode 100644 index 000000000..88118a694 --- /dev/null +++ b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/location_base.dart @@ -0,0 +1,58 @@ +// Copyright (c) 2024 Sharezone UG (haftungsbeschränkt) +// Licensed under the EUPL-1.2-or-later. +// +// You may obtain a copy of the Licence at: +// https://joinup.ec.europa.eu/software/page/eupl +// +// SPDX-License-Identifier: EUPL-1.2 + +import 'package:flutter/material.dart'; +import 'package:sharezone_widgets/sharezone_widgets.dart'; + +class LocationBase extends StatelessWidget { + const LocationBase({ + super.key, + this.onChanged, + this.prefilledText, + this.textFieldKey, + }); + + final void Function(String)? onChanged; + final String? prefilledText; + final Key? textFieldKey; + + @override + Widget build(BuildContext context) { + return MaxWidthConstraintBox( + child: SafeArea( + top: false, + bottom: false, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ListTile( + leading: const Icon(Icons.location_pin), + title: PrefilledTextField( + key: textFieldKey, + prefilledText: prefilledText, + maxLines: null, + scrollPadding: const EdgeInsets.all(16.0), + keyboardType: TextInputType.text, + decoration: const InputDecoration( + hintText: "Ort/Raum", + border: InputBorder.none, + enabledBorder: InputBorder.none, + focusedBorder: InputBorder.none, + errorBorder: InputBorder.none, + fillColor: Colors.transparent, + ), + onChanged: onChanged, + textCapitalization: TextCapitalization.sentences, + ), + ), + ], + ), + ), + ); + } +} diff --git a/lib/sharezone_widgets/lib/src/markdown/markdown_field.dart b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/markdown_field.dart similarity index 100% rename from lib/sharezone_widgets/lib/src/markdown/markdown_field.dart rename to lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/markdown_field.dart diff --git a/lib/sharezone_widgets/lib/src/markdown/markdown_support.dart b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/markdown_support.dart similarity index 100% rename from lib/sharezone_widgets/lib/src/markdown/markdown_support.dart rename to lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/markdown_support.dart diff --git a/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/send_notification_base.dart b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/send_notification_base.dart new file mode 100644 index 000000000..609caf630 --- /dev/null +++ b/lib/sharezone_widgets/lib/src/creation_editing_dialog_widgets/send_notification_base.dart @@ -0,0 +1,44 @@ +// Copyright (c) 2024 Sharezone UG (haftungsbeschränkt) +// Licensed under the EUPL-1.2-or-later. +// +// You may obtain a copy of the Licence at: +// https://joinup.ec.europa.eu/software/page/eupl +// +// SPDX-License-Identifier: EUPL-1.2 + +import 'package:flutter/material.dart'; + +class SendNotificationBase extends StatelessWidget { + const SendNotificationBase({ + super.key, + required this.title, + required this.sendNotification, + required this.onChanged, + this.listTileKey, + this.switchKey, + this.description, + }); + + final String title; + final String? description; + final bool sendNotification; + final Function(bool) onChanged; + final Key? listTileKey; + final Key? switchKey; + + @override + Widget build(BuildContext context) { + return ListTile( + key: listTileKey, + leading: const Icon(Icons.notifications_active), + title: Text(title), + trailing: Switch.adaptive( + key: switchKey, + onChanged: onChanged, + value: sendNotification, + ), + onTap: () => onChanged(!sendNotification), + subtitle: description != null ? Text(description!) : null, + ); + } +} diff --git a/app/lib/widgets/material/list_tile_with_description.dart b/lib/sharezone_widgets/lib/src/list_tile_with_description.dart similarity index 100% rename from app/lib/widgets/material/list_tile_with_description.dart rename to lib/sharezone_widgets/lib/src/list_tile_with_description.dart diff --git a/lib/sharezone_widgets/pubspec.lock b/lib/sharezone_widgets/pubspec.lock index 9fd9d2232..6fc3cd439 100644 --- a/lib/sharezone_widgets/pubspec.lock +++ b/lib/sharezone_widgets/pubspec.lock @@ -85,6 +85,15 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" + flutter_markdown: + dependency: "direct main" + description: + path: "packages/flutter_markdown" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + url: "https://github.com/SharezoneApp/packages" + source: git + version: "0.6.17+2" flutter_staggered_animations: dependency: "direct main" description: @@ -161,6 +170,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + markdown: + dependency: transitive + description: + name: markdown + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 + url: "https://pub.dev" + source: hosted + version: "7.2.2" matcher: dependency: transitive description: @@ -224,6 +241,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" + scrollable_positioned_list: + dependency: transitive + description: + name: scrollable_positioned_list + sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" + url: "https://pub.dev" + source: hosted + version: "0.3.8" sharezone_lints: dependency: "direct dev" description: @@ -342,4 +367,4 @@ packages: version: "6.3.0" sdks: dart: ">=3.2.3 <4.0.0" - flutter: ">=3.7.0-0" + flutter: ">=3.10.0" diff --git a/lib/sharezone_widgets/pubspec.yaml b/lib/sharezone_widgets/pubspec.yaml index 07f19a6d3..a9e1186df 100644 --- a/lib/sharezone_widgets/pubspec.yaml +++ b/lib/sharezone_widgets/pubspec.yaml @@ -30,6 +30,11 @@ dependencies: flutter: sdk: flutter clock: ^1.1.1 + flutter_markdown: + git: + url: https://github.com/SharezoneApp/packages + path: packages/flutter_markdown + ref: 2f680bb80119f6fd037a7bda0984bc811b5dccb8 dev_dependencies: flutter_test: diff --git a/tools/sz_repo_cli/lib/src/commands/src/test_command.dart b/tools/sz_repo_cli/lib/src/commands/src/test_command.dart index 7df7680d1..8a1612e7d 100644 --- a/tools/sz_repo_cli/lib/src/commands/src/test_command.dart +++ b/tools/sz_repo_cli/lib/src/commands/src/test_command.dart @@ -159,10 +159,10 @@ Future _runTestsFlutter( 'fvm', 'flutter', 'test', - '--test-randomize-ordering-seed', - testRandomizeOrderingSeed, 'test_goldens', if (updateGoldens) '--update-goldens', + '--test-randomize-ordering-seed', + testRandomizeOrderingSeed, ], workingDirectory: package.location, ); diff --git a/tools/sz_repo_cli/pubspec.yaml b/tools/sz_repo_cli/pubspec.yaml index 576be3455..77ef22413 100644 --- a/tools/sz_repo_cli/pubspec.yaml +++ b/tools/sz_repo_cli/pubspec.yaml @@ -38,4 +38,4 @@ dependencies: dev_dependencies: sharezone_lints: - path: ../../lib/sharezone_lints \ No newline at end of file + path: ../../lib/sharezone_lints diff --git a/website/pubspec.lock b/website/pubspec.lock index 4b827c0b4..63ab41849 100644 --- a/website/pubspec.lock +++ b/website/pubspec.lock @@ -97,8 +97,8 @@ packages: dependency: "direct main" description: path: "packages/flutter_markdown" - ref: "494fa74182c1993cfd39d804f24c4ee136e3905a" - resolved-ref: "494fa74182c1993cfd39d804f24c4ee136e3905a" + ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" + resolved-ref: "2f680bb80119f6fd037a7bda0984bc811b5dccb8" url: "https://github.com/SharezoneApp/packages" source: git version: "0.6.17+2" @@ -211,10 +211,10 @@ packages: dependency: transitive description: name: markdown - sha256: "1b134d9f8ff2da15cb298efe6cd8b7d2a78958c1b00384ebcbdf13fe340a6c90" + sha256: ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051 url: "https://pub.dev" source: hosted - version: "7.2.1" + version: "7.2.2" matcher: dependency: transitive description: diff --git a/website/pubspec.yaml b/website/pubspec.yaml index 8dae62b0e..44c66efde 100644 --- a/website/pubspec.yaml +++ b/website/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: git: url: https://github.com/SharezoneApp/packages path: packages/flutter_markdown - ref: 494fa74182c1993cfd39d804f24c4ee136e3905a + ref: 2f680bb80119f6fd037a7bda0984bc811b5dccb8 flutter_staggered_animations: ^1.1.1 flutter_svg: ^2.0.9 go_router: ^12.1.3