From fe27f86403b2f4efdf5622f1be33d123c2b714e4 Mon Sep 17 00:00:00 2001
From: Ian Hickson <ian@hixie.ch>
Date: Sat, 23 Sep 2017 00:00:46 -0700
Subject: [PATCH] Clean up the file names in the painting/ library (#12217)

After all my recent refactorings, some of the names were not really reasonable any more.
---
 packages/flutter/lib/painting.dart                     | 10 +++++-----
 .../lib/src/painting/{border.dart => borders.dart}     |  0
 .../painting/{box_painter.dart => box_decoration.dart} |  4 ++--
 .../lib/src/painting/{utils.dart => geometry.dart}     |  6 +++---
 .../lib/src/painting/{image.dart => images.dart}       |  2 +-
 .../painting/{transforms.dart => matrix_utils.dart}    |  0
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename packages/flutter/lib/src/painting/{border.dart => borders.dart} (100%)
 rename packages/flutter/lib/src/painting/{box_painter.dart => box_decoration.dart} (99%)
 rename packages/flutter/lib/src/painting/{utils.dart => geometry.dart} (89%)
 rename packages/flutter/lib/src/painting/{image.dart => images.dart} (99%)
 rename packages/flutter/lib/src/painting/{transforms.dart => matrix_utils.dart} (100%)

diff --git a/packages/flutter/lib/painting.dart b/packages/flutter/lib/painting.dart
index 506279c2bf..c74b7dc8f7 100644
--- a/packages/flutter/lib/painting.dart
+++ b/packages/flutter/lib/painting.dart
@@ -18,20 +18,20 @@
 library painting;
 
 export 'src/painting/basic_types.dart';
-export 'src/painting/border.dart';
 export 'src/painting/border_radius.dart';
+export 'src/painting/borders.dart';
+export 'src/painting/box_decoration.dart';
 export 'src/painting/box_fit.dart';
-export 'src/painting/box_painter.dart';
 export 'src/painting/box_shadow.dart';
 export 'src/painting/colors.dart';
 export 'src/painting/decoration.dart';
 export 'src/painting/edge_insets.dart';
 export 'src/painting/flutter_logo.dart';
 export 'src/painting/fractional_offset.dart';
+export 'src/painting/geometry.dart';
 export 'src/painting/gradient.dart';
-export 'src/painting/image.dart';
+export 'src/painting/images.dart';
+export 'src/painting/matrix_utils.dart';
 export 'src/painting/text_painter.dart';
 export 'src/painting/text_span.dart';
 export 'src/painting/text_style.dart';
-export 'src/painting/transforms.dart';
-export 'src/painting/utils.dart';
diff --git a/packages/flutter/lib/src/painting/border.dart b/packages/flutter/lib/src/painting/borders.dart
similarity index 100%
rename from packages/flutter/lib/src/painting/border.dart
rename to packages/flutter/lib/src/painting/borders.dart
diff --git a/packages/flutter/lib/src/painting/box_painter.dart b/packages/flutter/lib/src/painting/box_decoration.dart
similarity index 99%
rename from packages/flutter/lib/src/painting/box_painter.dart
rename to packages/flutter/lib/src/painting/box_decoration.dart
index cbfa46f97e..7c400a9e01 100644
--- a/packages/flutter/lib/src/painting/box_painter.dart
+++ b/packages/flutter/lib/src/painting/box_decoration.dart
@@ -9,13 +9,13 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
 import 'basic_types.dart';
-import 'border.dart';
 import 'border_radius.dart';
+import 'borders.dart';
 import 'box_shadow.dart';
 import 'decoration.dart';
 import 'edge_insets.dart';
 import 'gradient.dart';
-import 'image.dart';
+import 'images.dart';
 
 /// An immutable description of how to paint a box.
 ///
diff --git a/packages/flutter/lib/src/painting/utils.dart b/packages/flutter/lib/src/painting/geometry.dart
similarity index 89%
rename from packages/flutter/lib/src/painting/utils.dart
rename to packages/flutter/lib/src/painting/geometry.dart
index f8e9ceebe8..99a126f9f1 100644
--- a/packages/flutter/lib/src/painting/utils.dart
+++ b/packages/flutter/lib/src/painting/geometry.dart
@@ -10,11 +10,11 @@ import 'basic_types.dart';
 
 const double _kScreenEdgeMargin = 10.0;
 
-/// Position a box either above or bellow a target box specified in the global
+/// Position a box either above or below a target box specified in the global
 /// coordinate system.
 ///
-/// The target box is specified by [size] and [target] and the box being
-/// positioned is specified by [childSize]. [verticalOffset] is the amount of
+/// The target box is specified by `size` and `target` and the box being
+/// positioned is specified by `childSize`. `verticalOffset` is the amount of
 /// vertical distance between the boxes.
 ///
 /// Used by [Tooltip] to position a tooltip relative to its parent.
diff --git a/packages/flutter/lib/src/painting/image.dart b/packages/flutter/lib/src/painting/images.dart
similarity index 99%
rename from packages/flutter/lib/src/painting/image.dart
rename to packages/flutter/lib/src/painting/images.dart
index 04c2bef525..8c8cabb867 100644
--- a/packages/flutter/lib/src/painting/image.dart
+++ b/packages/flutter/lib/src/painting/images.dart
@@ -8,7 +8,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
 import 'basic_types.dart';
-import 'border.dart';
+import 'borders.dart';
 import 'box_fit.dart';
 import 'fractional_offset.dart';
 
diff --git a/packages/flutter/lib/src/painting/transforms.dart b/packages/flutter/lib/src/painting/matrix_utils.dart
similarity index 100%
rename from packages/flutter/lib/src/painting/transforms.dart
rename to packages/flutter/lib/src/painting/matrix_utils.dart