Skip to content

Commit ed587e6

Browse files
More material docImports (#152144)
flutter/flutter#150800. After applying the patch: ``` Can not fully resolve ../../flutter/packages/flutter/lib/src/material/material_state.dart: (MaterialState.pressed, MaterialState.focused, MaterialState.hovered, ..., value, update) Can not fully resolve ../../flutter/packages/flutter/lib/src/material/material_state_mixin.dart: (MaterialStateProperty.resolve, MaterialState.disabled, MaterialState.dragged, ..., MaterialState.scrolledUnder, MaterialState.selected) Can not fully resolve ../../flutter/packages/flutter/lib/src/material/reorderable_list.dart: (TargetPlatformVariant.desktop, TargetPlatformVariant.mobile) Can not fully resolve ../../flutter/packages/flutter/lib/src/material/app.dart: (GlobalMaterialLocalizations) Can not fully resolve ../../flutter/packages/flutter/lib/src/material/material_localizations.dart: (GlobalMaterialLocalizations) 57 out-of-scope references in 5 files, 22 unique symbols were left unresolved. ``` I'm going to leave `material_state` stuff alone because of flutter/flutter#150800 (comment), `TargetPlatformVariant.desktop` requires `flutter_test` and `GlobalMaterialLocalizations` requires `package:flutter_localizations/flutter_localizations.dart`.
1 parent 660694c commit ed587e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+315
-40
lines changed

packages/flutter/lib/src/material/about.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ typedef _MasterViewBuilder = Widget Function(BuildContext context, bool isLatera
10161016
/// sheet in the lateral UI. Otherwise, it is null.
10171017
typedef _DetailPageBuilder = Widget Function(BuildContext context, Object? arguments, ScrollController? scrollController);
10181018

1019-
/// Signature for the builder callback used by [_MasterDetailFlow.actionBuilder].
1019+
/// Signature for the builder callback used by [_MasterDetailScaffold.actionBuilder].
10201020
///
10211021
/// Builds the actions that go in the app bars constructed for the master and
10221022
/// lateral UI pages. actionLevel indicates the intended destination of the
@@ -1047,7 +1047,6 @@ enum _Focus { master, detail }
10471047

10481048
/// A Master Detail Flow widget. Depending on screen width it builds either a
10491049
/// lateral or nested navigation flow between a master view and a detail page.
1050-
/// bloc pattern.
10511050
///
10521051
/// If focus is on detail view, then switching to nested navigation will
10531052
/// populate the navigation history with the master page and the detail page on
@@ -1065,7 +1064,7 @@ class _MasterDetailFlow extends StatefulWidget {
10651064

10661065
/// Builder for the master view for lateral navigation.
10671066
///
1068-
/// If [masterPageBuilder] is not supplied the master page required for nested navigation, also
1067+
/// This builder builds the master page required for nested navigation, also
10691068
/// builds the master view inside a [Scaffold] with an [AppBar].
10701069
final _MasterViewBuilder masterViewBuilder;
10711070

packages/flutter/lib/src/material/action_chip.dart

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
/// @docImport 'choice_chip.dart';
6+
/// @docImport 'circle_avatar.dart';
7+
/// @docImport 'elevated_button.dart';
8+
/// @docImport 'input_chip.dart';
9+
/// @docImport 'material.dart';
10+
/// @docImport 'outlined_button.dart';
11+
/// @docImport 'text_button.dart';
12+
library;
13+
514
import 'package:flutter/foundation.dart' show clampDouble;
615
import 'package:flutter/widgets.dart';
716

packages/flutter/lib/src/material/animated_icons.dart

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

55
/// Flutter widgets implementing Material Design animated icons.
6+
/// @docImport 'package:flutter/semantics.dart';
7+
///
8+
/// @docImport 'icons.dart';
9+
/// @docImport 'theme.dart';
610
library material_animated_icons;
711

812
import 'dart:math' as math show pi;

packages/flutter/lib/src/material/app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ class MaterialApp extends StatefulWidget {
336336
///
337337
/// When a named route is pushed with [Navigator.pushNamed], the route name is
338338
/// looked up in this map. If the name is present, the associated
339-
/// [widgets.WidgetBuilder] is used to construct a [MaterialPageRoute] that
339+
/// [WidgetBuilder] is used to construct a [MaterialPageRoute] that
340340
/// performs an appropriate transition, including [Hero] animations, to the
341341
/// new route.
342342
///

packages/flutter/lib/src/material/app_bar.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
/// @docImport 'app.dart';
6+
/// @docImport 'drawer.dart';
7+
/// @docImport 'popup_menu.dart';
8+
/// @docImport 'snack_bar.dart';
9+
/// @docImport 'text_button.dart';
10+
/// @docImport 'text_field.dart';
11+
library;
12+
513
import 'dart:math' as math;
614

715
import 'package:flutter/foundation.dart';

packages/flutter/lib/src/material/badge.dart

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

5+
/// @docImport 'icon_button.dart';
6+
/// @docImport 'navigation_rail.dart';
7+
/// @docImport 'text_button.dart';
8+
/// @docImport 'text_theme.dart';
9+
library;
10+
511
import 'dart:math' as math;
612

713
import 'package:flutter/rendering.dart';

packages/flutter/lib/src/material/banner.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +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+
/// @docImport 'dart:ui';
6+
///
7+
/// @docImport 'text_button.dart';
8+
library;
9+
510
import 'package:flutter/widgets.dart';
611

712
import 'banner_theme.dart';

packages/flutter/lib/src/material/bottom_app_bar.dart

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

5+
/// @docImport 'app_bar.dart';
6+
/// @docImport 'floating_action_button.dart';
7+
/// @docImport 'floating_action_button_location.dart';
8+
/// @docImport 'icon_button.dart';
9+
/// @docImport 'icons.dart';
10+
library;
11+
512
import 'package:flutter/foundation.dart';
613
import 'package:flutter/widgets.dart';
714

packages/flutter/lib/src/material/bottom_sheet.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
/// @docImport 'dart:ui';
6+
library;
7+
58
import 'package:flutter/gestures.dart';
69
import 'package:flutter/rendering.dart';
710
import 'package:flutter/widgets.dart';

packages/flutter/lib/src/material/button_theme.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ class ButtonThemeData with Diagnosticable {
303303
/// This property is null by default.
304304
///
305305
/// If the button is in the focused, hovering, or highlighted state, then the
306-
/// [focusColor], [hoverColor], or [highlightColor] will take precedence over
307-
/// the [buttonColor].
306+
/// `focusColor`, `hoverColor`, or `highlightColor` will take precedence over
307+
/// the `buttonColor`.
308308
///
309309
/// See also:
310310
///
@@ -325,8 +325,8 @@ class ButtonThemeData with Diagnosticable {
325325
///
326326
/// This property is null by default.
327327
///
328-
/// If the button is in the hovering or highlighted state, then the [hoverColor]
329-
/// or [highlightColor] will take precedence over the [focusColor].
328+
/// If the button is in the hovering or highlighted state, then the `hoverColor`
329+
/// or `highlightColor` will take precedence over the `focusColor`.
330330
///
331331
/// See also:
332332
///
@@ -338,8 +338,8 @@ class ButtonThemeData with Diagnosticable {
338338
///
339339
/// This property is null by default.
340340
///
341-
/// If the button is in the highlighted state, then the [highlightColor] will
342-
/// take precedence over the [hoverColor].
341+
/// If the button is in the highlighted state, then the `highlightColor` will
342+
/// take precedence over the `hoverColor`.
343343
///
344344
/// See also:
345345
///
@@ -354,7 +354,7 @@ class ButtonThemeData with Diagnosticable {
354354
/// See also:
355355
///
356356
/// * [getHighlightColor], which is used to compute the color of the overlay
357-
/// that appears when the [button] is pressed.
357+
/// that appears when the `button` is pressed.
358358
final Color? _highlightColor;
359359

360360
/// The color of the ink "splash" overlay that appears when a button is tapped.
@@ -364,7 +364,7 @@ class ButtonThemeData with Diagnosticable {
364364
/// See also:
365365
///
366366
/// * [getSplashColor], which is used to compute the color of the ink
367-
/// "splash" overlay that appears when the (enabled) [button] is tapped.
367+
/// "splash" overlay that appears when the (enabled) `button` is tapped.
368368
final Color? _splashColor;
369369

370370
/// A set of thirteen colors that can be used to derive the button theme's

0 commit comments

Comments
 (0)