firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move FlutterLogo from material to widget (#155864)

Browse Source 
The PR is moving FlutterLogo from `lib/src/material` to `lib/src/widgets` because it has no dependency on Material.

Issue: https://github.com/flutter/flutter/issues/154448

PS: There is [older PR](https://github.com/flutter/flutter/pull/154711) for this issue and I don't know the policy on conflicting PRs. Let me know if I need to drop mine.
This commit is contained in:
Denis Gordin 2024-09-30 13:19:25 -04:00 committed by GitHub
parent 84f65686d9
commit 31d6b35b7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/integration_tests/flutter_gallery/lib/demo/cupertino/cupertino_segmented_control_demo.dart
View File

@ -3,7 +3,6 @@
// found in the LICENSE file.
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import '../../gallery/demo.dart';

1
examples/api/lib/cupertino/context_menu/cupertino_context_menu.0.dart
View File

@ -3,7 +3,6 @@
// found in the LICENSE file.
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
/// Flutter code sample for [CupertinoContextMenu].

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

@ -3,7 +3,6 @@
// found in the LICENSE file.
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
/// Flutter code sample for [CupertinoContextMenu].

1
packages/flutter/lib/material.dart
View File

@ -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';

6
packages/flutter/lib/src/material/flutter_logo.dart → packages/flutter/lib/src/widgets/flutter_logo.dart
View File

@ -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.

1
packages/flutter/lib/widgets.dart
View File

@ -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';

2
packages/flutter/test/material/flutter_logo_test.dart → packages/flutter/test/widgets/flutter_logo_test.dart
View File

@ -7,7 +7,7 @@
@Tags(<String>['reduced-test-set'])
library;
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {