Skip to content

Commit 31d6b35

Browse files
authored
Move FlutterLogo from material to widget (#155864)
The PR is moving FlutterLogo from `lib/src/material` to `lib/src/widgets` because it has no dependency on Material. Issue: flutter/flutter#154448 PS: There is [older PR](flutter/flutter#154711) for this issue and I don't know the policy on conflicting PRs. Let me know if I need to drop mine.
1 parent 84f6568 commit 31d6b35

File tree

7 files changed

+7
-6
lines changed

7 files changed

+7
-6
lines changed

dev/integration_tests/flutter_gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// found in the LICENSE file.
44

55
import 'package:flutter/cupertino.dart';
6-
import 'package:flutter/material.dart';
76

87
import '../../gallery/demo.dart';
98

examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// found in the LICENSE file.
44

55
import 'package:flutter/cupertino.dart';
6-
import 'package:flutter/material.dart';
76

87
/// Flutter code sample for [CupertinoContextMenu].
98

examples/api/lib/cupertino/context_menu/cupertino_context_menu.1.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// found in the LICENSE file.
44

55
import 'package:flutter/cupertino.dart';
6-
import 'package:flutter/material.dart';
76

87
/// Flutter code sample for [CupertinoContextMenu].
98

packages/flutter/lib/material.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ export 'src/material/flexible_space_bar.dart';
9292
export 'src/material/floating_action_button.dart';
9393
export 'src/material/floating_action_button_location.dart';
9494
export 'src/material/floating_action_button_theme.dart';
95-
export 'src/material/flutter_logo.dart';
9695
export 'src/material/grid_tile.dart';
9796
export 'src/material/grid_tile_bar.dart';
9897
export 'src/material/icon_button.dart';

packages/flutter/lib/src/material/flutter_logo.dart renamed to packages/flutter/lib/src/widgets/flutter_logo.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/widgets.dart';
5+
import 'basic.dart';
6+
import 'framework.dart';
7+
import 'icon_theme.dart';
8+
import 'icon_theme_data.dart';
9+
import 'implicit_animations.dart';
610

711
/// The Flutter logo, in widget form. This widget respects the [IconTheme].
812
/// For guidelines on using the Flutter logo, visit https://flutter.dev/brand.

packages/flutter/lib/widgets.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export 'src/widgets/dual_transition_builder.dart';
5252
export 'src/widgets/editable_text.dart';
5353
export 'src/widgets/fade_in_image.dart';
5454
export 'src/widgets/feedback.dart';
55+
export 'src/widgets/flutter_logo.dart';
5556
export 'src/widgets/focus_manager.dart';
5657
export 'src/widgets/focus_scope.dart';
5758
export 'src/widgets/focus_traversal.dart';

packages/flutter/test/material/flutter_logo_test.dart renamed to packages/flutter/test/widgets/flutter_logo_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@Tags(<String>['reduced-test-set'])
88
library;
99

10-
import 'package:flutter/material.dart';
10+
import 'package:flutter/widgets.dart';
1111
import 'package:flutter_test/flutter_test.dart';
1212

1313
void main() {

0 commit comments

Comments
 (0)