diff --git a/dev/integration_tests/flutter_gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart b/dev/integration_tests/flutter_gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart index f8a1317846..e22106ee5d 100644 --- a/dev/integration_tests/flutter_gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart +++ b/dev/integration_tests/flutter_gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import '../../gallery/demo.dart'; diff --git a/examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart b/examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart index f20ab23a14..31fb355862 100644 --- a/examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart +++ b/examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; /// Flutter code sample for [CupertinoContextMenu]. diff --git a/examples/api/lib/cupertino/context_menu/cupertino_context_menu.1.dart b/examples/api/lib/cupertino/context_menu/cupertino_context_menu.1.dart index b54ab15412..68d9b6d347 100644 --- a/examples/api/lib/cupertino/context_menu/cupertino_context_menu.1.dart +++ b/examples/api/lib/cupertino/context_menu/cupertino_context_menu.1.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; /// Flutter code sample for [CupertinoContextMenu]. diff --git a/packages/flutter/lib/material.dart b/packages/flutter/lib/material.dart index c13d062ccb..0484fb9020 100644 --- a/packages/flutter/lib/material.dart +++ b/packages/flutter/lib/material.dart @@ -92,7 +92,6 @@ export 'src/material/flexible_space_bar.dart'; export 'src/material/floating_action_button.dart'; export 'src/material/floating_action_button_location.dart'; export 'src/material/floating_action_button_theme.dart'; -export 'src/material/flutter_logo.dart'; export 'src/material/grid_tile.dart'; export 'src/material/grid_tile_bar.dart'; export 'src/material/icon_button.dart'; diff --git a/packages/flutter/lib/src/material/flutter_logo.dart b/packages/flutter/lib/src/widgets/flutter_logo.dart similarity index 94% rename from packages/flutter/lib/src/material/flutter_logo.dart rename to packages/flutter/lib/src/widgets/flutter_logo.dart index 62f57c2451..27ec0150d8 100644 --- a/packages/flutter/lib/src/material/flutter_logo.dart +++ b/packages/flutter/lib/src/widgets/flutter_logo.dart @@ -2,7 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/widgets.dart'; +import 'basic.dart'; +import 'framework.dart'; +import 'icon_theme.dart'; +import 'icon_theme_data.dart'; +import 'implicit_animations.dart'; /// The Flutter logo, in widget form. This widget respects the [IconTheme]. /// For guidelines on using the Flutter logo, visit https://flutter.dev/brand. diff --git a/packages/flutter/lib/widgets.dart b/packages/flutter/lib/widgets.dart index c5dbf6f206..d39d7ea3a1 100644 --- a/packages/flutter/lib/widgets.dart +++ b/packages/flutter/lib/widgets.dart @@ -52,6 +52,7 @@ export 'src/widgets/dual_transition_builder.dart'; export 'src/widgets/editable_text.dart'; export 'src/widgets/fade_in_image.dart'; export 'src/widgets/feedback.dart'; +export 'src/widgets/flutter_logo.dart'; export 'src/widgets/focus_manager.dart'; export 'src/widgets/focus_scope.dart'; export 'src/widgets/focus_traversal.dart'; diff --git a/packages/flutter/test/material/flutter_logo_test.dart b/packages/flutter/test/widgets/flutter_logo_test.dart similarity index 94% rename from packages/flutter/test/material/flutter_logo_test.dart rename to packages/flutter/test/widgets/flutter_logo_test.dart index bc81c43333..088da0c801 100644 --- a/packages/flutter/test/material/flutter_logo_test.dart +++ b/packages/flutter/test/widgets/flutter_logo_test.dart @@ -7,7 +7,7 @@ @Tags(['reduced-test-set']) library; -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; void main() {