replaced custom rect in favor of Rectangle from dart:math

Author: benni-tec

packages/tiled/lib/src/common/color.dart

@@ -1,4 +1,4 @@
-import 'package:color_models/color_models.dart';
+part of tiled;
 
 const _mask = 0xff;
 int _sub(int hex, int index) => (hex & (_mask << index * 8)) >> index * 8;

packages/tiled/lib/src/common/rect.dart

@@ -27,7 +27,7 @@ class Tile {
   List<int?> terrain;
 
   TiledImage? image;
-  Rect? imageRect;
+  Rectangle? imageRect;
   Layer? objectGroup;
   List<Frame> animation;
   CustomProperties properties;
@@ -66,7 +66,7 @@ class Tile {
                   .toList() ??
               [],
           image: parser.getSingleChildOrNullAs('image', TiledImage.parse),
-          imageRect: Rect.fromLTWH(
+          imageRect: Rectangle(
             parser.getDoubleOrNull('x') ?? 0,
             parser.getDoubleOrNull('y') ?? 0,
             parser.getDoubleOrNull('width') ?? 0,

packages/tiled/lib/src/tileset/tile.dart

@@ -230,7 +230,7 @@ class Tileset {
     final tiles = <Tile>[];
 
     for (var i = 0; i < tileCount; ++i) {
-      Rect? imageRect;
+      Rectangle? imageRect;
 
       if (columns != null &&
           columns != 0 &&
@@ -239,7 +239,7 @@ class Tileset {
         final x = (i % columns) * tileWidth;
         final y = i ~/ columns * tileHeight;
 
-        imageRect = Rect.fromLTWH(
+        imageRect = Rectangle(
           x.toDouble(),
           y.toDouble(),
           tileWidth.toDouble(),

packages/tiled/lib/src/tileset/tileset.dart

@@ -9,8 +9,6 @@ import 'package:archive/archive.dart';
 import 'package:collection/collection.dart';
 import 'package:color_models/color_models.dart';
 import 'package:meta/meta.dart';
-import 'package:tiled/src/common/color.dart';
-import 'package:tiled/src/common/rect.dart';
 import 'package:xml/xml.dart';
 
 part 'src/chunk.dart';
@@ -21,6 +19,7 @@ part 'src/common/gid.dart';
 part 'src/common/point.dart';
 part 'src/common/property.dart';
 part 'src/common/tiled_image.dart';
+part 'src/common/color.dart';
 part 'src/editor_setting/chunk_size.dart';
 part 'src/editor_setting/editor_setting.dart';
 part 'src/editor_setting/export.dart';

packages/tiled/lib/tiled.dart

@@ -1,5 +1,5 @@
 name: tiled
-version: 0.10.1
+version: 0.11.0
 description: A Dart Tiled library. Parse your TMX files into useful representations. Compatible with Flame.
 homepage: https://github.com/flame-engine/tiled.dart
 

packages/tiled/pubspec.yaml

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:test/test.dart';
-import 'package:tiled/src/common/color.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {

packages/tiled/test/layer_test.dart

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:test/test.dart';
-import 'package:tiled/src/common/color.dart';
 import 'package:tiled/tiled.dart';
 
 void main() {

packages/tiled/test/object_group_test.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 import 'dart:math' show Rectangle;
 
 import 'package:test/test.dart';
-import 'package:tiled/src/common/color.dart';
 import 'package:tiled/tiled.dart';
 import 'package:xml/xml.dart';
 

packages/tiled/test/parser_test.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
+import 'dart:math';
 
 import 'package:test/test.dart';
-import 'package:tiled/src/common/rect.dart';
 import 'package:tiled/tiled.dart';
 import 'package:xml/xml.dart';
 
@@ -58,8 +58,8 @@ void main() {
         final tile1 = tileset1.tiles.firstWhere((t) => t.localId == 0);
         final tile2 = tileset1.tiles.firstWhere((t) => t.localId == 1);
 
-        expect(tile1.imageRect, Rect.fromLTWH(64, 96, 32, 32));
-        expect(tile2.imageRect, Rect.fromLTWH(0, 0, 20, 20));
+        expect(tile1.imageRect, Rectangle(64, 96, 32, 32));
+        expect(tile2.imageRect, Rectangle(0, 0, 20, 20));
       });
 
       test(
@@ -70,10 +70,10 @@ void main() {
           final tile3 = tileset2.tiles.firstWhere((t) => t.localId == 129);
           final tile4 = tileset2.tiles.firstWhere((t) => t.localId == 11);
 
-          expect(tile1.imageRect, Rect.fromLTWH(112, 48, 16, 16));
-          expect(tile2.imageRect, Rect.fromLTWH(64, 96, 16, 16));
-          expect(tile3.imageRect, Rect.fromLTWH(160, 112, 16, 16));
-          expect(tile4.imageRect, Rect.fromLTWH(176, 0, 16, 16));
+          expect(tile1.imageRect, Rectangle(112, 48, 16, 16));
+          expect(tile2.imageRect, Rectangle(64, 96, 16, 16));
+          expect(tile3.imageRect, Rectangle(160, 112, 16, 16));
+          expect(tile4.imageRect, Rectangle(176, 0, 16, 16));
         },
       );
     },