diff --git a/CHANGELOG.md b/CHANGELOG.md index 14e5ff3..e1a4ccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.1.1] + +- Supports latest Image library (4.0.17) 22/05/2023 +- Supports Flutter 3.10 + ## [1.1.0] - Null-Safety diff --git a/example/example.dart b/example/example.dart index 85c0a1c..37b74d1 100644 --- a/example/example.dart +++ b/example/example.dart @@ -1,5 +1,4 @@ import 'package:image/image.dart'; -import 'dart:typed_data'; import 'package:flutter/services.dart'; import 'package:esc_pos_utils/esc_pos_utils.dart'; diff --git a/lib/src/generator.dart b/lib/src/generator.dart index 6b464a6..c2cbb65 100644 --- a/lib/src/generator.dart +++ b/lib/src/generator.dart @@ -9,10 +9,9 @@ import 'dart:convert'; import 'dart:typed_data' show Uint8List; import 'package:hex/hex.dart'; -import 'package:image/image.dart'; +import 'package:image/image.dart' as im; import 'package:gbk_codec/gbk_codec.dart'; import 'package:esc_pos_utils/esc_pos_utils.dart'; -import 'enums.dart'; import 'commands.dart'; class Generator { @@ -136,25 +135,25 @@ class Generator { /// /// [image] Image to extract from /// [lineHeight] Printed line height in dots - List> _toColumnFormat(Image imgSrc, int lineHeight) { - final Image image = Image.from(imgSrc); // make a copy + List> _toColumnFormat(im.Image imgSrc, int lineHeight) { + final im.Image image = im.Image.from(imgSrc); // make a copy // Determine new width: closest integer that is divisible by lineHeight final int widthPx = (image.width + lineHeight) - (image.width % lineHeight); final int heightPx = image.height; // Create a black bottom layer - final biggerImage = copyResize(image, width: widthPx, height: heightPx); - fill(biggerImage, 0); + final biggerImage = im.copyResize(image, width: widthPx, height: heightPx); + im.fill(biggerImage, color: im.ColorRgb8(0, 0, 0)); // Insert source image into bigger one - drawImage(biggerImage, image, dstX: 0, dstY: 0); + im.compositeImage(biggerImage, image, dstX: 0, dstY: 0); int left = 0; final List> blobs = []; while (left < widthPx) { - final Image slice = copyCrop(biggerImage, left, 0, lineHeight, heightPx); - final Uint8List bytes = slice.getBytes(format: Format.luminance); + final im.Image slice = im.copyCrop(biggerImage, x: left, y: 0, width: lineHeight, height: heightPx); + final Uint8List bytes = slice.getBytes(order: im.ChannelOrder.grayAlpha); blobs.add(bytes); left += lineHeight; } @@ -163,17 +162,17 @@ class Generator { } /// Image rasterization - List _toRasterFormat(Image imgSrc) { - final Image image = Image.from(imgSrc); // make a copy + List _toRasterFormat(im.Image imgSrc) { + final im.Image image = im.Image.from(imgSrc); // make a copy final int widthPx = image.width; final int heightPx = image.height; - grayscale(image); - invert(image); + im.grayscale(image); + im.invert(image); // R/G/B channels are same -> keep only one channel final List oneChannelBytes = []; - final List buffer = image.getBytes(format: Format.rgba); + final List buffer = image.getBytes(order: im.ChannelOrder.rgba); for (int i = 0; i < buffer.length; i += 4) { oneChannelBytes.add(buffer[i]); } @@ -567,18 +566,18 @@ class Generator { /// Print an image using (ESC *) command /// /// [image] is an instanse of class from [Image library](https://pub.dev/packages/image) - List image(Image imgSrc, {PosAlign align = PosAlign.center}) { + List image(im.Image imgSrc, {PosAlign align = PosAlign.center}) { List bytes = []; // Image alignment bytes += setStyles(PosStyles().copyWith(align: align)); - final Image image = Image.from(imgSrc); // make a copy + final im.Image image = im.Image.from(imgSrc); // make a copy const bool highDensityHorizontal = true; const bool highDensityVertical = true; - invert(image); - flip(image, Flip.horizontal); - final Image imageRotated = copyRotate(image, 270); + im.invert(image); + im.flip(image, direction: im.FlipDirection.horizontal); + final im.Image imageRotated = im.copyRotate(image, angle: 270); const int lineHeight = highDensityVertical ? 3 : 1; final List> blobs = _toColumnFormat(imageRotated, lineHeight * 8); @@ -615,7 +614,7 @@ class Generator { /// /// [image] is an instanse of class from [Image library](https://pub.dev/packages/image) List imageRaster( - Image image, { + im.Image image, { PosAlign align = PosAlign.center, bool highDensityHorizontal = true, bool highDensityVertical = true, diff --git a/lib/src/pos_styles.dart b/lib/src/pos_styles.dart index 4b32cd7..b692313 100644 --- a/lib/src/pos_styles.dart +++ b/lib/src/pos_styles.dart @@ -24,15 +24,15 @@ class PosStyles { // Init all fields with default values const PosStyles.defaults({ - this.bold: false, - this.reverse: false, - this.underline: false, - this.turn90: false, - this.align: PosAlign.left, - this.height: PosTextSize.size1, - this.width: PosTextSize.size1, - this.fontType: PosFontType.fontA, - this.codeTable: "CP437", + this.bold = false, + this.reverse = false, + this.underline = false, + this.turn90 = false, + this.align = PosAlign.left, + this.height = PosTextSize.size1, + this.width = PosTextSize.size1, + this.fontType = PosFontType.fontA, + this.codeTable = "CP437", }); final bool bold; diff --git a/pubspec.lock b/pubspec.lock index 3447480..48717ab 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,72 +5,82 @@ packages: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" + url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.3.7" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.17.1" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.3" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.17.2" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -85,58 +95,90 @@ packages: dependency: "direct main" description: name: gbk_codec - url: "https://pub.dartlang.org" + sha256: "3af5311fc9393115e3650ae6023862adf998051a804a08fb804f042724999f61" + url: "https://pub.dev" source: hosted version: "0.4.0" hex: dependency: "direct main" description: name: hex - url: "https://pub.dartlang.org" + sha256: "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a" + url: "https://pub.dev" source: hosted version: "0.2.0" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8" + url: "https://pub.dev" source: hosted - version: "0.15.0" + version: "0.15.3" image: dependency: "direct main" description: name: image - url: "https://pub.dartlang.org" + sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf + url: "https://pub.dev" + source: hosted + version: "4.0.17" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "0.6.7" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + url: "https://pub.dev" + source: hosted + version: "0.12.15" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.9.1" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.8.3" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "5.4.0" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + url: "https://pub.dev" + source: hosted + version: "3.7.3" sky_engine: dependency: transitive description: flutter @@ -146,64 +188,73 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + url: "https://pub.dev" source: hosted - version: "0.4.3" + version: "0.5.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.2" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.4" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "6.3.0" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=3.0.1 <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 5db09d0..80afc81 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,17 +1,17 @@ name: esc_pos_utils description: Basic Flutter/Dart classes for ESC/POS printing. Ticket class generates ESC/POS commands that can be sent to a thermal printer. -version: 1.1.0 +version: 1.1.1 homepage: https://github.com/andrey-ushakov/esc_pos_utils environment: - sdk: ">=2.12.0 <3.0.0" + sdk: '>=3.0.1 <4.0.0' dependencies: flutter: sdk: flutter hex: ^0.2.0 gbk_codec: ^0.4.0 - image: ^3.0.2 + image: ^4.0.17 dev_dependencies: flutter_test: