Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 73cb7c2

Browse files
moffatmanmoffatman
authored
Squashed MediaQuery InheritedModel (#114459)
1 parent e57b7f4 commit 73cb7c2

File tree

88 files changed

+687
-239
lines changed

Some content is hidden

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

88 files changed

+687
-239
lines changed

‎packages/flutter/lib/fix_data/fix_cupertino.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,17 @@
1818
# * Fixes in this file are from the Cupertino library. *
1919
version: 1
2020
transforms:
21+
# Changes made in https://github.com/flutter/flutter/pull/114459
22+
- title: "Migrate to 'boldTextOf'"
23+
date: 2022-10-28
24+
element:
25+
uris: ['widgets.dart', 'material.dart', 'cupertino.dart']
26+
method: 'boldTextOverride'
27+
inClass: 'MediaQuery'
28+
changes:
29+
- kind: 'rename'
30+
newName: 'boldTextOf'
31+
2132
# Change made in https://github.com/flutter/flutter/pull/20649
2233
# TODO(Piinks): Add tests when `bulkApply:false` testing is supported, https://github.com/dart-lang/sdk/issues/44639
2334
- title: "Replace with 'CupertinoPopupSurface'"

‎packages/flutter/lib/fix_data/fix_material/fix_material.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,17 @@
2525
# * ThemeData: fix_theme_data.yaml
2626
version: 1
2727
transforms:
28+
# Changes made in https://github.com/flutter/flutter/pull/114459
29+
- title: "Migrate to 'boldTextOf'"
30+
date: 2022-10-28
31+
element:
32+
uris: ['widgets.dart', 'material.dart', 'cupertino.dart']
33+
method: 'boldTextOverride'
34+
inClass: 'MediaQuery'
35+
changes:
36+
- kind: 'rename'
37+
newName: 'boldTextOf'
38+
2839
# Changes made in https://github.com/flutter/flutter/pull/15303
2940
- title: "Replace 'child' with 'builder'"
3041
date: 2020-12-17

‎packages/flutter/lib/fix_data/fix_widgets/fix_widgets.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@
2323
# * ListWheelScrollView: fix_list_wheel_scroll_view.yaml
2424
version: 1
2525
transforms:
26+
# Changes made in https://github.com/flutter/flutter/pull/114459
27+
- title: "Migrate to 'boldTextOf'"
28+
date: 2022-10-28
29+
element:
30+
uris: ['widgets.dart', 'material.dart', 'cupertino.dart']
31+
method: 'boldTextOverride'
32+
inClass: 'MediaQuery'
33+
changes:
34+
- kind: 'rename'
35+
newName: 'boldTextOf'
36+
2637
# Changes made in https://github.com/flutter/flutter/pull/87839
2738
- title: "Migrate to 'disallowIndicator'"
2839
date: 2021-08-06

‎packages/flutter/lib/src/cupertino/bottom_tab_bar.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class CupertinoTabBar extends StatelessWidget implements PreferredSizeWidget {
156156
@override
157157
Widget build(BuildContext context) {
158158
assert(debugCheckHasMediaQuery(context));
159-
final double bottomPadding = MediaQuery.of(context).viewPadding.bottom;
159+
final double bottomPadding = MediaQuery.viewPaddingOf(context).bottom;
160160

161161
final Color backgroundColor = CupertinoDynamicColor.resolve(
162162
this.backgroundColor ?? CupertinoTheme.of(context).barBackgroundColor,

‎packages/flutter/lib/src/cupertino/colors.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ class CupertinoDynamicColor extends Color with Diagnosticable {
994994
}
995995
bool isHighContrastEnabled = false;
996996
if (_isHighContrastDependent) {
997-
isHighContrastEnabled = MediaQuery.maybeOf(context)?.highContrast ?? false;
997+
isHighContrastEnabled = MediaQuery.maybeHighContrastOf(context) ?? false;
998998
}
999999

10001000
final CupertinoUserInterfaceLevelData level = _isInterfaceElevationDependent

‎packages/flutter/lib/src/cupertino/context_menu.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ class _CupertinoContextMenuState extends State<CupertinoContextMenu> with Ticker
493493
// it.
494494
_ContextMenuLocation get _contextMenuLocation {
495495
final Rect childRect = _getRect(_childGlobalKey);
496-
final double screenWidth = MediaQuery.of(context).size.width;
496+
final double screenWidth = MediaQuery.sizeOf(context).width;
497497

498498
final double center = screenWidth / 2;
499499
final bool centerDividesChild = childRect.left < center
@@ -1311,7 +1311,7 @@ class _ContextMenuRouteStaticState extends State<_ContextMenuRouteStatic> with T
13111311
Widget _buildChildAnimation(BuildContext context, Widget? child) {
13121312
_lastScale = _getScale(
13131313
widget.orientation,
1314-
MediaQuery.of(context).size.height,
1314+
MediaQuery.sizeOf(context).height,
13151315
_moveAnimation.value.dy,
13161316
);
13171317
return Transform.scale(

‎packages/flutter/lib/src/cupertino/desktop_text_selection.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,20 +158,20 @@ class _CupertinoDesktopTextSelectionControlsToolbarState extends State<_Cupertin
158158
}
159159

160160
assert(debugCheckHasMediaQuery(context));
161-
final MediaQueryData mediaQuery = MediaQuery.of(context);
161+
final EdgeInsets mediaQueryPadding = MediaQuery.paddingOf(context);
162162

163163
final Offset midpointAnchor = Offset(
164164
clampDouble(widget.selectionMidpoint.dx - widget.globalEditableRegion.left,
165-
mediaQuery.padding.left,
166-
mediaQuery.size.width - mediaQuery.padding.right,
165+
mediaQueryPadding.left,
166+
MediaQuery.sizeOf(context).width - mediaQueryPadding.right,
167167
),
168168
widget.selectionMidpoint.dy - widget.globalEditableRegion.top,
169169
);
170170

171171
final List<Widget> items = <Widget>[];
172172
final CupertinoLocalizations localizations = CupertinoLocalizations.of(context);
173173
final Widget onePhysicalPixelVerticalDivider =
174-
SizedBox(width: 1.0 / MediaQuery.of(context).devicePixelRatio);
174+
SizedBox(width: 1.0 / MediaQuery.devicePixelRatioOf(context));
175175

176176
void addToolbarButton(
177177
String text,

‎packages/flutter/lib/src/cupertino/desktop_text_selection_toolbar.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ class CupertinoDesktopTextSelectionToolbar extends StatelessWidget {
8585
@override
8686
Widget build(BuildContext context) {
8787
assert(debugCheckHasMediaQuery(context));
88-
final MediaQueryData mediaQuery = MediaQuery.of(context);
8988

90-
final double paddingAbove = mediaQuery.padding.top + _kToolbarScreenPadding;
89+
final double paddingAbove = MediaQuery.paddingOf(context).top + _kToolbarScreenPadding;
9190
final Offset localAdjustment = Offset(_kToolbarScreenPadding, paddingAbove);
9291

9392
return Padding(

‎packages/flutter/lib/src/cupertino/dialog.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ const double _kMaxRegularTextScaleFactor = 1.4;
149149
// Accessibility mode on iOS is determined by the text scale factor that the
150150
// user has selected.
151151
bool _isInAccessibilityMode(BuildContext context) {
152-
final MediaQueryData? data = MediaQuery.maybeOf(context);
153-
return data != null && data.textScaleFactor > _kMaxRegularTextScaleFactor;
152+
final double? factor = MediaQuery.maybeTextScaleFactorOf(context);
153+
return factor != null && factor > _kMaxRegularTextScaleFactor;
154154
}
155155

156156
/// An iOS-style alert dialog.
@@ -257,7 +257,7 @@ class CupertinoAlertDialog extends StatelessWidget {
257257
final Curve insetAnimationCurve;
258258

259259
Widget _buildContent(BuildContext context) {
260-
final double textScaleFactor = MediaQuery.of(context).textScaleFactor;
260+
final double textScaleFactor = MediaQuery.textScaleFactorOf(context);
261261

262262
final List<Widget> children = <Widget>[
263263
if (title != null || content != null)
@@ -317,7 +317,7 @@ class CupertinoAlertDialog extends StatelessWidget {
317317
Widget build(BuildContext context) {
318318
final CupertinoLocalizations localizations = CupertinoLocalizations.of(context);
319319
final bool isInAccessibilityMode = _isInAccessibilityMode(context);
320-
final double textScaleFactor = MediaQuery.of(context).textScaleFactor;
320+
final double textScaleFactor = MediaQuery.textScaleFactorOf(context);
321321
return CupertinoUserInterfaceLevel(
322322
data: CupertinoUserInterfaceLevelData.elevated,
323323
child: MediaQuery(
@@ -331,7 +331,7 @@ class CupertinoAlertDialog extends StatelessWidget {
331331
child: LayoutBuilder(
332332
builder: (BuildContext context, BoxConstraints constraints) {
333333
return AnimatedPadding(
334-
padding: MediaQuery.of(context).viewInsets +
334+
padding: MediaQuery.viewInsetsOf(context) +
335335
const EdgeInsets.symmetric(horizontal: 40.0, vertical: 24.0),
336336
duration: insetAnimationDuration,
337337
curve: insetAnimationCurve,
@@ -611,12 +611,12 @@ class CupertinoActionSheet extends StatelessWidget {
611611
if (cancelButton != null) _buildCancelButton(),
612612
];
613613

614-
final Orientation orientation = MediaQuery.of(context).orientation;
614+
final Orientation orientation = MediaQuery.orientationOf(context);
615615
final double actionSheetWidth;
616616
if (orientation == Orientation.portrait) {
617-
actionSheetWidth = MediaQuery.of(context).size.width - (_kActionSheetEdgeHorizontalPadding * 2);
617+
actionSheetWidth = MediaQuery.sizeOf(context).width - (_kActionSheetEdgeHorizontalPadding * 2);
618618
} else {
619-
actionSheetWidth = MediaQuery.of(context).size.height - (_kActionSheetEdgeHorizontalPadding * 2);
619+
actionSheetWidth = MediaQuery.sizeOf(context).height - (_kActionSheetEdgeHorizontalPadding * 2);
620620
}
621621

622622
return SafeArea(
@@ -797,7 +797,7 @@ class _CupertinoDialogRenderWidget extends RenderObjectWidget {
797797
@override
798798
RenderObject createRenderObject(BuildContext context) {
799799
return _RenderCupertinoDialog(
800-
dividerThickness: _kDividerThickness / MediaQuery.of(context).devicePixelRatio,
800+
dividerThickness: _kDividerThickness / MediaQuery.devicePixelRatioOf(context),
801801
isInAccessibilityMode: _isInAccessibilityMode(context) && !isActionSheet,
802802
dividerColor: CupertinoDynamicColor.resolve(dividerColor, context),
803803
isActionSheet: isActionSheet,
@@ -1464,7 +1464,7 @@ class _CupertinoAlertActionSection extends StatelessWidget {
14641464

14651465
@override
14661466
Widget build(BuildContext context) {
1467-
final double devicePixelRatio = MediaQuery.of(context).devicePixelRatio;
1467+
final double devicePixelRatio = MediaQuery.devicePixelRatioOf(context);
14681468

14691469
final List<Widget> interactiveButtons = <Widget>[];
14701470
for (int i = 0; i < children.length; i += 1) {

‎packages/flutter/lib/src/cupertino/list_section.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ class CupertinoListSection extends StatelessWidget {
347347
@override
348348
Widget build(BuildContext context) {
349349
final Color dividerColor = CupertinoColors.separator.resolveFrom(context);
350-
final double dividerHeight = 1.0 / MediaQuery.of(context).devicePixelRatio;
350+
final double dividerHeight = 1.0 / MediaQuery.devicePixelRatioOf(context);
351351

352352
// Long divider is used for wrapping the top and bottom of rows.
353353
// Only used in CupertinoListSectionType.base mode.

0 commit comments

Comments
 (0)