From 885e96914df6e4386fbdd53cb950a53089010682 Mon Sep 17 00:00:00 2001 From: amirh Date: Thu, 4 Jan 2018 13:01:45 -0800 Subject: [PATCH] Move animated_icons into the material package (#13886) --- packages/flutter/lib/material.dart | 1 + .../material/animated_icons.dart} | 14 ++++++-------- .../animated_icons}/animated_icons.dart | 0 .../animated_icons}/animated_icons_data.dart | 0 .../animated_icons}/data/arrow_menu.g.dart | 0 .../animated_icons}/data/menu_arrow.g.dart | 0 .../animated_icons_private_test.dart | 10 +++++----- .../animated_icons_test.dart | 1 - 8 files changed, 12 insertions(+), 14 deletions(-) rename packages/flutter/lib/{material_animated_icons.dart => src/material/animated_icons.dart} (61%) rename packages/flutter/lib/src/{material_animated_icons => material/animated_icons}/animated_icons.dart (100%) rename packages/flutter/lib/src/{material_animated_icons => material/animated_icons}/animated_icons_data.dart (100%) rename packages/flutter/lib/src/{material_animated_icons => material/animated_icons}/data/arrow_menu.g.dart (100%) rename packages/flutter/lib/src/{material_animated_icons => material/animated_icons}/data/menu_arrow.g.dart (100%) rename packages/flutter/test/{material_animated_icons => material}/animated_icons_private_test.dart (97%) rename packages/flutter/test/{material_animated_icons => material}/animated_icons_test.dart (99%) diff --git a/packages/flutter/lib/material.dart b/packages/flutter/lib/material.dart index 2c4730425a..098238d55d 100644 --- a/packages/flutter/lib/material.dart +++ b/packages/flutter/lib/material.dart @@ -15,6 +15,7 @@ library material; export 'src/material/about.dart'; +export 'src/material/animated_icons.dart'; export 'src/material/app.dart'; export 'src/material/app_bar.dart'; export 'src/material/arc.dart'; diff --git a/packages/flutter/lib/material_animated_icons.dart b/packages/flutter/lib/src/material/animated_icons.dart similarity index 61% rename from packages/flutter/lib/material_animated_icons.dart rename to packages/flutter/lib/src/material/animated_icons.dart index 2bcecae344..856a640491 100644 --- a/packages/flutter/lib/material_animated_icons.dart +++ b/packages/flutter/lib/src/material/animated_icons.dart @@ -3,26 +3,24 @@ // found in the LICENSE file. /// Flutter widgets implementing Material Design animated icons. -/// -/// To use, import `package:flutter/material_animated_icons.dart`. library material_animated_icons; import 'dart:math' as math show pi; import 'dart:ui' as ui show Paint, Path, Canvas; import 'dart:ui' show lerpDouble; -import 'package:flutter/material.dart'; -import 'package:meta/meta.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; // This package is split into multiple parts to enable a private API that is // testable. // Public API. -part 'src/material_animated_icons/animated_icons.dart'; +part 'animated_icons/animated_icons.dart'; // Provides a public interface for referring to the private icon // implementations. -part 'src/material_animated_icons/animated_icons_data.dart'; +part 'animated_icons/animated_icons_data.dart'; // Animated icons data files. -part 'src/material_animated_icons/data/arrow_menu.g.dart'; -part 'src/material_animated_icons/data/menu_arrow.g.dart'; +part 'animated_icons/data/arrow_menu.g.dart'; +part 'animated_icons/data/menu_arrow.g.dart'; diff --git a/packages/flutter/lib/src/material_animated_icons/animated_icons.dart b/packages/flutter/lib/src/material/animated_icons/animated_icons.dart similarity index 100% rename from packages/flutter/lib/src/material_animated_icons/animated_icons.dart rename to packages/flutter/lib/src/material/animated_icons/animated_icons.dart diff --git a/packages/flutter/lib/src/material_animated_icons/animated_icons_data.dart b/packages/flutter/lib/src/material/animated_icons/animated_icons_data.dart similarity index 100% rename from packages/flutter/lib/src/material_animated_icons/animated_icons_data.dart rename to packages/flutter/lib/src/material/animated_icons/animated_icons_data.dart diff --git a/packages/flutter/lib/src/material_animated_icons/data/arrow_menu.g.dart b/packages/flutter/lib/src/material/animated_icons/data/arrow_menu.g.dart similarity index 100% rename from packages/flutter/lib/src/material_animated_icons/data/arrow_menu.g.dart rename to packages/flutter/lib/src/material/animated_icons/data/arrow_menu.g.dart diff --git a/packages/flutter/lib/src/material_animated_icons/data/menu_arrow.g.dart b/packages/flutter/lib/src/material/animated_icons/data/menu_arrow.g.dart similarity index 100% rename from packages/flutter/lib/src/material_animated_icons/data/menu_arrow.g.dart rename to packages/flutter/lib/src/material/animated_icons/data/menu_arrow.g.dart diff --git a/packages/flutter/test/material_animated_icons/animated_icons_private_test.dart b/packages/flutter/test/material/animated_icons_private_test.dart similarity index 97% rename from packages/flutter/test/material_animated_icons/animated_icons_private_test.dart rename to packages/flutter/test/material/animated_icons_private_test.dart index bedbbbfcfb..c880965e9a 100644 --- a/packages/flutter/test/material_animated_icons/animated_icons_private_test.dart +++ b/packages/flutter/test/material/animated_icons_private_test.dart @@ -14,15 +14,15 @@ import 'dart:ui' show lerpDouble; import 'dart:ui' as ui show Paint, Path, Canvas; import 'package:flutter/animation.dart'; -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:meta/meta.dart'; import 'package:mockito/mockito.dart'; -part 'package:flutter/src/material_animated_icons/animated_icons.dart'; -part 'package:flutter/src/material_animated_icons/animated_icons_data.dart'; -part 'package:flutter/src/material_animated_icons/data/arrow_menu.g.dart'; -part 'package:flutter/src/material_animated_icons/data/menu_arrow.g.dart'; +part 'package:flutter/src/material/animated_icons/animated_icons.dart'; +part 'package:flutter/src/material/animated_icons/animated_icons_data.dart'; +part 'package:flutter/src/material/animated_icons/data/arrow_menu.g.dart'; +part 'package:flutter/src/material/animated_icons/data/menu_arrow.g.dart'; class MockCanvas extends Mock implements ui.Canvas {} class MockPath extends Mock implements ui.Path {} diff --git a/packages/flutter/test/material_animated_icons/animated_icons_test.dart b/packages/flutter/test/material/animated_icons_test.dart similarity index 99% rename from packages/flutter/test/material_animated_icons/animated_icons_test.dart rename to packages/flutter/test/material/animated_icons_test.dart index e556bbd4cc..86b6105403 100644 --- a/packages/flutter/test/material_animated_icons/animated_icons_test.dart +++ b/packages/flutter/test/material/animated_icons_test.dart @@ -6,7 +6,6 @@ import 'dart:math' as math show pi; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter/material_animated_icons.dart'; import 'package:mockito/mockito.dart'; import '../widgets/semantics_tester.dart';