Deprecate MediaQuery[Data].fromWindow (#119647)
* Deprecate MediaQuery[Data].fromWindow
* ++
* dart fix
diff --git a/packages/flutter/lib/fix_data/fix_widgets/fix_widgets.yaml b/packages/flutter/lib/fix_data/fix_widgets/fix_widgets.yaml
index 30ea07a..2c4a200 100644
--- a/packages/flutter/lib/fix_data/fix_widgets/fix_widgets.yaml
+++ b/packages/flutter/lib/fix_data/fix_widgets/fix_widgets.yaml
@@ -23,7 +23,18 @@
# * ListWheelScrollView: fix_list_wheel_scroll_view.yaml
version: 1
transforms:
- # Changes made in https://github.com/flutter/flutter/pull/119186 and https://github.com/flutter/flutter/pull/81067.
+ # Changes made in https://github.com/flutter/flutter/pull/119647
+ - title: "Migrate to 'fromView'"
+ date: 2022-10-28
+ element:
+ uris: [ 'widgets.dart', 'material.dart', 'cupertino.dart' ]
+ constructor: 'fromWindow'
+ inClass: 'MediaQueryData'
+ changes:
+ - kind: 'rename'
+ newName: 'fromView'
+
+ # Changes made in https://github.com/flutter/flutter/pull/119186 and https://github.com/flutter/flutter/pull/81067
- title: "Remove 'vsync'"
date: 2023-01-30
element:
diff --git a/packages/flutter/lib/src/widgets/media_query.dart b/packages/flutter/lib/src/widgets/media_query.dart
index d1321ee..d88c9c2 100644
--- a/packages/flutter/lib/src/widgets/media_query.dart
+++ b/packages/flutter/lib/src/widgets/media_query.dart
@@ -160,13 +160,16 @@
this.displayFeatures = const <ui.DisplayFeature>[],
});
- /// Creates data for a media query based on the given window.
+ /// Deprecated. Use [MediaQueryData.fromView] instead.
///
- /// If you use this, you should ensure that you also register for
- /// notifications so that you can update your [MediaQueryData] when the
- /// window's metrics change. For example, see
- /// [WidgetsBindingObserver.didChangeMetrics] or
- /// [dart:ui.PlatformDispatcher.onMetricsChanged].
+ /// This constructor was operating on a single window assumption. In
+ /// preparation for Flutter's upcoming multi-window support, it has been
+ /// deprecated.
+ @Deprecated(
+ 'Use MediaQueryData.fromView instead. '
+ 'This constructor was deprecated in preparation for the upcoming multi-window support. '
+ 'This feature was deprecated after v3.7.0-32.0.pre.'
+ )
factory MediaQueryData.fromWindow(ui.FlutterView window) => MediaQueryData.fromView(window);
/// Creates data for a [MediaQuery] based on the given `view`.
@@ -918,14 +921,21 @@
);
}
- /// Provides a [MediaQuery] which is built and updated using the latest
- /// [WidgetsBinding.window] values.
+ /// Deprecated. Use [MediaQuery.fromView] instead.
///
- /// The [MediaQuery] is wrapped in a separate widget to ensure that only it
- /// and its dependents are updated when `window` changes, instead of
- /// rebuilding the whole widget tree.
+ /// This constructor was operating on a single window assumption. In
+ /// preparation for Flutter's upcoming multi-window support, it has been
+ /// deprecated.
///
- /// The [child] argument is required and must not be null.
+ /// Replaced by [MediaQuery.fromView], which requires specifying the
+ /// [FlutterView] the [MediaQuery] is constructed for. The [FlutterView] can,
+ /// for example, be obtained from the context via [View.of] or from
+ /// [PlatformDispatcher.views].
+ @Deprecated(
+ 'Use MediaQuery.fromView instead. '
+ 'This constructor was deprecated in preparation for the upcoming multi-window support. '
+ 'This feature was deprecated after v3.7.0-32.0.pre.'
+ )
static Widget fromWindow({
Key? key,
required Widget child,
@@ -953,7 +963,7 @@
/// The injected [MediaQuery] automatically updates when any of the data used
/// to construct it changes.
///
- /// The [view] and [child] argument is required and must not be null.
+ /// The [view] and [child] arguments are required and must not be null.
static Widget fromView({
Key? key,
required FlutterView view,
diff --git a/packages/flutter/test/cupertino/route_test.dart b/packages/flutter/test/cupertino/route_test.dart
index 51d90dd..2f171cd 100644
--- a/packages/flutter/test/cupertino/route_test.dart
+++ b/packages/flutter/test/cupertino/route_test.dart
@@ -2216,7 +2216,7 @@
TransitionDelegate<dynamic>? transitionDelegate,
}) {
return MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(WidgetsBinding.instance.window),
child: Localizations(
locale: const Locale('en', 'US'),
delegates: const <LocalizationsDelegate<dynamic>>[
diff --git a/packages/flutter/test/material/action_chip_test.dart b/packages/flutter/test/material/action_chip_test.dart
index c2e71e5..010daf4 100644
--- a/packages/flutter/test/material/action_chip_test.dart
+++ b/packages/flutter/test/material/action_chip_test.dart
@@ -17,7 +17,7 @@
home: Directionality(
textDirection: textDirection,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: textScaleFactor),
+ data: MediaQueryData(textScaleFactor: textScaleFactor),
child: Material(child: child),
),
),
diff --git a/packages/flutter/test/material/chip_test.dart b/packages/flutter/test/material/chip_test.dart
index 4d4abbc..164e0e4 100644
--- a/packages/flutter/test/material/chip_test.dart
+++ b/packages/flutter/test/material/chip_test.dart
@@ -80,7 +80,7 @@
home: Directionality(
textDirection: textDirection,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: textScaleFactor),
+ data: MediaQueryData(textScaleFactor: textScaleFactor),
child: Material(child: child),
),
),
diff --git a/packages/flutter/test/material/choice_chip_test.dart b/packages/flutter/test/material/choice_chip_test.dart
index 29e80eb..62506d2 100644
--- a/packages/flutter/test/material/choice_chip_test.dart
+++ b/packages/flutter/test/material/choice_chip_test.dart
@@ -46,7 +46,7 @@
home: Directionality(
textDirection: textDirection,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: textScaleFactor),
+ data: MediaQueryData(textScaleFactor: textScaleFactor),
child: Material(child: child),
),
),
diff --git a/packages/flutter/test/material/dropdown_form_field_test.dart b/packages/flutter/test/material/dropdown_form_field_test.dart
index e53f69f..c46c560 100644
--- a/packages/flutter/test/material/dropdown_form_field_test.dart
+++ b/packages/flutter/test/material/dropdown_form_field_test.dart
@@ -90,7 +90,7 @@
DefaultMaterialLocalizations.delegate,
],
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(size: widget.mediaSize),
+ data: const MediaQueryData().copyWith(size: widget.mediaSize),
child: Directionality(
textDirection: widget.textDirection,
child: Navigator(
diff --git a/packages/flutter/test/material/dropdown_test.dart b/packages/flutter/test/material/dropdown_test.dart
index 80ab1f7..c951b1d 100644
--- a/packages/flutter/test/material/dropdown_test.dart
+++ b/packages/flutter/test/material/dropdown_test.dart
@@ -246,7 +246,7 @@
DefaultMaterialLocalizations.delegate,
],
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(size: widget.mediaSize),
+ data: MediaQueryData.fromView(View.of(context)).copyWith(size: widget.mediaSize),
child: Directionality(
textDirection: widget.textDirection,
child: Navigator(
@@ -401,7 +401,7 @@
return Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(tester.binding.window),
child: Navigator(
initialRoute: '/',
onGenerateRoute: (RouteSettings settings) {
diff --git a/packages/flutter/test/material/filter_chip_test.dart b/packages/flutter/test/material/filter_chip_test.dart
index 8296876..7369a9e 100644
--- a/packages/flutter/test/material/filter_chip_test.dart
+++ b/packages/flutter/test/material/filter_chip_test.dart
@@ -19,7 +19,7 @@
home: Directionality(
textDirection: textDirection,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: textScaleFactor),
+ data: MediaQueryData(textScaleFactor: textScaleFactor),
child: Material(child: child),
),
),
diff --git a/packages/flutter/test/material/input_chip_test.dart b/packages/flutter/test/material/input_chip_test.dart
index a9206f2..6ad9e75 100644
--- a/packages/flutter/test/material/input_chip_test.dart
+++ b/packages/flutter/test/material/input_chip_test.dart
@@ -19,7 +19,7 @@
home: Directionality(
textDirection: textDirection,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: textScaleFactor),
+ data: MediaQueryData(textScaleFactor: textScaleFactor),
child: Material(child: child),
),
),
diff --git a/packages/flutter/test/material/menu_anchor_test.dart b/packages/flutter/test/material/menu_anchor_test.dart
index 54d114e..d3b1aa9 100644
--- a/packages/flutter/test/material/menu_anchor_test.dart
+++ b/packages/flutter/test/material/menu_anchor_test.dart
@@ -35,7 +35,7 @@
}
setUpAll(() {
- final MediaQueryData mediaQueryData = MediaQueryData.fromWindow(TestWidgetsFlutterBinding.instance.window);
+ final MediaQueryData mediaQueryData = MediaQueryData.fromView(TestWidgetsFlutterBinding.instance.window);
defaultSize = mediaQueryData.size;
});
@@ -1205,7 +1205,7 @@
testWidgets('menus close on view size change', (WidgetTester tester) async {
final ScrollController scrollController = ScrollController();
- final MediaQueryData mediaQueryData = MediaQueryData.fromWindow(tester.binding.window);
+ final MediaQueryData mediaQueryData = MediaQueryData.fromView(tester.binding.window);
Widget build(Size size) {
return MaterialApp(
diff --git a/packages/flutter/test/material/page_test.dart b/packages/flutter/test/material/page_test.dart
index 87d9d62..ba259b6 100644
--- a/packages/flutter/test/material/page_test.dart
+++ b/packages/flutter/test/material/page_test.dart
@@ -1219,7 +1219,7 @@
TransitionDelegate<dynamic>? transitionDelegate,
}) {
return MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(WidgetsBinding.instance.window),
child: Localizations(
locale: const Locale('en', 'US'),
delegates: const <LocalizationsDelegate<dynamic>>[
@@ -1323,7 +1323,7 @@
return Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(View.of(context)),
child: child,
),
);
diff --git a/packages/flutter/test/material/popup_menu_test.dart b/packages/flutter/test/material/popup_menu_test.dart
index 063e06b..3fcfd9a 100644
--- a/packages/flutter/test/material/popup_menu_test.dart
+++ b/packages/flutter/test/material/popup_menu_test.dart
@@ -3119,7 +3119,7 @@
DefaultMaterialLocalizations.delegate,
],
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(View.of(context)),
child: Directionality(
textDirection: textDirection,
child: Navigator(
diff --git a/packages/flutter/test/material/range_slider_test.dart b/packages/flutter/test/material/range_slider_test.dart
index ecf7882..02a5cab 100644
--- a/packages/flutter/test/material/range_slider_test.dart
+++ b/packages/flutter/test/material/range_slider_test.dart
@@ -1658,7 +1658,7 @@
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: 2.0),
+ data: const MediaQueryData(textScaleFactor: 2.0),
child: Material(
child: Center(
child: Theme(
diff --git a/packages/flutter/test/material/slider_theme_test.dart b/packages/flutter/test/material/slider_theme_test.dart
index 2bf1d95..704e783 100644
--- a/packages/flutter/test/material/slider_theme_test.dart
+++ b/packages/flutter/test/material/slider_theme_test.dart
@@ -900,7 +900,7 @@
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: textScale),
+ data: MediaQueryData(textScaleFactor: textScale),
child: Material(
child: Row(
children: <Widget>[
@@ -1082,7 +1082,7 @@
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: textScale),
+ data: MediaQueryData(textScaleFactor: textScale),
child: Material(
child: Row(
children: <Widget>[
@@ -1870,7 +1870,7 @@
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: textScale),
+ data: MediaQueryData(textScaleFactor: textScale),
child: Material(
child: Row(
children: <Widget>[
@@ -2080,7 +2080,7 @@
home: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: textScale),
+ data: MediaQueryData(textScaleFactor: textScale),
child: Material(
child: Row(
children: <Widget>[
diff --git a/packages/flutter/test/material/text_field_test.dart b/packages/flutter/test/material/text_field_test.dart
index 1110d20..342c18e 100644
--- a/packages/flutter/test/material/text_field_test.dart
+++ b/packages/flutter/test/material/text_field_test.dart
@@ -7845,7 +7845,7 @@
MaterialApp(
home: Scaffold(
body: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(textScaleFactor: 4.0),
+ data: const MediaQueryData(textScaleFactor: 4.0),
child: Center(
child: TextField(
decoration: const InputDecoration(labelText: 'Label', border: UnderlineInputBorder()),
diff --git a/packages/flutter/test/material/tooltip_test.dart b/packages/flutter/test/material/tooltip_test.dart
index dcb2c66..a404421 100644
--- a/packages/flutter/test/material/tooltip_test.dart
+++ b/packages/flutter/test/material/tooltip_test.dart
@@ -476,15 +476,13 @@
child: const Icon(Icons.add),
),
);
- return MediaQuery.fromWindow(
- child: MediaQuery(
- data: MediaQueryData(
- viewInsets: EdgeInsets.only(bottom: viewInsetsHeight),
- ),
- child: MaterialApp(
- useInheritedMediaQuery: true,
- home: scaffold,
- ),
+ return MediaQuery(
+ data: MediaQueryData(
+ viewInsets: EdgeInsets.only(bottom: viewInsetsHeight),
+ ),
+ child: MaterialApp(
+ useInheritedMediaQuery: true,
+ home: scaffold,
),
);
}
diff --git a/packages/flutter/test/widgets/display_feature_sub_screen_test.dart b/packages/flutter/test/widgets/display_feature_sub_screen_test.dart
index 924bed3..f704513 100644
--- a/packages/flutter/test/widgets/display_feature_sub_screen_test.dart
+++ b/packages/flutter/test/widgets/display_feature_sub_screen_test.dart
@@ -11,7 +11,7 @@
group('DisplayFeatureSubScreen', () {
testWidgets('without Directionality or anchor', (WidgetTester tester) async {
const Key childKey = Key('childKey');
- final MediaQueryData mediaQuery = MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(
+ final MediaQueryData mediaQuery = MediaQueryData.fromView(WidgetsBinding.instance.window).copyWith(
displayFeatures: <DisplayFeature>[
const DisplayFeature(
bounds: Rect.fromLTRB(390, 0, 410, 600),
@@ -39,7 +39,7 @@
testWidgets('with anchorPoint', (WidgetTester tester) async {
const Key childKey = Key('childKey');
- final MediaQueryData mediaQuery = MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(
+ final MediaQueryData mediaQuery = MediaQueryData.fromView(WidgetsBinding.instance.window).copyWith(
displayFeatures: <DisplayFeature>[
const DisplayFeature(
bounds: Rect.fromLTRB(390, 0, 410, 600),
@@ -70,7 +70,7 @@
testWidgets('with infinity anchorpoint', (WidgetTester tester) async {
const Key childKey = Key('childKey');
- final MediaQueryData mediaQuery = MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(
+ final MediaQueryData mediaQuery = MediaQueryData.fromView(WidgetsBinding.instance.window).copyWith(
displayFeatures: <DisplayFeature>[
const DisplayFeature(
bounds: Rect.fromLTRB(390, 0, 410, 600),
@@ -101,7 +101,7 @@
testWidgets('with horizontal hinge and anchorPoint', (WidgetTester tester) async {
const Key childKey = Key('childKey');
- final MediaQueryData mediaQuery = MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(
+ final MediaQueryData mediaQuery = MediaQueryData.fromView(WidgetsBinding.instance.window).copyWith(
displayFeatures: <DisplayFeature>[
const DisplayFeature(
bounds: Rect.fromLTRB(0, 290, 800, 310),
@@ -131,7 +131,7 @@
testWidgets('with multiple display features and anchorPoint', (WidgetTester tester) async {
const Key childKey = Key('childKey');
- final MediaQueryData mediaQuery = MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(
+ final MediaQueryData mediaQuery = MediaQueryData.fromView(WidgetsBinding.instance.window).copyWith(
displayFeatures: <DisplayFeature>[
const DisplayFeature(
bounds: Rect.fromLTRB(0, 290, 800, 310),
@@ -166,7 +166,7 @@
testWidgets('with non-splitting display features and anchorPoint', (WidgetTester tester) async {
const Key childKey = Key('childKey');
- final MediaQueryData mediaQuery = MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(
+ final MediaQueryData mediaQuery = MediaQueryData.fromView(WidgetsBinding.instance.window).copyWith(
displayFeatures: <DisplayFeature>[
// Top notch
const DisplayFeature(
@@ -211,7 +211,7 @@
testWidgets('with size 0 display feature in half-opened posture and anchorPoint', (WidgetTester tester) async {
const Key childKey = Key('childKey');
- final MediaQueryData mediaQuery = MediaQueryData.fromWindow(WidgetsBinding.instance.window).copyWith(
+ final MediaQueryData mediaQuery = MediaQueryData.fromView(WidgetsBinding.instance.window).copyWith(
displayFeatures: <DisplayFeature>[
const DisplayFeature(
bounds: Rect.fromLTRB(0, 300, 800, 300),
diff --git a/packages/flutter/test/widgets/heroes_test.dart b/packages/flutter/test/widgets/heroes_test.dart
index 0582129..8f60a08 100644
--- a/packages/flutter/test/widgets/heroes_test.dart
+++ b/packages/flutter/test/widgets/heroes_test.dart
@@ -3168,7 +3168,7 @@
return Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(View.of(context)),
child: child,
),
);
diff --git a/packages/flutter/test/widgets/media_query_test.dart b/packages/flutter/test/widgets/media_query_test.dart
index 527d32a..bf81396 100644
--- a/packages/flutter/test/widgets/media_query_test.dart
+++ b/packages/flutter/test/widgets/media_query_test.dart
@@ -145,11 +145,11 @@
expect(tested, isTrue);
});
- testWidgets('MediaQueryData.fromWindow is sane', (WidgetTester tester) async {
- final MediaQueryData data = MediaQueryData.fromWindow(WidgetsBinding.instance.window);
+ testWidgets('MediaQueryData.fromView is sane', (WidgetTester tester) async {
+ final MediaQueryData data = MediaQueryData.fromView(tester.binding.window);
expect(data, hasOneLineDescription);
expect(data.hashCode, equals(data.copyWith().hashCode));
- expect(data.size, equals(WidgetsBinding.instance.window.physicalSize / WidgetsBinding.instance.window.devicePixelRatio));
+ expect(data.size, equals(tester.binding.window.physicalSize / tester.binding.window.devicePixelRatio));
expect(data.accessibleNavigation, false);
expect(data.invertColors, false);
expect(data.disableAnimations, false);
@@ -513,7 +513,7 @@
});
testWidgets('MediaQueryData.copyWith defaults to source', (WidgetTester tester) async {
- final MediaQueryData data = MediaQueryData.fromWindow(WidgetsBinding.instance.window);
+ final MediaQueryData data = MediaQueryData.fromView(tester.binding.window);
final MediaQueryData copied = data.copyWith();
expect(copied.size, data.size);
expect(copied.devicePixelRatio, data.devicePixelRatio);
@@ -552,7 +552,7 @@
),
];
- final MediaQueryData data = MediaQueryData.fromWindow(WidgetsBinding.instance.window);
+ final MediaQueryData data = MediaQueryData.fromView(tester.binding.window);
final MediaQueryData copied = data.copyWith(
size: customSize,
devicePixelRatio: customDevicePixelRatio,
@@ -1110,7 +1110,7 @@
expect(insideBoldTextOverride, true);
});
- testWidgets('MediaQuery.fromWindow creates a MediaQuery', (WidgetTester tester) async {
+ testWidgets('MediaQuery.fromView creates a MediaQuery', (WidgetTester tester) async {
MediaQuery? mediaQueryOutside;
MediaQuery? mediaQueryInside;
@@ -1118,7 +1118,8 @@
Builder(
builder: (BuildContext context) {
mediaQueryOutside = context.findAncestorWidgetOfExactType<MediaQuery>();
- return MediaQuery.fromWindow(
+ return MediaQuery.fromView(
+ view: View.of(context),
child: Builder(
builder: (BuildContext context) {
mediaQueryInside = context.findAncestorWidgetOfExactType<MediaQuery>();
@@ -1135,7 +1136,7 @@
});
testWidgets('MediaQueryData.fromWindow is created using window values', (WidgetTester tester) async {
- final MediaQueryData windowData = MediaQueryData.fromWindow(WidgetsBinding.instance.window);
+ final MediaQueryData windowData = MediaQueryData.fromWindow(tester.binding.window);
late MediaQueryData fromWindowData;
await tester.pumpWidget(
@@ -1329,7 +1330,7 @@
gestureSettings: GestureSettings(physicalDoubleTapSlop: 100, physicalTouchSlop: 100),
);
- expect(MediaQueryData.fromWindow(tester.binding.window).gestureSettings.touchSlop, closeTo(33.33, 0.1)); // Repeating, of course
+ expect(MediaQueryData.fromView(tester.binding.window).gestureSettings.touchSlop, closeTo(33.33, 0.1)); // Repeating, of course
tester.binding.window.viewConfigurationTestValue = null;
});
diff --git a/packages/flutter/test/widgets/navigator_restoration_test.dart b/packages/flutter/test/widgets/navigator_restoration_test.dart
index 0096ef8..ecbed9b 100644
--- a/packages/flutter/test/widgets/navigator_restoration_test.dart
+++ b/packages/flutter/test/widgets/navigator_restoration_test.dart
@@ -1047,7 +1047,7 @@
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(View.of(context)),
child: const PagedTestNavigator(),
),
),
@@ -1173,7 +1173,7 @@
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(View.of(context)),
child: Navigator(
initialRoute: 'home',
restorationScopeId: 'app',
diff --git a/packages/flutter/test/widgets/navigator_test.dart b/packages/flutter/test/widgets/navigator_test.dart
index 2bfb82a..f982d60 100644
--- a/packages/flutter/test/widgets/navigator_test.dart
+++ b/packages/flutter/test/widgets/navigator_test.dart
@@ -204,7 +204,7 @@
const MaterialPage<void> page = MaterialPage<void>(child: Text('page'));
await tester.pumpWidget(
MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(tester.binding.window),
child: Directionality(
textDirection: TextDirection.ltr,
child: Navigator(
@@ -219,7 +219,7 @@
await tester.pumpWidget(
MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(tester.binding.window),
child: Directionality(
textDirection: TextDirection.ltr,
child: Navigator(
@@ -2684,7 +2684,7 @@
List<NavigatorObserver> observers = const <NavigatorObserver>[],
}) {
return MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(WidgetsBinding.instance.window),
child: Localizations(
locale: const Locale('en', 'US'),
delegates: const <LocalizationsDelegate<dynamic>>[
@@ -2782,7 +2782,7 @@
await tester.pumpWidget(
MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(tester.binding.window),
child: Localizations(
locale: const Locale('en', 'US'),
delegates: const <LocalizationsDelegate<dynamic>>[
@@ -2821,7 +2821,7 @@
};
await tester.pumpWidget(
MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(tester.binding.window),
child: Localizations(
locale: const Locale('en', 'US'),
delegates: const <LocalizationsDelegate<dynamic>>[
@@ -4271,7 +4271,7 @@
@override
Widget build(BuildContext context) {
return MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(View.of(context)),
child: Directionality(
textDirection: TextDirection.ltr,
child: child,
diff --git a/packages/flutter/test/widgets/page_view_test.dart b/packages/flutter/test/widgets/page_view_test.dart
index 971422d..d1887aa 100644
--- a/packages/flutter/test/widgets/page_view_test.dart
+++ b/packages/flutter/test/widgets/page_view_test.dart
@@ -142,7 +142,7 @@
// Set the starting viewportDimension to 0.0
await tester.binding.setSurfaceSize(Size.zero);
- final MediaQueryData mediaQueryData = MediaQueryData.fromWindow(tester.binding.window);
+ final MediaQueryData mediaQueryData = MediaQueryData.fromView(tester.binding.window);
Widget build(Size size) {
return MediaQuery(
diff --git a/packages/flutter/test/widgets/reparent_state_with_layout_builder_test.dart b/packages/flutter/test/widgets/reparent_state_with_layout_builder_test.dart
index e27a385..30b3a73 100644
--- a/packages/flutter/test/widgets/reparent_state_with_layout_builder_test.dart
+++ b/packages/flutter/test/widgets/reparent_state_with_layout_builder_test.dart
@@ -96,7 +96,7 @@
Widget deepChild = Container();
await tester.pumpWidget(MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(tester.binding.window),
child: Column(
children: <Widget>[
StatefulBuilder(builder: (BuildContext context, StateSetter setState) {
diff --git a/packages/flutter/test/widgets/scroll_position_test.dart b/packages/flutter/test/widgets/scroll_position_test.dart
index 0e1e11b..535a27e 100644
--- a/packages/flutter/test/widgets/scroll_position_test.dart
+++ b/packages/flutter/test/widgets/scroll_position_test.dart
@@ -34,7 +34,7 @@
Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(tester.binding.window),
child: Navigator(
key: navigatorKey,
onGenerateRoute: (RouteSettings settings) {
diff --git a/packages/flutter/test/widgets/semantics_debugger_test.dart b/packages/flutter/test/widgets/semantics_debugger_test.dart
index b419aea..436be69 100644
--- a/packages/flutter/test/widgets/semantics_debugger_test.dart
+++ b/packages/flutter/test/widgets/semantics_debugger_test.dart
@@ -301,7 +301,7 @@
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window),
+ data: MediaQueryData.fromView(tester.binding.window),
child: Material(
child: Center(
child: Slider(
diff --git a/packages/flutter/test/widgets/snapshot_widget_test.dart b/packages/flutter/test/widgets/snapshot_widget_test.dart
index 32380f4..2750bb0 100644
--- a/packages/flutter/test/widgets/snapshot_widget_test.dart
+++ b/packages/flutter/test/widgets/snapshot_widget_test.dart
@@ -371,8 +371,7 @@
return Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
- data: MediaQueryData.fromWindow(WidgetsBinding.instance.window)
- .copyWith(devicePixelRatio: devicePixelRatio),
+ data: const MediaQueryData().copyWith(devicePixelRatio: devicePixelRatio),
child: child,
),
);
diff --git a/packages/flutter/test_fixes/widgets/widgets.dart b/packages/flutter/test_fixes/widgets/widgets.dart
index 1dba2e0..9f76868 100644
--- a/packages/flutter/test_fixes/widgets/widgets.dart
+++ b/packages/flutter/test_fixes/widgets/widgets.dart
@@ -12,7 +12,10 @@
Object object;
TickerProvider vsync;
- // Changes made in https://github.com/flutter/flutter/pull/119186 and https://github.com/flutter/flutter/pull/81067.
+ // Changes made in https://github.com/flutter/flutter/pull/119647
+ MediaQueryData.fromWindow(View.of(context));
+
+ // Changes made in https://github.com/flutter/flutter/pull/119186 and https://github.com/flutter/flutter/pull/81067
AnimatedSize(vsync: vsync, duration: Duration.zero);
// Changes made in https://github.com/flutter/flutter/pull/45941 and https://github.com/flutter/flutter/pull/83843
diff --git a/packages/flutter/test_fixes/widgets/widgets.dart.expect b/packages/flutter/test_fixes/widgets/widgets.dart.expect
index 376b868..bc87868 100644
--- a/packages/flutter/test_fixes/widgets/widgets.dart.expect
+++ b/packages/flutter/test_fixes/widgets/widgets.dart.expect
@@ -12,7 +12,10 @@
Object object;
TickerProvider vsync;
- // Changes made in https://github.com/flutter/flutter/pull/119186 and https://github.com/flutter/flutter/pull/81067.
+ // Changes made in https://github.com/flutter/flutter/pull/119647
+ MediaQueryData.fromView(View.of(context));
+
+ // Changes made in https://github.com/flutter/flutter/pull/119186 and https://github.com/flutter/flutter/pull/81067
AnimatedSize(duration: Duration.zero);
// Changes made in https://github.com/flutter/flutter/pull/45941 and https://github.com/flutter/flutter/pull/83843
