From 9f5a34680e252418fcf61051ba1c614163fd6014 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 18 Nov 2021 12:08:25 +0200 Subject: [PATCH] Update Flutter --- lib/constants.dart | 2 + lib/redux/app/app_actions.dart | 1 - lib/redux/app/app_reducer.dart | 1 - lib/redux/company/company_reducer.dart | 1 - lib/redux/company/company_state.dart | 5 - lib/redux/ui/pref_reducer.dart | 2 - lib/redux/ui/ui_state.dart | 1 - lib/redux/user/user_reducer.dart | 5 +- lib/ui/app/dismissible_entity.dart | 43 ++-- lib/ui/app/document_grid.dart | 2 +- lib/ui/reports/reports_screen_vm.dart | 1 - lib/ui/settings/client_portal.dart | 4 +- lib/ui/settings/email_settings.dart | 2 +- lib/utils/files.dart | 9 +- lib/utils/i18n.dart | 5 + lib/utils/icons.dart | 2 +- lib/utils/web.dart | 9 - lib/utils/web_stub.dart | 19 -- pubspec.lock | 202 +++++++++++------- pubspec.yaml | 13 +- .../flutter/generated_plugin_registrant.cc | 6 +- 21 files changed, 177 insertions(+), 158 deletions(-) diff --git a/lib/constants.dart b/lib/constants.dart index 0d913aec9..882221679 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -265,6 +265,7 @@ const String kGatewayTypeEPS = '17'; const String kGatewayTypeDirectDebit = '18'; const String kGatewayTypeACSS = '19'; const String kGatewayTypeBECS = '20'; +const String kGatewayTypeBankPay = '21'; const kGatewayTypes = { kGatewayTypeCreditCard: 'credit_card', @@ -287,6 +288,7 @@ const kGatewayTypes = { kGatewayTypeEPS: 'eps', kGatewayTypeACSS: 'acss', kGatewayTypeBECS: 'becs', + kGatewayTypeBankPay: 'bank_pay', }; const String kNotificationChannelEmail = 'email'; diff --git a/lib/redux/app/app_actions.dart b/lib/redux/app/app_actions.dart index 926eae5e6..67e18c503 100644 --- a/lib/redux/app/app_actions.dart +++ b/lib/redux/app/app_actions.dart @@ -68,7 +68,6 @@ import 'package:invoiceninja_flutter/utils/platforms.dart'; // STARTER: import - do not remove comment - class PersistUI {} class PersistPrefs {} diff --git a/lib/redux/app/app_reducer.dart b/lib/redux/app/app_reducer.dart index cdb1ab6cf..7b0b235a2 100644 --- a/lib/redux/app/app_reducer.dart +++ b/lib/redux/app/app_reducer.dart @@ -33,7 +33,6 @@ import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; // STARTER: import - do not remove comment - // We create the State reducer by combining many smaller reducers into one! AppState appReducer(AppState state, dynamic action) { if (action is UserLogout) { diff --git a/lib/redux/company/company_reducer.dart b/lib/redux/company/company_reducer.dart index 733f02c4f..dc6357e56 100644 --- a/lib/redux/company/company_reducer.dart +++ b/lib/redux/company/company_reducer.dart @@ -36,7 +36,6 @@ import 'package:invoiceninja_flutter/redux/webhook/webhook_reducer.dart'; // STARTER: import - do not remove comment - UserCompanyState companyReducer(UserCompanyState state, dynamic action) { if (action is DeleteCompanySuccess) { return UserCompanyState(false); diff --git a/lib/redux/company/company_state.dart b/lib/redux/company/company_state.dart index 0dfe35dd6..bc89f3f5b 100644 --- a/lib/redux/company/company_state.dart +++ b/lib/redux/company/company_state.dart @@ -33,11 +33,6 @@ import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart'; // STARTER: import - do not remove comment - - - - - part 'company_state.g.dart'; abstract class UserCompanyState diff --git a/lib/redux/ui/pref_reducer.dart b/lib/redux/ui/pref_reducer.dart index 2bce81cf1..18c440c48 100644 --- a/lib/redux/ui/pref_reducer.dart +++ b/lib/redux/ui/pref_reducer.dart @@ -41,8 +41,6 @@ import 'package:invoiceninja_flutter/redux/webhook/webhook_actions.dart'; // STARTER: import - do not remove comment - - PrefState prefReducer( PrefState state, dynamic action, String selectedCompanyId) { return state.rebuild( diff --git a/lib/redux/ui/ui_state.dart b/lib/redux/ui/ui_state.dart index 3e7c00280..c4ca9965f 100644 --- a/lib/redux/ui/ui_state.dart +++ b/lib/redux/ui/ui_state.dart @@ -39,7 +39,6 @@ import 'package:invoiceninja_flutter/utils/strings.dart'; // STARTER: import - do not remove comment - part 'ui_state.g.dart'; abstract class UIState implements Built { diff --git a/lib/redux/user/user_reducer.dart b/lib/redux/user/user_reducer.dart index fffac57e3..f0c9ce12b 100644 --- a/lib/redux/user/user_reducer.dart +++ b/lib/redux/user/user_reducer.dart @@ -229,8 +229,9 @@ UserState _restoreUserSuccess(UserState userState, RestoreUserSuccess action) { } UserState _removeUserSuccess(UserState userState, RemoveUserSuccess action) { - return userState - .rebuild((b) => b..map.remove(action.userId)..list.remove(action.userId)); + return userState.rebuild((b) => b + ..map.remove(action.userId) + ..list.remove(action.userId)); } UserState _addUser(UserState userState, AddUserSuccess action) { diff --git a/lib/ui/app/dismissible_entity.dart b/lib/ui/app/dismissible_entity.dart index fc8bf3823..ec2c97084 100644 --- a/lib/ui/app/dismissible_entity.dart +++ b/lib/ui/app/dismissible_entity.dart @@ -60,26 +60,34 @@ class DismissibleEntity extends StatelessWidget { } return Slidable( - actionPane: SlidableDrawerActionPane(), + //actionPane: SlidableDrawerActionPane(), key: Key('__${entity.entityKey}_${entity.entityState}__'), - actions: [ - if (showCheckbox) - IconSlideAction( - caption: localization.select, - color: Colors.teal, + startActionPane: ActionPane( + motion: const ScrollMotion(), + dismissible: DismissiblePane(onDismissed: () { + // + }), + children: [ + if (showCheckbox) + SlidableAction( + onPressed: (context) => + handleEntityAction(entity, EntityAction.toggleMultiselect), + icon: Icons.check_box, + label: localization.select, + backgroundColor: Colors.teal, + foregroundColor: Colors.white, + ), + SlidableAction( + label: localization.more, + backgroundColor: Colors.black45, foregroundColor: Colors.white, - icon: Icons.check_box, - onTap: () => - handleEntityAction(entity, EntityAction.toggleMultiselect), + icon: Icons.more_vert, + onPressed: (context) => + handleEntityAction(entity, EntityAction.more), ), - IconSlideAction( - caption: localization.more, - color: Colors.black45, - foregroundColor: Colors.white, - icon: Icons.more_vert, - onTap: () => handleEntityAction(entity, EntityAction.more), - ), - ], + ], + ), + /* secondaryActions: [ entity.isActive ? IconSlideAction( @@ -112,6 +120,7 @@ class DismissibleEntity extends StatelessWidget { onTap: () => handleEntityAction(entity, EntityAction.delete), ), ], + */ child: widget, ); } diff --git a/lib/ui/app/document_grid.dart b/lib/ui/app/document_grid.dart index a96e35bb3..2434a0b75 100644 --- a/lib/ui/app/document_grid.dart +++ b/lib/ui/app/document_grid.dart @@ -304,7 +304,7 @@ class DocumentPreview extends StatelessWidget { fit: BoxFit.cover, key: ValueKey(document.preview), imageUrl: document.url, - imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, + //imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, httpHeaders: {'X-API-TOKEN': state.credentials.token}, placeholder: (context, url) => Container( height: height, diff --git a/lib/ui/reports/reports_screen_vm.dart b/lib/ui/reports/reports_screen_vm.dart index ce5d0d0fb..0b721f8ca 100644 --- a/lib/ui/reports/reports_screen_vm.dart +++ b/lib/ui/reports/reports_screen_vm.dart @@ -48,7 +48,6 @@ import 'credit_report.dart'; import 'package:invoiceninja_flutter/utils/web_stub.dart' if (dart.library.html) 'package:invoiceninja_flutter/utils/web.dart'; - class ReportsScreenBuilder extends StatelessWidget { const ReportsScreenBuilder({Key key}) : super(key: key); diff --git a/lib/ui/settings/client_portal.dart b/lib/ui/settings/client_portal.dart index e71d3ba52..d6a95dbd6 100644 --- a/lib/ui/settings/client_portal.dart +++ b/lib/ui/settings/client_portal.dart @@ -528,7 +528,7 @@ class _ClientPortalState extends State label: localization.showAcceptInvoiceTerms, helpLabel: localization.showAcceptInvoiceTermsHelp, value: settings.showAcceptInvoiceTerms, - iconData: MdiIcons.checkBoxOutline, + iconData: MdiIcons.checkboxOutline, onChanged: (value) => viewModel.onSettingsChanged(settings .rebuild((b) => b..showAcceptInvoiceTerms = value)), ), @@ -536,7 +536,7 @@ class _ClientPortalState extends State label: localization.showAcceptQuoteTerms, helpLabel: localization.showAcceptQuoteTermsHelp, value: settings.showAcceptQuoteTerms, - iconData: MdiIcons.checkBoxOutline, + iconData: MdiIcons.checkboxOutline, onChanged: (value) => viewModel.onSettingsChanged(settings .rebuild((b) => b..showAcceptQuoteTerms = value)), ), diff --git a/lib/ui/settings/email_settings.dart b/lib/ui/settings/email_settings.dart index d4e7cd0bc..4d33cff0a 100644 --- a/lib/ui/settings/email_settings.dart +++ b/lib/ui/settings/email_settings.dart @@ -327,7 +327,7 @@ class _EmailSettingsState extends State { BoolDropdownButton( label: localization.attachPdf, value: settings.pdfEmailAttachment, - iconData: MdiIcons.filePdf, + iconData: MdiIcons.filePdfBox, onChanged: (value) => viewModel.onSettingsChanged( settings.rebuild((b) => b..pdfEmailAttachment = value)), ), diff --git a/lib/utils/files.dart b/lib/utils/files.dart index de2431f53..3516e985e 100644 --- a/lib/utils/files.dart +++ b/lib/utils/files.dart @@ -27,10 +27,11 @@ Future pickFile( allowedExtensions: allowedExtensions, ); } else if (isWindows()) { - return WebUtils.pickFile( - fileIndex: fileIndex, - allowedExtensions: allowedExtensions, - fileType: fileType); + return _pickFile( + fileIndex: fileIndex, + fileType: fileType, + allowedExtensions: allowedExtensions, + ); } else { final permission = await (fileType == FileType.image && Platform.isIOS ? Permission.photos.status diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index 0c312c0b2..8e8a5aebe 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -16,6 +16,7 @@ mixin LocalizationsProvider on LocaleCodeAware { static final Map> _localizedValues = { 'en': { // STARTER: lang key - do not remove comment + 'bank_pay': 'Bank Pay', 'click_selected': 'Click Selected', 'hide_preview': 'Hide Preview', 'edit_record': 'Edit Record', @@ -62829,6 +62830,10 @@ mixin LocalizationsProvider on LocaleCodeAware { _localizedValues[localeCode]['hide_preview'] ?? _localizedValues['en']['hide_preview']; + String get bankPay => + _localizedValues[localeCode]['bank_pay'] ?? + _localizedValues['en']['bank_pay']; + // STARTER: lang field - do not remove comment String lookup(String key) { diff --git a/lib/utils/icons.dart b/lib/utils/icons.dart index 9e0a9150b..9c2efdaf3 100644 --- a/lib/utils/icons.dart +++ b/lib/utils/icons.dart @@ -151,7 +151,7 @@ IconData getEntityIcon(EntityType entityType) { IconData getFileTypeIcon(String type) { switch (type) { case 'pdf': - return MdiIcons.filePdf; + return MdiIcons.filePdfBox; case 'psd': return MdiIcons.fileImage; case 'txt': diff --git a/lib/utils/web.dart b/lib/utils/web.dart index 88127babf..32ae04fa5 100644 --- a/lib/utils/web.dart +++ b/lib/utils/web.dart @@ -5,8 +5,6 @@ import 'dart:typed_data'; import 'dart:ui' as ui; // Package imports: -import 'package:file_picker/file_picker.dart'; -import 'package:http/http.dart'; import 'package:redux/redux.dart'; // Project imports: @@ -69,13 +67,6 @@ class WebUtils { }); } - static Future pickFile( - {String fileIndex, - FileType fileType, - List allowedExtensions}) async { - return null; - } - /* String loadToken() { final cookies = document.cookie; diff --git a/lib/utils/web_stub.dart b/lib/utils/web_stub.dart index c57c6484b..5a9a16146 100644 --- a/lib/utils/web_stub.dart +++ b/lib/utils/web_stub.dart @@ -2,9 +2,6 @@ import 'dart:typed_data'; // Package imports: -import 'package:file_picker/file_picker.dart'; -import 'package:filepicker_windows/filepicker_windows.dart'; -import 'package:http/http.dart'; import 'package:redux/redux.dart'; // Project imports: @@ -27,22 +24,6 @@ class WebUtils { static void warnChanges(Store store) {} - static Future pickFile( - {String fileIndex, - FileType fileType, - List allowedExtensions}) async { - final filePicker = OpenFilePicker(); - final file = filePicker.getFile(); - - if (file == null) { - return null; - } - - return MultipartFile.fromBytes( - fileIndex ?? 'file', await file.readAsBytes(), - filename: file.path.split('\\').last.split('/').last); - } - /* static String loadToken() => null; diff --git a/pubspec.lock b/pubspec.lock index b9d09ae0c..c9c8f9e18 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "22.0.0" + version: "30.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.2" + version: "2.7.0" ansicolor: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.3.0" async: dependency: transitive description: @@ -63,7 +63,7 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" build_config: dependency: transitive description: @@ -77,7 +77,7 @@ packages: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" build_resolvers: dependency: transitive description: @@ -91,42 +91,56 @@ packages: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.5" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "7.1.0" + version: "7.2.2" built_collection: dependency: "direct main" description: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "5.1.1" built_value: dependency: "direct main" description: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.1.2" + version: "8.1.3" built_value_generator: dependency: "direct dev" description: name: built_value_generator url: "https://pub.dartlang.org" source: hosted - version: "8.1.1" + version: "8.1.3" cached_network_image: dependency: "direct main" description: name: cached_network_image url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.1.0+1" + cached_network_image_platform_interface: + dependency: transitive + description: + name: cached_network_image_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + cached_network_image_web: + dependency: transitive + description: + name: cached_network_image_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" characters: dependency: transitive description: @@ -168,7 +182,7 @@ packages: name: cli_util url: "https://pub.dartlang.org" source: hosted - version: "0.3.3" + version: "0.3.5" clock: dependency: transitive description: @@ -196,7 +210,7 @@ packages: name: contacts_service url: "https://pub.dartlang.org" source: hosted - version: "0.6.1" + version: "0.6.3" convert: dependency: transitive description: @@ -217,7 +231,7 @@ packages: name: cross_file url: "https://pub.dartlang.org" source: hosted - version: "0.3.1+4" + version: "0.3.2" crypto: dependency: transitive description: @@ -231,7 +245,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.2.0" device_info_plus: dependency: transitive description: @@ -322,14 +336,7 @@ packages: name: file_picker url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" - filepicker_windows: - dependency: "direct main" - description: - name: filepicker_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" + version: "4.2.3" fixnum: dependency: transitive description: @@ -355,14 +362,14 @@ packages: name: flutter_cache_manager url: "https://pub.dartlang.org" source: hosted - version: "3.1.2" + version: "3.1.3" flutter_colorpicker: dependency: "direct main" description: name: flutter_colorpicker url: "https://pub.dartlang.org" source: hosted - version: "0.5.0" + version: "1.0.2" flutter_driver: dependency: "direct dev" description: flutter @@ -388,7 +395,7 @@ packages: name: flutter_launcher_icons url: "https://pub.dartlang.org" source: hosted - version: "0.9.1" + version: "0.9.2" flutter_localizations: dependency: "direct main" description: flutter @@ -400,7 +407,7 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.4" flutter_redux: dependency: "direct main" description: @@ -414,7 +421,7 @@ packages: name: flutter_slidable url: "https://pub.dartlang.org" source: hosted - version: "0.6.0" + version: "1.1.0" flutter_styled_toast: dependency: "direct main" description: @@ -447,7 +454,7 @@ packages: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -459,42 +466,42 @@ packages: name: glob url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" google_sign_in: dependency: "direct main" description: name: google_sign_in url: "https://pub.dartlang.org" source: hosted - version: "5.0.7" + version: "5.2.1" google_sign_in_platform_interface: dependency: transitive description: name: google_sign_in_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.1.0" google_sign_in_web: dependency: transitive description: name: google_sign_in_web url: "https://pub.dartlang.org" source: hosted - version: "0.10.0+1" + version: "0.10.0+3" graphs: dependency: transitive description: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" http: dependency: "direct main" description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.3" + version: "0.13.4" http_multi_server: dependency: transitive description: @@ -522,21 +529,21 @@ packages: name: image_picker url: "https://pub.dartlang.org" source: hosted - version: "0.8.3+1" + version: "0.8.4+4" image_picker_for_web: dependency: transitive description: name: image_picker_for_web url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.4" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.4.1" import_sorter: dependency: "direct dev" description: @@ -578,7 +585,7 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.3.0" linkify: dependency: transitive description: @@ -592,7 +599,7 @@ packages: name: local_auth url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.1.8" logging: dependency: transitive description: @@ -620,7 +627,7 @@ packages: name: material_design_icons_flutter url: "https://pub.dartlang.org" source: hosted - version: "4.0.5955" + version: "5.0.6295" memoize: dependency: "direct main" description: @@ -641,14 +648,14 @@ packages: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" msix: dependency: "direct dev" description: name: msix url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "2.6.2" native_pdf_renderer: dependency: transitive description: @@ -690,7 +697,7 @@ packages: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" package_info: dependency: "direct main" description: @@ -704,7 +711,7 @@ packages: name: package_info_plus url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.3.0" package_info_plus_linux: dependency: transitive description: @@ -718,7 +725,7 @@ packages: name: package_info_plus_macos url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "1.3.0" package_info_plus_platform_interface: dependency: transitive description: @@ -732,14 +739,14 @@ packages: name: package_info_plus_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" package_info_plus_windows: dependency: transitive description: name: package_info_plus_windows url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" path: dependency: transitive description: @@ -753,21 +760,35 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.7" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.7" + path_provider_ios: + dependency: transitive + description: + name: path_provider_ios + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.7" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.1.2" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" path_provider_platform_interface: dependency: transitive description: @@ -781,7 +802,7 @@ packages: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" pedantic: dependency: transitive description: @@ -795,21 +816,21 @@ packages: name: permission_handler url: "https://pub.dartlang.org" source: hosted - version: "8.1.4+2" + version: "8.3.0" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "3.6.1" + version: "3.7.0" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.4.0" photo_view: dependency: transitive description: @@ -830,7 +851,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" pointer_interceptor: dependency: "direct main" description: @@ -858,14 +879,14 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" qr: dependency: transitive description: @@ -886,7 +907,7 @@ packages: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.1+1" redux: dependency: transitive description: @@ -907,28 +928,28 @@ packages: name: rounded_loading_button url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.9" rxdart: dependency: transitive description: name: rxdart url: "https://pub.dartlang.org" source: hosted - version: "0.26.0" + version: "0.27.2" sentry: dependency: transitive description: name: sentry url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "6.1.2" sentry_flutter: dependency: "direct main" description: name: sentry_flutter url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "6.1.2" share: dependency: "direct main" description: @@ -942,14 +963,14 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.8" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shared_preferences_macos: dependency: transitive description: @@ -970,14 +991,14 @@ packages: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shelf: dependency: transitive description: @@ -1017,7 +1038,7 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.1.1" source_map_stack_trace: dependency: transitive description: @@ -1045,14 +1066,14 @@ packages: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "2.0.0+3" + version: "2.0.0+4" sqflite_common: dependency: transitive description: name: sqflite_common url: "https://pub.dartlang.org" source: hosted - version: "2.0.0+2" + version: "2.0.1+1" stack_trace: dependency: transitive description: @@ -1171,21 +1192,21 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.9" + version: "6.0.13" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" url_launcher_platform_interface: dependency: transitive description: @@ -1199,14 +1220,14 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.4" url_launcher_windows: dependency: transitive description: name: url_launcher_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" uuid: dependency: transitive description: @@ -1248,7 +1269,7 @@ packages: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" web_socket_channel: dependency: transitive description: @@ -1276,14 +1297,35 @@ packages: name: webview_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.0.10" + version: "2.3.1" + webview_flutter_android: + dependency: transitive + description: + name: webview_flutter_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" + webview_flutter_platform_interface: + dependency: transitive + description: + name: webview_flutter_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.0" + webview_flutter_wkwebview: + dependency: transitive + description: + name: webview_flutter_wkwebview + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.0" win32: dependency: transitive description: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.2.5" + version: "2.3.0" xdg_directories: dependency: transitive description: @@ -1297,7 +1339,7 @@ packages: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.1.2" + version: "5.3.1" yaml: dependency: transitive description: @@ -1306,5 +1348,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.13.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=2.5.0" diff --git a/pubspec.yaml b/pubspec.yaml index bf26ca14b..c7b8d3eff 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,21 +26,21 @@ dependencies: http: ^0.13.3 path_provider: ^2.0.2 shared_preferences: ^2.0.6 - material_design_icons_flutter: ^4.0.5345 + material_design_icons_flutter: ^5.0.6295 built_value: ^8.1.2 built_collection: ^5.1.0 memoize: ^3.0.0 - cached_network_image: 3.0.0 # imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, + cached_network_image: ^3.1.0+1 # imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet, url_launcher: ^6.0.9 share: ^2.0.4 intl: ^0.17.0 - flutter_slidable: ^0.6.0 + flutter_slidable: ^1.1.0 charts_flutter: ^0.12.0 qr_flutter: ^4.0.0 local_auth: ^1.1.6 - sentry_flutter: ^5.1.0 + sentry_flutter: ^6.1.2 image_picker: ^0.8.3+1 - flutter_colorpicker: ^0.5.0 + flutter_colorpicker: ^1.0.2 flutter_json_viewer: ^1.0.1 webview_flutter: ^2.0.10 timeago: ^3.1.0 @@ -56,13 +56,12 @@ dependencies: overflow_view: ^0.3.1 flutter_styled_toast: ^2.0.0 permission_handler: ^8.1.4+2 - file_picker: ^3.0.4 + file_picker: ^4.2.3 draggable_scrollbar: ^0.1.0 boardview: ^0.2.2 pointer_interceptor: ^0.9.0 contacts_service: ^0.6.1 super_editor: ^0.1.0 - filepicker_windows: ^2.0.0 # quick_actions: ^0.2.1 # idb_shim: ^1.11.1+1 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index dc8d1ee91..106171ae6 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -8,13 +8,13 @@ #include #include -#include +#include void RegisterPlugins(flutter::PluginRegistry* registry) { NativePdfRendererPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("NativePdfRendererPlugin")); SentryFlutterPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("SentryFlutterPlugin")); - UrlLauncherPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("UrlLauncherPlugin")); + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); }