From 2f5f621adc5d93ddf7d3383ce552a676fe31188d Mon Sep 17 00:00:00 2001 From: David PHAM-VAN Date: Wed, 3 May 2023 08:36:15 -0300 Subject: [PATCH] Add compatibility with Flutter 3.10 --- Makefile | 7 + demo/pubspec.yaml | 2 +- pdf/pubspec.yaml | 2 +- printing/CHANGELOG.md | 1 + printing/example/pubspec.yaml | 2 +- printing/lib/printing.dart | 3 +- printing/lib/src/raster.dart | 2 +- printing/pubspec.yaml | 5 +- test/pubspec.yaml | 2 +- widget_wrapper/.gitignore | 30 +++ widget_wrapper/CHANGELOG.md | 5 + widget_wrapper/LICENSE | 174 ++++++++++++++++++ widget_wrapper/README.md | 3 + widget_wrapper/analysis_options.yaml | 37 ++++ widget_wrapper/lib/pdf_widget_wrapper.dart | 1 + .../lib/src/widget_wrapper.dart | 4 +- widget_wrapper/pubspec.yaml | 27 +++ 17 files changed, 299 insertions(+), 8 deletions(-) create mode 100644 widget_wrapper/.gitignore create mode 100644 widget_wrapper/CHANGELOG.md create mode 100644 widget_wrapper/LICENSE create mode 100644 widget_wrapper/README.md create mode 100644 widget_wrapper/analysis_options.yaml create mode 100644 widget_wrapper/lib/pdf_widget_wrapper.dart rename {printing => widget_wrapper}/lib/src/widget_wrapper.dart (99%) create mode 100644 widget_wrapper/pubspec.yaml diff --git a/Makefile b/Makefile index 4b1f9df5..5dd8741a 100644 --- a/Makefile +++ b/Makefile @@ -137,6 +137,13 @@ publish-printing: format clean find printing -name pubspec.yaml -exec sed -i -e 's/^_dependency_overrides:/dependency_overrides:/g' '{}' ';' git tag $(shell grep version printing/pubspec.yaml | sed 's/version\s*:\s*/printing-/g') +publish-wrapper: format clean + test -z "$(shell git status --porcelain)" + find widget_wrapper -name pubspec.yaml -exec sed -i -e 's/^dependency_overrides:/_dependency_overrides:/g' '{}' ';' + cd widget_wrapper; $(DART_BIN) pub publish -f + find widget_wrapper -name pubspec.yaml -exec sed -i -e 's/^_dependency_overrides:/dependency_overrides:/g' '{}' ';' + git tag $(shell grep version widget_wrapper/pubspec.yaml | sed 's/version\s*:\s*/wrapper-/g') + .pana: which pana || $(DART_BIN) pub global activate pana touch $@ diff --git a/demo/pubspec.yaml b/demo/pubspec.yaml index ead1406f..d676a34d 100644 --- a/demo/pubspec.yaml +++ b/demo/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 1.0.0+1 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" flutter: ">=1.16.0" dependencies: diff --git a/pdf/pubspec.yaml b/pdf/pubspec.yaml index 56094f21..addf9f47 100644 --- a/pdf/pubspec.yaml +++ b/pdf/pubspec.yaml @@ -9,7 +9,7 @@ screenshots: version: 3.10.2 environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=2.18.0 <4.0.0" dependencies: archive: ^3.1.0 diff --git a/printing/CHANGELOG.md b/printing/CHANGELOG.md index dc9a0c4a..99522984 100644 --- a/printing/CHANGELOG.md +++ b/printing/CHANGELOG.md @@ -7,6 +7,7 @@ - Fix raster crash on iOS and MacOS [Eduardo Vital Alencar Cunha] - Fix wrong format in directPrintPdf [] - Add compatibility with Android Gradle Plugin 8.0 [asaarnak] +- Add compatibility with Flutter 3.10 ## 5.10.3 diff --git a/printing/example/pubspec.yaml b/printing/example/pubspec.yaml index 6ea6e9e8..7e016287 100644 --- a/printing/example/pubspec.yaml +++ b/printing/example/pubspec.yaml @@ -4,7 +4,7 @@ description: Pdf Printing Example version: 1.0.0+1 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" dependencies: flutter: diff --git a/printing/lib/printing.dart b/printing/lib/printing.dart index 00cb7393..1dc67269 100644 --- a/printing/lib/printing.dart +++ b/printing/lib/printing.dart @@ -18,6 +18,8 @@ import 'package:pdf/widgets.dart'; import 'src/fonts/gfonts.dart'; +export 'package:pdf_widget_wrapper/pdf_widget_wrapper.dart'; + export 'src/asset_utils.dart'; export 'src/cache.dart'; export 'src/callback.dart'; @@ -28,7 +30,6 @@ export 'src/printer.dart'; export 'src/printing.dart'; export 'src/printing_info.dart'; export 'src/raster.dart'; -export 'src/widget_wrapper.dart'; Future pdfDefaultTheme() async { if (ThemeData.buildThemeData != null) { diff --git a/printing/lib/src/raster.dart b/printing/lib/src/raster.dart index 60ea9584..7a92f1f4 100644 --- a/printing/lib/src/raster.dart +++ b/printing/lib/src/raster.dart @@ -70,7 +70,7 @@ class PdfRasterImage extends ImageProvider { return OneFrameImageStreamCompleter(_loadAsync()); } - // Flutter 3.9 + // Flutter 3.10 // @override // ImageStreamCompleter loadImage(PdfRaster key, ImageDecoderCallback decode) { // return OneFrameImageStreamCompleter(_loadAsync()); diff --git a/printing/pubspec.yaml b/printing/pubspec.yaml index ec417008..3de3b0f1 100644 --- a/printing/pubspec.yaml +++ b/printing/pubspec.yaml @@ -12,7 +12,7 @@ screenshots: version: 5.10.4 environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=2.18.0 <4.0.0" flutter: ">=3.7.0" dependencies: @@ -26,6 +26,7 @@ dependencies: js: ^0.6.3 meta: ">=1.3.0 <2.0.0" pdf: ^3.10.0 + pdf_widget_wrapper: '>=1.0.0 <2.0.0' plugin_platform_interface: ^2.1.0 dev_dependencies: @@ -37,6 +38,8 @@ dev_dependencies: dependency_overrides: pdf: path: ../pdf + pdf_widget_wrapper: + path: ../widget_wrapper flutter: plugin: diff --git a/test/pubspec.yaml b/test/pubspec.yaml index 764d99b1..26948e32 100644 --- a/test/pubspec.yaml +++ b/test/pubspec.yaml @@ -6,7 +6,7 @@ issue_tracker: https://github.com/DavBfr/dart_pdf/issues version: 1.0.0 environment: - sdk: ">=2.18.0 <3.0.0" + sdk: ">=2.18.0 <4.0.0" flutter: ">=3.7.0" dependencies: diff --git a/widget_wrapper/.gitignore b/widget_wrapper/.gitignore new file mode 100644 index 00000000..96486fd9 --- /dev/null +++ b/widget_wrapper/.gitignore @@ -0,0 +1,30 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +.packages +build/ diff --git a/widget_wrapper/CHANGELOG.md b/widget_wrapper/CHANGELOG.md new file mode 100644 index 00000000..4161d300 --- /dev/null +++ b/widget_wrapper/CHANGELOG.md @@ -0,0 +1,5 @@ +# Changelog + +## 1.0.0 + +- Initial release. diff --git a/widget_wrapper/LICENSE b/widget_wrapper/LICENSE new file mode 100644 index 00000000..dd5b3a58 --- /dev/null +++ b/widget_wrapper/LICENSE @@ -0,0 +1,174 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. diff --git a/widget_wrapper/README.md b/widget_wrapper/README.md new file mode 100644 index 00000000..fdecbe46 --- /dev/null +++ b/widget_wrapper/README.md @@ -0,0 +1,3 @@ +# pdf_widget_wrapper + +Plugin that allows embedding of Flutter Widgets into a PDF document. diff --git a/widget_wrapper/analysis_options.yaml b/widget_wrapper/analysis_options.yaml new file mode 100644 index 00000000..b6fba82c --- /dev/null +++ b/widget_wrapper/analysis_options.yaml @@ -0,0 +1,37 @@ +include: package:flutter_lints/flutter.yaml + +analyzer: + errors: + missing_required_param: warning + missing_return: warning + public_member_api_docs: ignore + todo: ignore + +linter: + rules: + - always_put_control_body_on_new_line + - avoid_bool_literals_in_conditional_expressions + - avoid_classes_with_only_static_members + - avoid_field_initializers_in_const_classes + - avoid_slow_async_io + - avoid_unused_constructor_parameters + - avoid_void_async + - cancel_subscriptions + - directives_ordering + - flutter_style_todos + - no_adjacent_strings_in_list + - omit_local_variable_types + - package_api_docs + - prefer_asserts_in_initializer_lists + - prefer_final_locals + - prefer_foreach + - prefer_if_elements_to_conditional_expressions + - prefer_relative_imports + - prefer_single_quotes + - public_member_api_docs + - sort_constructors_first + - sort_pub_dependencies + - sort_unnamed_constructors_first + - test_types_in_equals + - throw_in_finally + - unnecessary_statements diff --git a/widget_wrapper/lib/pdf_widget_wrapper.dart b/widget_wrapper/lib/pdf_widget_wrapper.dart new file mode 100644 index 00000000..894729f2 --- /dev/null +++ b/widget_wrapper/lib/pdf_widget_wrapper.dart @@ -0,0 +1 @@ +export 'src/widget_wrapper.dart'; diff --git a/printing/lib/src/widget_wrapper.dart b/widget_wrapper/lib/src/widget_wrapper.dart similarity index 99% rename from printing/lib/src/widget_wrapper.dart rename to widget_wrapper/lib/src/widget_wrapper.dart index f3d2ce4d..0046d50a 100644 --- a/printing/lib/src/widget_wrapper.dart +++ b/widget_wrapper/lib/src/widget_wrapper.dart @@ -164,7 +164,7 @@ class WidgetWrapper extends pw.ImageProvider { } final repaintBoundary = RenderRepaintBoundary(); - // Flutter 3.9 + // Flutter 3.10 // final view = View.of(context); final view = WidgetsBinding.instance.window; @@ -175,6 +175,8 @@ class WidgetWrapper extends pw.ImageProvider { size: Size(computedConstraints.maxWidth, computedConstraints.maxHeight), devicePixelRatio: view.devicePixelRatio), + // Flutter 3.10 + // view: view, window: view, ); diff --git a/widget_wrapper/pubspec.yaml b/widget_wrapper/pubspec.yaml new file mode 100644 index 00000000..22a0f0a0 --- /dev/null +++ b/widget_wrapper/pubspec.yaml @@ -0,0 +1,27 @@ +name: pdf_widget_wrapper +description: > + Plugin that allows embedding of Flutter Widgets into a PDF document. +homepage: https://github.com/DavBfr/dart_pdf/tree/master/widget_wrapper +repository: https://github.com/DavBfr/dart_pdf +issue_tracker: https://github.com/DavBfr/dart_pdf/issues +version: 1.0.0 + +environment: + sdk: ">=2.18.0 <4.0.0" + flutter: ">=3.7.0 <3.10.0" + +dependencies: + flutter: + sdk: flutter + pdf: ^3.10.0 + +dependency_overrides: + pdf: + path: ../pdf + +dev_dependencies: + flutter_lints: ^2.0.0 + flutter_test: + sdk: flutter + +flutter: