From 25bec328fa0128ae4c5176fea0d6f81753d335e8 Mon Sep 17 00:00:00 2001 From: Kima Date: Sat, 24 Feb 2024 23:19:37 +0100 Subject: [PATCH] upgraded pub packages --- refilc/lib/app.dart | 2 +- refilc/lib/helpers/notification_helper.dart | 2 +- refilc/lib/utils/format.dart | 2 +- refilc/pubspec.yaml | 30 +++++------ .../lib/pages/timetable/timetable_page.dart | 2 +- .../lib/screens/settings/settings_screen.dart | 18 ++++--- refilc_desktop_ui/pubspec.yaml | 16 +++--- refilc_kreta_api/pubspec.yaml | 10 ++-- .../lib/common/average_display.dart | 2 +- .../rounded_bottom_sheet.dart | 4 +- .../lib/common/trend_display.dart | 11 ++-- .../cretification/certification_card.dart | 2 +- .../lib/common/widgets/event/event_view.dart | 16 ++++-- .../widgets/homework/homework_view.dart | 16 ++++-- .../widgets/message/message_view_tile.dart | 18 ++++--- .../lib/common/widgets/note/note_view.dart | 17 +++++-- .../lib/common/widgets/statistics_tile.dart | 2 +- .../common/widgets/update/updates_view.dart | 3 +- .../lib/pages/grades/average_selector.dart | 44 +++++++++------- refilc_mobile_ui/lib/pages/grades/graph.dart | 2 +- .../lib/pages/home/home_page.dart | 3 +- .../lib/pages/home/live_card/live_card.dart | 2 +- .../messages/send_message/send_message.dart | 46 ++++++++++------- .../lib/pages/timetable/fs_timetable.dart | 2 +- .../lib/pages/timetable/timetable_page.dart | 2 +- .../lib/screens/news/news_view.dart | 32 +++++++----- .../settings/modify_subject_names.dart | 45 ++++++++++------- .../lib/screens/settings/privacy_view.dart | 16 ++++-- .../lib/screens/settings/settings_helper.dart | 2 +- .../lib/screens/settings/settings_screen.dart | 18 ++++--- .../settings/submenu/personalize_screen.dart | 50 ++++++++++++------- .../screens/summary/pages/grades_page.dart | 2 +- refilc_mobile_ui/pubspec.yaml | 44 ++++++++-------- refilc_plus | 2 +- 34 files changed, 291 insertions(+), 194 deletions(-) diff --git a/refilc/lib/app.dart b/refilc/lib/app.dart index cdae9f0..845824b 100644 --- a/refilc/lib/app.dart +++ b/refilc/lib/app.dart @@ -23,7 +23,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:material_color_utilities/palettes/core_palette.dart'; import 'package:provider/provider.dart'; diff --git a/refilc/lib/helpers/notification_helper.dart b/refilc/lib/helpers/notification_helper.dart index 5315e31..e21b4a3 100644 --- a/refilc/lib/helpers/notification_helper.dart +++ b/refilc/lib/helpers/notification_helper.dart @@ -13,7 +13,7 @@ import 'package:refilc_kreta_api/providers/grade_provider.dart'; import 'package:refilc_kreta_api/providers/timetable_provider.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart' hide Message; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:intl/intl.dart'; import 'package:refilc_kreta_api/models/message.dart'; diff --git a/refilc/lib/utils/format.dart b/refilc/lib/utils/format.dart index 98c3a76..a77e304 100644 --- a/refilc/lib/utils/format.dart +++ b/refilc/lib/utils/format.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:refilc_kreta_api/models/week.dart'; import 'package:flutter/widgets.dart'; import 'package:intl/intl.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:html/parser.dart'; import 'format.i18n.dart'; diff --git a/refilc/pubspec.yaml b/refilc/pubspec.yaml index d80e774..c5d9b22 100644 --- a/refilc/pubspec.yaml +++ b/refilc/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: "none" version: 5.0.0+241 environment: - sdk: ">=2.17.0 <3.0.0" + sdk: ">=2.17.0 <=3.3.0" dependencies: flutter: @@ -25,11 +25,11 @@ dependencies: flutter_localizations: sdk: flutter - i18n_extension: ^10.0.1 + i18n_extension: ^11.0.11 sqflite: ^2.2.0+2 - intl: ^0.18.0 - provider: ^5.0.0 - http: ^0.13.3 + intl: ^0.18.1 + provider: ^6.1.1 + http: ^1.1.2 uuid: ^4.2.1 html: ^0.15.0 open_filex: ^4.3.4 @@ -45,27 +45,27 @@ dependencies: quick_actions: ^1.0.1 animated_list_plus: ^0.5.0 dynamic_color: ^1.2.2 - material_color_utilities: ^0.5.0 + material_color_utilities: ^0.8.0 crypto: ^3.0.2 elegant_notification: ^1.6.1 flutter_feather_icons: ^2.0.0+1 live_activities: ^1.7.4 animated_flip_counter: ^0.2.5 - lottie: ^1.4.3 - rive: ^0.9.1 + lottie: ^3.1.0 + rive: ^0.12.4 animated_background: ^2.0.0 - dropdown_button2: ^1.9.4 - home_widget: ^0.1.6 + dropdown_button2: ^2.3.9 + home_widget: ^0.4.1 flutter_expandable_fab: ^2.0.0 uni_links: ^0.5.1 url_launcher: ^6.1.6 workmanager: ^0.5.1 - flutter_svg: ^1.1.6 - image_picker: ^0.8.6 + flutter_svg: ^2.0.10+1 + image_picker: ^1.0.7 animations: ^2.0.1 background_fetch: ^1.1.5 flutter_local_notifications: ^16.2.0 - package_info_plus: ^4.0.2 + package_info_plus: ^5.0.1 screenshot: ^2.1.0 flutter_staggered_grid_view: ^0.7.0 sqflite_common_ffi_web: ^0.4.0 @@ -76,12 +76,12 @@ dependencies: google_sign_in: ^6.2.1 extension_google_sign_in_as_googleapis_auth: ^2.0.12 maps_launcher: ^2.2.0 - google_fonts: ^4.0.4 + google_fonts: ^6.1.0 dev_dependencies: flutter_lints: ^3.0.1 flutter_launcher_icons: "^0.13.1" - flutter_native_splash: "^2.3.0" + flutter_native_splash: "^2.3.10" sqflite_common_ffi: ^2.0.0+3 flutter: diff --git a/refilc_desktop_ui/lib/pages/timetable/timetable_page.dart b/refilc_desktop_ui/lib/pages/timetable/timetable_page.dart index 52f7846..509c016 100644 --- a/refilc_desktop_ui/lib/pages/timetable/timetable_page.dart +++ b/refilc_desktop_ui/lib/pages/timetable/timetable_page.dart @@ -17,7 +17,7 @@ import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; import 'package:refilc/utils/format.dart'; import 'package:intl/intl.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'timetable_page.i18n.dart'; // todo: "fix" overflow (priority: -1) diff --git a/refilc_desktop_ui/lib/screens/settings/settings_screen.dart b/refilc_desktop_ui/lib/screens/settings/settings_screen.dart index ac5a28b..8ccf7f6 100644 --- a/refilc_desktop_ui/lib/screens/settings/settings_screen.dart +++ b/refilc_desktop_ui/lib/screens/settings/settings_screen.dart @@ -139,12 +139,18 @@ class _SettingsScreenState extends State ]); } - void _openDKT(User u) => tabs.launch( - "https://dkttanulo.e-kreta.hu/sso?id_token=${kretaClient.idToken}", - customTabsOption: tabs.CustomTabsOption( - toolbarColor: Theme.of(context).scaffoldBackgroundColor, - showPageTitle: true, - )); + void _openDKT(User u) => tabs.launchUrl( + Uri.parse( + "https://dkttanulo.e-kreta.hu/sso?id_token=${kretaClient.idToken}"), + customTabsOptions: tabs.CustomTabsOptions( + showTitle: true, + colorSchemes: tabs.CustomTabsColorSchemes( + defaultPrams: tabs.CustomTabsColorSchemeParams( + toolbarColor: Theme.of(context).scaffoldBackgroundColor, + ), + ), + ), + ); @override void initState() { diff --git a/refilc_desktop_ui/pubspec.yaml b/refilc_desktop_ui/pubspec.yaml index 11ede6d..16777ad 100644 --- a/refilc_desktop_ui/pubspec.yaml +++ b/refilc_desktop_ui/pubspec.yaml @@ -20,19 +20,19 @@ dependencies: cupertino_icons: ^1.0.2 flutter_feather_icons: ^2.0.0+1 - provider: ^5.0.0 - url_launcher: ^6.0.9 - flutter_linkify: ^5.0.2 - flutter_markdown: ^0.6.5 - animations: ^2.0.1 - confetti: ^0.6.0 + provider: ^6.1.1 + url_launcher: ^6.2.5 + flutter_linkify: ^6.0.0 + flutter_markdown: ^0.6.20+1 + animations: ^2.0.11 + confetti: ^0.7.0 auto_size_text: ^3.0.0 flutter_acrylic: ^1.1.3 - elegant_notification: ^1.6.1 + elegant_notification: ^1.13.0 flutter_staggered_grid_view: ^0.7.0 dev_dependencies: - flutter_lints: ^1.0.0 + flutter_lints: ^3.0.1 flutter: uses-material-design: true diff --git a/refilc_kreta_api/pubspec.yaml b/refilc_kreta_api/pubspec.yaml index 80f8518..a101eac 100644 --- a/refilc_kreta_api/pubspec.yaml +++ b/refilc_kreta_api/pubspec.yaml @@ -2,19 +2,19 @@ name: refilc_kreta_api publish_to: "none" environment: - sdk: ">=2.17.0 <3.0.0" + sdk: ">=2.17.0 <=3.3.0" dependencies: flutter: sdk: flutter refilc: path: ../refilc/ - http: ^0.13.3 - provider: ^5.0.0 + http: ^1.1.2 + provider: ^6.1.1 file_picker: ^6.1.1 intl: ^0.18.1 - i18n_extension: ^10.0.1 - uuid: ^4.2.1 + i18n_extension: ^11.0.11 + uuid: ^4.3.3 dev_dependencies: flutter_lints: ^3.0.1 diff --git a/refilc_mobile_ui/lib/common/average_display.dart b/refilc_mobile_ui/lib/common/average_display.dart index d29b436..3779e60 100644 --- a/refilc_mobile_ui/lib/common/average_display.dart +++ b/refilc_mobile_ui/lib/common/average_display.dart @@ -1,7 +1,7 @@ import 'package:refilc/theme/colors/colors.dart'; import 'package:refilc/ui/widgets/grade/grade_tile.dart'; import 'package:flutter/material.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; class AverageDisplay extends StatelessWidget { const AverageDisplay({super.key, this.average = 0.0, this.border = false}); diff --git a/refilc_mobile_ui/lib/common/bottom_sheet_menu/rounded_bottom_sheet.dart b/refilc_mobile_ui/lib/common/bottom_sheet_menu/rounded_bottom_sheet.dart index 8a57ef8..8f7d9e8 100644 --- a/refilc_mobile_ui/lib/common/bottom_sheet_menu/rounded_bottom_sheet.dart +++ b/refilc_mobile_ui/lib/common/bottom_sheet_menu/rounded_bottom_sheet.dart @@ -62,11 +62,11 @@ Future showRoundedModalBottomSheet( builder: (context) => RoundedBottomSheet(child: child)); } -PersistentBottomSheetController showRoundedBottomSheet( +PersistentBottomSheetController showRoundedBottomSheet( BuildContext context, { required Widget child, }) { - return showBottomSheet( + return showBottomSheet( context: context, backgroundColor: const Color(0x00000000), elevation: 12.0, diff --git a/refilc_mobile_ui/lib/common/trend_display.dart b/refilc_mobile_ui/lib/common/trend_display.dart index 5a0366a..1948898 100644 --- a/refilc_mobile_ui/lib/common/trend_display.dart +++ b/refilc_mobile_ui/lib/common/trend_display.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; class TrendDisplay extends StatelessWidget { - const TrendDisplay({super.key, required this.current, required this.previous, this.padding}); + const TrendDisplay( + {super.key, required this.current, required this.previous, this.padding}); final T current; final T previous; @@ -26,7 +27,11 @@ class TrendDisplay extends StatelessWidget { percentage = 0.0; } - final String percentageText = percentage.abs().toStringAsFixed(1).replaceAll('.', I18n.of(context).locale.languageCode != 'en' ? ',' : '.'); + final String percentageText = percentage + .abs() + .toStringAsFixed(1) + .replaceAll( + '.', I18n.of(context).locale.languageCode != 'en' ? ',' : '.'); if (!percentage.isNegative) { color = upColor; diff --git a/refilc_mobile_ui/lib/common/widgets/cretification/certification_card.dart b/refilc_mobile_ui/lib/common/widgets/cretification/certification_card.dart index e9e2286..6ce9ac3 100644 --- a/refilc_mobile_ui/lib/common/widgets/cretification/certification_card.dart +++ b/refilc_mobile_ui/lib/common/widgets/cretification/certification_card.dart @@ -1,5 +1,5 @@ import 'package:refilc/helpers/average_helper.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:refilc_kreta_api/models/grade.dart'; import 'package:refilc_mobile_ui/common/widgets/cretification/certification_view.dart'; import 'package:refilc/ui/widgets/grade/grade_tile.dart'; diff --git a/refilc_mobile_ui/lib/common/widgets/event/event_view.dart b/refilc_mobile_ui/lib/common/widgets/event/event_view.dart index 46794e2..2ec3b43 100644 --- a/refilc_mobile_ui/lib/common/widgets/event/event_view.dart +++ b/refilc_mobile_ui/lib/common/widgets/event/event_view.dart @@ -42,11 +42,17 @@ class EventView extends StatelessWidget { text: event.content.escapeHtml(), options: const LinkifyOptions(looseUrl: true, removeWww: true), onOpen: (link) { - launch(link.url, - customTabsOption: CustomTabsOption( - toolbarColor: Theme.of(context).scaffoldBackgroundColor, - showPageTitle: true, - )); + launchUrl( + Uri.parse(link.url), + customTabsOptions: CustomTabsOptions( + showTitle: true, + colorSchemes: CustomTabsColorSchemes( + defaultPrams: CustomTabsColorSchemeParams( + toolbarColor: Theme.of(context).scaffoldBackgroundColor, + ), + ), + ), + ); }, style: const TextStyle(fontWeight: FontWeight.w400), ), diff --git a/refilc_mobile_ui/lib/common/widgets/homework/homework_view.dart b/refilc_mobile_ui/lib/common/widgets/homework/homework_view.dart index 2cabb58..ea724cb 100644 --- a/refilc_mobile_ui/lib/common/widgets/homework/homework_view.dart +++ b/refilc_mobile_ui/lib/common/widgets/homework/homework_view.dart @@ -85,11 +85,17 @@ class HomeworkView extends StatelessWidget { text: homework.content.escapeHtml(), options: const LinkifyOptions(looseUrl: true, removeWww: true), onOpen: (link) { - launch(link.url, - customTabsOption: CustomTabsOption( - toolbarColor: Theme.of(context).scaffoldBackgroundColor, - showPageTitle: true, - )); + launchUrl( + Uri.parse(link.url), + customTabsOptions: CustomTabsOptions( + showTitle: true, + colorSchemes: CustomTabsColorSchemes( + defaultPrams: CustomTabsColorSchemeParams( + toolbarColor: Theme.of(context).scaffoldBackgroundColor, + ), + ), + ), + ); }, style: const TextStyle(fontWeight: FontWeight.w400), ), diff --git a/refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart b/refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart index 8521c3c..55825e8 100644 --- a/refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart +++ b/refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart @@ -10,7 +10,7 @@ import 'package:flutter_custom_tabs/flutter_custom_tabs.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; // import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:flutter_linkify/flutter_linkify.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:share_plus/share_plus.dart'; @@ -169,11 +169,17 @@ class MessageViewTile extends StatelessWidget { text: message.content.escapeHtml(), options: const LinkifyOptions(looseUrl: true, removeWww: true), onOpen: (link) { - launch(link.url, - customTabsOption: CustomTabsOption( - toolbarColor: Theme.of(context).scaffoldBackgroundColor, - showPageTitle: true, - )); + launchUrl( + Uri.parse(link.url), + customTabsOptions: CustomTabsOptions( + showTitle: true, + colorSchemes: CustomTabsColorSchemes( + defaultPrams: CustomTabsColorSchemeParams( + toolbarColor: Theme.of(context).scaffoldBackgroundColor, + ), + ), + ), + ); }, style: const TextStyle(fontWeight: FontWeight.w400), ), diff --git a/refilc_mobile_ui/lib/common/widgets/note/note_view.dart b/refilc_mobile_ui/lib/common/widgets/note/note_view.dart index 5d4a240..b0ffaff 100644 --- a/refilc_mobile_ui/lib/common/widgets/note/note_view.dart +++ b/refilc_mobile_ui/lib/common/widgets/note/note_view.dart @@ -67,11 +67,18 @@ class NoteView extends StatelessWidget { text: note.content.escapeHtml(), options: const LinkifyOptions(looseUrl: true, removeWww: true), onOpen: (link) { - launch(link.url, - customTabsOption: CustomTabsOption( - toolbarColor: Theme.of(context).scaffoldBackgroundColor, - showPageTitle: true, - )); + launchUrl( + Uri.parse(link.url), + customTabsOptions: CustomTabsOptions( + showTitle: true, + colorSchemes: CustomTabsColorSchemes( + defaultPrams: CustomTabsColorSchemeParams( + toolbarColor: + Theme.of(context).scaffoldBackgroundColor, + ), + ), + ), + ); }, style: const TextStyle(fontWeight: FontWeight.w400), ), diff --git a/refilc_mobile_ui/lib/common/widgets/statistics_tile.dart b/refilc_mobile_ui/lib/common/widgets/statistics_tile.dart index 88a198e..e7e3307 100644 --- a/refilc_mobile_ui/lib/common/widgets/statistics_tile.dart +++ b/refilc_mobile_ui/lib/common/widgets/statistics_tile.dart @@ -2,7 +2,7 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:refilc/models/settings.dart'; import 'package:refilc/ui/widgets/grade/grade_tile.dart'; import 'package:flutter/material.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:provider/provider.dart'; class StatisticsTile extends StatelessWidget { diff --git a/refilc_mobile_ui/lib/common/widgets/update/updates_view.dart b/refilc_mobile_ui/lib/common/widgets/update/updates_view.dart index c42a228..d2ce169 100644 --- a/refilc_mobile_ui/lib/common/widgets/update/updates_view.dart +++ b/refilc_mobile_ui/lib/common/widgets/update/updates_view.dart @@ -82,7 +82,8 @@ class UpdateViewState extends State { padding: const EdgeInsets.symmetric(horizontal: 12.0), physics: const BouncingScrollPhysics(), data: widget.release.body, - onTapLink: (text, href, title) => launch(href ?? ""), + onTapLink: (text, href, title) => + launchUrl(Uri.parse(href ?? "")), ), ), ), diff --git a/refilc_mobile_ui/lib/pages/grades/average_selector.dart b/refilc_mobile_ui/lib/pages/grades/average_selector.dart index e29b45c..310eab0 100644 --- a/refilc_mobile_ui/lib/pages/grades/average_selector.dart +++ b/refilc_mobile_ui/lib/pages/grades/average_selector.dart @@ -60,26 +60,36 @@ class AverageSelectorState extends State { // } }, value: widget.value, - iconSize: 14, - iconEnabledColor: AppColors.of(context).text, - iconDisabledColor: AppColors.of(context).text, + iconStyleData: IconStyleData( + iconSize: 14, + iconEnabledColor: AppColors.of(context).text, + iconDisabledColor: AppColors.of(context).text, + ), underline: const SizedBox(), - itemHeight: 40, - itemPadding: const EdgeInsets.only(left: 14, right: 14), - dropdownWidth: 200, - dropdownPadding: null, - buttonDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), + menuItemStyleData: const MenuItemStyleData( + height: 40, + padding: EdgeInsets.only(left: 14, right: 14), ), - dropdownDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(14), + buttonStyleData: ButtonStyleData( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + ), + ), + dropdownStyleData: DropdownStyleData( + width: 200, + padding: null, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(14), + ), + elevation: 8, + scrollbarTheme: ScrollbarThemeData( + radius: const Radius.circular(40), + thickness: MaterialStateProperty.all(6.0), + trackVisibility: MaterialStateProperty.all(true), + thumbVisibility: MaterialStateProperty.all(true), + ), + offset: const Offset(-10, -10), ), - dropdownElevation: 8, - scrollbarRadius: const Radius.circular(40), - scrollbarThickness: 6, - scrollbarAlwaysShow: true, - offset: const Offset(-10, -10), - buttonSplashColor: Colors.transparent, customButton: SizedBox( height: 30, child: Row( diff --git a/refilc_mobile_ui/lib/pages/grades/graph.dart b/refilc_mobile_ui/lib/pages/grades/graph.dart index dff8a85..313766d 100644 --- a/refilc_mobile_ui/lib/pages/grades/graph.dart +++ b/refilc_mobile_ui/lib/pages/grades/graph.dart @@ -7,7 +7,7 @@ import 'package:refilc_kreta_api/models/grade.dart'; import 'package:flutter/material.dart'; import 'package:fl_chart/fl_chart.dart'; import 'package:intl/intl.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:provider/provider.dart'; import 'graph.i18n.dart'; diff --git a/refilc_mobile_ui/lib/pages/home/home_page.dart b/refilc_mobile_ui/lib/pages/home/home_page.dart index 11d5607..dd55ff1 100644 --- a/refilc_mobile_ui/lib/pages/home/home_page.dart +++ b/refilc_mobile_ui/lib/pages/home/home_page.dart @@ -4,7 +4,7 @@ import 'dart:math'; import 'package:refilc/api/providers/live_card_provider.dart'; import 'package:refilc/ui/date_widget.dart'; import 'package:refilc/utils/format.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:intl/intl.dart'; import 'package:refilc_plus/providers/premium_provider.dart'; import 'package:animated_list_plus/animated_list_plus.dart'; @@ -33,7 +33,6 @@ import 'package:provider/provider.dart'; import 'home_page.i18n.dart'; import 'package:refilc/ui/filter/widgets.dart'; import 'package:refilc/ui/filter/sort.dart'; -import 'package:i18n_extension/i18n_extension.dart'; // import 'package:dropdown_button2/dropdown_button2.dart'; class HomePage extends StatefulWidget { diff --git a/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart b/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart index 63c9bef..1f205b2 100644 --- a/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart +++ b/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart @@ -10,7 +10,7 @@ import 'package:refilc/utils/format.dart'; import 'package:refilc/api/providers/live_card_provider.dart'; import 'package:refilc_mobile_ui/pages/home/live_card/live_card_widget.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:intl/intl.dart'; import 'package:maps_launcher/maps_launcher.dart'; import 'package:provider/provider.dart'; diff --git a/refilc_mobile_ui/lib/pages/messages/send_message/send_message.dart b/refilc_mobile_ui/lib/pages/messages/send_message/send_message.dart index 8847919..f4fa50b 100644 --- a/refilc_mobile_ui/lib/pages/messages/send_message/send_message.dart +++ b/refilc_mobile_ui/lib/pages/messages/send_message/send_message.dart @@ -79,27 +79,37 @@ class SendMessageSheetState extends State { .removeWhere((e) => e.kretaId == kretaId); }); }, - iconSize: 14, - iconEnabledColor: AppColors.of(context).text, - iconDisabledColor: AppColors.of(context).text, + iconStyleData: IconStyleData( + iconSize: 14, + iconEnabledColor: AppColors.of(context).text, + iconDisabledColor: AppColors.of(context).text, + ), underline: const SizedBox(), - itemHeight: 40, - itemPadding: const EdgeInsets.only(left: 14, right: 14), - buttonWidth: 50, - dropdownWidth: 300, - dropdownPadding: null, - buttonDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), + menuItemStyleData: const MenuItemStyleData( + height: 40, + padding: EdgeInsets.only(left: 14, right: 14), ), - dropdownDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(14), + buttonStyleData: ButtonStyleData( + width: 50, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + ), + ), + dropdownStyleData: DropdownStyleData( + width: 300, + padding: null, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(14), + ), + elevation: 8, + scrollbarTheme: ScrollbarThemeData( + radius: const Radius.circular(40), + thickness: MaterialStateProperty.all(6.0), + trackVisibility: MaterialStateProperty.all(true), + thumbVisibility: MaterialStateProperty.all(true), + ), + offset: const Offset(-10, -10), ), - dropdownElevation: 8, - scrollbarRadius: const Radius.circular(40), - scrollbarThickness: 6, - scrollbarAlwaysShow: true, - offset: const Offset(-10, -10), - buttonSplashColor: Colors.transparent, customButton: Container( width: double.infinity, decoration: BoxDecoration( diff --git a/refilc_mobile_ui/lib/pages/timetable/fs_timetable.dart b/refilc_mobile_ui/lib/pages/timetable/fs_timetable.dart index 0fff83d..64e3be0 100644 --- a/refilc_mobile_ui/lib/pages/timetable/fs_timetable.dart +++ b/refilc_mobile_ui/lib/pages/timetable/fs_timetable.dart @@ -13,7 +13,7 @@ import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:refilc/utils/format.dart'; import 'dart:math' as math; import 'package:intl/intl.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:provider/provider.dart'; class FSTimetable extends StatefulWidget { diff --git a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart index f494e5c..ee3e305 100644 --- a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart +++ b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart @@ -1,5 +1,6 @@ import 'dart:math'; import 'package:animations/animations.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:refilc/api/providers/update_provider.dart'; import 'package:refilc/models/settings.dart'; // TODO: gulag calendar sync @@ -29,7 +30,6 @@ import 'package:flutter/services.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:provider/provider.dart'; import 'package:intl/intl.dart'; -import 'package:i18n_extension/i18n_widget.dart'; import 'timetable_page.i18n.dart'; // todo: "fix" overflow (priority: -1) diff --git a/refilc_mobile_ui/lib/screens/news/news_view.dart b/refilc_mobile_ui/lib/screens/news/news_view.dart index 69f06d0..28f2337 100644 --- a/refilc_mobile_ui/lib/screens/news/news_view.dart +++ b/refilc_mobile_ui/lib/screens/news/news_view.dart @@ -45,12 +45,16 @@ class NewsView extends StatelessWidget { options: const LinkifyOptions(looseUrl: true, removeWww: true), onOpen: (link) { - launch( - link.url, - customTabsOption: CustomTabsOption( - showPageTitle: true, - toolbarColor: - Theme.of(context).scaffoldBackgroundColor), + launchUrl( + Uri.parse(link.url), + customTabsOptions: CustomTabsOptions( + showTitle: true, + colorSchemes: CustomTabsColorSchemes( + defaultPrams: CustomTabsColorSchemeParams( + toolbarColor: Theme.of(context) + .scaffoldBackgroundColor), + ), + ), ); }, style: const TextStyle( @@ -69,12 +73,16 @@ class NewsView extends StatelessWidget { label: news.openLabel != "" ? news.openLabel : "open".i18n.toUpperCase(), - onTap: () => launch( - news.link, - customTabsOption: CustomTabsOption( - showPageTitle: true, - toolbarColor: - Theme.of(context).scaffoldBackgroundColor), + onTap: () => launchUrl( + Uri.parse(news.link), + customTabsOptions: CustomTabsOptions( + showTitle: true, + colorSchemes: CustomTabsColorSchemes( + defaultPrams: CustomTabsColorSchemeParams( + toolbarColor: + Theme.of(context).scaffoldBackgroundColor), + ), + ), ), ), DialogButton( diff --git a/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart b/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart index 364bc6a..ddf09fb 100644 --- a/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart +++ b/refilc_mobile_ui/lib/screens/settings/modify_subject_names.dart @@ -153,27 +153,36 @@ class _ModifySubjectNamesState extends State { } }); }, - iconSize: 14, - iconEnabledColor: AppColors.of(context).text, - iconDisabledColor: AppColors.of(context).text, + iconStyleData: IconStyleData( + iconSize: 14, + iconEnabledColor: AppColors.of(context).text, + iconDisabledColor: AppColors.of(context).text, + ), underline: const SizedBox(), - itemHeight: 40, - itemPadding: const EdgeInsets.only(left: 14, right: 14), - buttonWidth: 50, - dropdownWidth: 300, - dropdownPadding: null, - buttonDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), + menuItemStyleData: const MenuItemStyleData( + height: 40, + padding: EdgeInsets.only(left: 14, right: 14), ), - dropdownDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(14), + buttonStyleData: ButtonStyleData( + width: 50, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + ), + ), + dropdownStyleData: DropdownStyleData( + width: 300, + padding: null, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(14), + ), + elevation: 8, + scrollbarTheme: ScrollbarThemeData( + radius: const Radius.circular(40), + thickness: MaterialStateProperty.all(6.0), + trackVisibility: MaterialStateProperty.all(true), + ), + offset: const Offset(-10, -10), ), - dropdownElevation: 8, - scrollbarRadius: const Radius.circular(40), - scrollbarThickness: 6, - scrollbarAlwaysShow: true, - offset: const Offset(-10, -10), - buttonSplashColor: Colors.transparent, customButton: Container( width: double.infinity, decoration: BoxDecoration( diff --git a/refilc_mobile_ui/lib/screens/settings/privacy_view.dart b/refilc_mobile_ui/lib/screens/settings/privacy_view.dart index 9614aae..73e9ce7 100644 --- a/refilc_mobile_ui/lib/screens/settings/privacy_view.dart +++ b/refilc_mobile_ui/lib/screens/settings/privacy_view.dart @@ -44,11 +44,17 @@ class PrivacyView extends StatelessWidget { • A kliensalkalmazás bármely eszközön és platformon történő használatával tudomásul vetted és elfogadod a jelen adatkezelési tájékoztatót. A reFilc csapata fenntartja a jogot a tájékoztató módosítására és a módosításokról nem köteles értesíteni a felhasználóit! """, - onOpen: (link) => launch(link.url, - customTabsOption: CustomTabsOption( - toolbarColor: Theme.of(context).scaffoldBackgroundColor, - showPageTitle: true, - )), + onOpen: (link) => launchUrl( + Uri.parse(link.url), + customTabsOptions: CustomTabsOptions( + showTitle: true, + colorSchemes: CustomTabsColorSchemes( + defaultPrams: CustomTabsColorSchemeParams( + toolbarColor: Theme.of(context).scaffoldBackgroundColor, + ), + ), + ), + ), ), ], ), diff --git a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart index 628ea25..bca9d87 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart @@ -28,7 +28,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_feather_icons/flutter_feather_icons.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; import 'package:provider/provider.dart'; import 'package:refilc_mobile_ui/common/screens.i18n.dart'; import 'package:refilc_mobile_ui/screens/settings/settings_screen.i18n.dart'; diff --git a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart index bf4f55a..207a7a5 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart @@ -174,12 +174,18 @@ class SettingsScreenState extends State ]); } - void _openDKT(User u) => tabs.launch( - "https://dkttanulo.e-kreta.hu/sso?id_token=${kretaClient.idToken}", - customTabsOption: tabs.CustomTabsOption( - toolbarColor: Theme.of(context).scaffoldBackgroundColor, - showPageTitle: true, - )); + void _openDKT(User u) => tabs.launchUrl( + Uri.parse( + "https://dkttanulo.e-kreta.hu/sso?id_token=${kretaClient.idToken}"), + customTabsOptions: tabs.CustomTabsOptions( + showTitle: true, + colorSchemes: tabs.CustomTabsColorSchemes( + defaultPrams: tabs.CustomTabsColorSchemeParams( + toolbarColor: Theme.of(context).scaffoldBackgroundColor, + ), + ), + ), + ); @override void initState() { diff --git a/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart b/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart index ef00041..899b0a5 100644 --- a/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart @@ -732,28 +732,40 @@ class PersonalizeSettingsScreenState extends State setState(() {}); // _subjectName.text = ""; }, - iconSize: 14, - iconEnabledColor: AppColors.of(context).text, - iconDisabledColor: AppColors.of(context).text, + iconStyleData: IconStyleData( + iconSize: 14, + iconEnabledColor: AppColors.of(context).text, + iconDisabledColor: AppColors.of(context).text, + ), underline: const SizedBox(), - itemHeight: 40, - itemPadding: - const EdgeInsets.only(left: 14, right: 14), - buttonWidth: 50, - dropdownWidth: 300, - dropdownPadding: null, - buttonDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(12.0), + menuItemStyleData: const MenuItemStyleData( + height: 40, + padding: EdgeInsets.only(left: 14, right: 14), ), - dropdownDecoration: BoxDecoration( - borderRadius: BorderRadius.circular(14), + buttonStyleData: ButtonStyleData( + width: 50, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12.0), + ), + ), + dropdownStyleData: DropdownStyleData( + width: 300, + padding: null, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(14), + ), + elevation: 8, + offset: const Offset(-10, -10), + scrollbarTheme: ScrollbarThemeData( + radius: const Radius.circular(40), + thickness: + MaterialStateProperty.all(6.0), + trackVisibility: + MaterialStateProperty.all(true), + thumbVisibility: + MaterialStateProperty.all(true), + ), ), - dropdownElevation: 8, - scrollbarRadius: const Radius.circular(40), - scrollbarThickness: 6, - scrollbarAlwaysShow: true, - offset: const Offset(-10, -10), - buttonSplashColor: Colors.transparent, customButton: PanelButton( title: Text( "select_subject".i18n, diff --git a/refilc_mobile_ui/lib/screens/summary/pages/grades_page.dart b/refilc_mobile_ui/lib/screens/summary/pages/grades_page.dart index 0c96187..28e16b6 100644 --- a/refilc_mobile_ui/lib/screens/summary/pages/grades_page.dart +++ b/refilc_mobile_ui/lib/screens/summary/pages/grades_page.dart @@ -12,7 +12,7 @@ import 'package:refilc_mobile_ui/screens/summary/summary_screen.i18n.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:auto_size_text/auto_size_text.dart'; -import 'package:i18n_extension/i18n_widget.dart'; +import 'package:i18n_extension/i18n_extension.dart'; List faces = [ "(·.·)", diff --git a/refilc_mobile_ui/pubspec.yaml b/refilc_mobile_ui/pubspec.yaml index 92bb0ba..18a381d 100644 --- a/refilc_mobile_ui/pubspec.yaml +++ b/refilc_mobile_ui/pubspec.yaml @@ -20,50 +20,50 @@ dependencies: path: ../refilc_plus/ flutter_feather_icons: ^2.0.0+1 - provider: ^5.0.0 + provider: ^6.1.1 fl_chart: ^0.45.1 - url_launcher: ^6.0.9 + url_launcher: ^6.2.5 flutter_material_color_picker: ^1.1.0+2 photo_view: ^0.14.0 - flutter_linkify: ^5.0.2 - flutter_custom_tabs: ^1.0.3 - flutter_markdown: ^0.6.5 - animations: ^2.0.1 + flutter_linkify: ^6.0.0 + flutter_custom_tabs: ^2.0.0+1 + flutter_markdown: ^0.6.20+1 + animations: ^2.0.11 animated_list_plus: ^0.5.0 - confetti: ^0.6.0 - live_activities: ^1.0.0 + confetti: ^0.7.0 + live_activities: ^1.9.1+1 animated_flip_counter: ^0.2.5 - lottie: ^1.4.3 - rive: ^0.9.1 + lottie: ^3.1.0 + rive: ^0.12.4 animated_background: ^2.0.0 - home_widget: ^0.1.6 - dropdown_button2: ^1.8.9 - flutter_svg: ^1.1.6 - background_fetch: ^1.1.5 + home_widget: ^0.4.1 + dropdown_button2: ^2.3.9 + flutter_svg: ^2.0.10+1 + background_fetch: ^1.2.2 wtf_sliding_sheet: ^1.0.0 - package_info_plus: ^4.0.2 + package_info_plus: ^5.0.1 dotted_border: ^2.0.0+3 screenshot: ^2.1.0 image_gallery_saver: ^2.0.2 rounded_expansion_tile: git: url: https://github.com/kimaah/rounded_expansion_tile.git - go_router: ^12.1.3 + go_router: ^13.2.0 flutter_expandable_fab: ^2.0.0 intl: ^0.18.1 - i18n_extension: ^10.0.1 + i18n_extension: ^11.0.11 auto_size_text: ^3.0.0 connectivity_plus: ^5.0.2 collection: ^1.18.0 - share_plus: ^7.2.1 - image_picker: ^0.8.9 - path_provider: ^2.1.1 + share_plus: ^7.2.2 + image_picker: ^1.0.7 + path_provider: ^2.1.2 image_crop: git: url: https://github.com/kimaah/image_crop.git - uuid: ^4.2.2 + uuid: ^4.3.3 maps_launcher: ^2.2.0 - google_fonts: ^4.0.4 + google_fonts: ^6.1.0 dev_dependencies: flutter_lints: ^3.0.1 diff --git a/refilc_plus b/refilc_plus index 1f385ce..960ab22 160000 --- a/refilc_plus +++ b/refilc_plus @@ -1 +1 @@ -Subproject commit 1f385cecb799ca4ab21492b6bd9ebc98bb20a810 +Subproject commit 960ab223654209f75b5c412a8f153e69968f7192