diff --git a/packages/flutter/lib/src/cupertino/context_menu.dart b/packages/flutter/lib/src/cupertino/context_menu.dart
index 95d6fae2ec9..c1625364dd3 100644
--- a/packages/flutter/lib/src/cupertino/context_menu.dart
+++ b/packages/flutter/lib/src/cupertino/context_menu.dart
@@ -412,7 +412,7 @@ class _CupertinoContextMenuState extends State<CupertinoContextMenu> with Ticker
   // it.
   _ContextMenuLocation get _contextMenuLocation {
     final Rect childRect = _getRect(_childGlobalKey);
-    final double screenWidth = MediaQuery.sizeOf(context).width;
+    final double screenWidth = MediaQuery.widthOf(context);
 
     final double center = screenWidth / 2;
     final bool centerDividesChild = childRect.left < center && childRect.right > center;
@@ -1250,7 +1250,7 @@ class _ContextMenuRouteStaticState extends State<_ContextMenuRouteStatic>
   Widget _buildChildAnimation(BuildContext context, Widget? child) {
     _lastScale = _getScale(
       widget.orientation,
-      MediaQuery.sizeOf(context).height,
+      MediaQuery.heightOf(context),
       _moveAnimation.value.dy,
     );
     return Transform.scale(key: widget.childGlobalKey, scale: _lastScale, child: child);
diff --git a/packages/flutter/lib/src/cupertino/desktop_text_selection.dart b/packages/flutter/lib/src/cupertino/desktop_text_selection.dart
index ad8a8964418..d0cfaeba429 100644
--- a/packages/flutter/lib/src/cupertino/desktop_text_selection.dart
+++ b/packages/flutter/lib/src/cupertino/desktop_text_selection.dart
@@ -171,7 +171,7 @@ class _CupertinoDesktopTextSelectionControlsToolbarState
       clampDouble(
         widget.selectionMidpoint.dx - widget.globalEditableRegion.left,
         mediaQueryPadding.left,
-        MediaQuery.sizeOf(context).width - mediaQueryPadding.right,
+        MediaQuery.widthOf(context) - mediaQueryPadding.right,
       ),
       widget.selectionMidpoint.dy - widget.globalEditableRegion.top,
     );
diff --git a/packages/flutter/lib/src/cupertino/dialog.dart b/packages/flutter/lib/src/cupertino/dialog.dart
index ec2d66da271..3f025965178 100644
--- a/packages/flutter/lib/src/cupertino/dialog.dart
+++ b/packages/flutter/lib/src/cupertino/dialog.dart
@@ -1320,8 +1320,8 @@ class _CupertinoActionSheetState extends State<CupertinoActionSheet> {
       if (widget.cancelButton != null) _buildCancelButton(),
     ];
     final double actionSheetWidth = switch (MediaQuery.orientationOf(context)) {
-      Orientation.portrait => MediaQuery.sizeOf(context).width,
-      Orientation.landscape => MediaQuery.sizeOf(context).height,
+      Orientation.portrait => MediaQuery.widthOf(context),
+      Orientation.landscape => MediaQuery.heightOf(context),
     };
 
     return SafeArea(
diff --git a/packages/flutter/lib/src/cupertino/sheet.dart b/packages/flutter/lib/src/cupertino/sheet.dart
index 22f28275cff..c9a21b2cee9 100644
--- a/packages/flutter/lib/src/cupertino/sheet.dart
+++ b/packages/flutter/lib/src/cupertino/sheet.dart
@@ -492,7 +492,7 @@ class CupertinoSheetRoute<T> extends PageRoute<T> with _CupertinoSheetRouteTrans
 
   @override
   Widget buildContent(BuildContext context) {
-    final double topPadding = MediaQuery.sizeOf(context).height * _kTopGapRatio;
+    final double topPadding = MediaQuery.heightOf(context) * _kTopGapRatio;
     return MediaQuery.removePadding(
       context: context,
       removeTop: true,
diff --git a/packages/flutter/lib/src/cupertino/text_selection.dart b/packages/flutter/lib/src/cupertino/text_selection.dart
index 9763bee98af..2a73ed5c50f 100644
--- a/packages/flutter/lib/src/cupertino/text_selection.dart
+++ b/packages/flutter/lib/src/cupertino/text_selection.dart
@@ -266,7 +266,7 @@ class _CupertinoTextSelectionControlsToolbarState
     final double anchorX = clampDouble(
       widget.selectionMidpoint.dx + widget.globalEditableRegion.left,
       _kArrowScreenPadding + mediaQueryPadding.left,
-      MediaQuery.sizeOf(context).width - mediaQueryPadding.right - _kArrowScreenPadding,
+      MediaQuery.widthOf(context) - mediaQueryPadding.right - _kArrowScreenPadding,
     );
 
     final double topAmountInEditableRegion =
diff --git a/packages/flutter/lib/src/cupertino/text_selection_toolbar.dart b/packages/flutter/lib/src/cupertino/text_selection_toolbar.dart
index 517688c3121..52ea43e7af4 100644
--- a/packages/flutter/lib/src/cupertino/text_selection_toolbar.dart
+++ b/packages/flutter/lib/src/cupertino/text_selection_toolbar.dart
@@ -156,7 +156,7 @@ class CupertinoTextSelectionToolbar extends StatelessWidget {
     // too close to the horizontal edges of the screen.
     final double leftMargin = _kArrowScreenPadding + mediaQueryPadding.left;
     final double rightMargin =
-        MediaQuery.sizeOf(context).width - mediaQueryPadding.right - _kArrowScreenPadding;
+        MediaQuery.widthOf(context) - mediaQueryPadding.right - _kArrowScreenPadding;
 
     final Offset anchorAboveAdjusted = Offset(
       clampDouble(anchorAbove.dx, leftMargin, rightMargin),
diff --git a/packages/flutter/lib/src/material/about.dart b/packages/flutter/lib/src/material/about.dart
index 50ca6a4beae..3844b5012f5 100644
--- a/packages/flutter/lib/src/material/about.dart
+++ b/packages/flutter/lib/src/material/about.dart
@@ -1203,9 +1203,7 @@ const double _wideGutterSize = 24.0;
 const double _narrowGutterSize = 12.0;
 
 double _getGutterSize(BuildContext context) =>
-    MediaQuery.sizeOf(context).width >= _materialGutterThreshold
-        ? _wideGutterSize
-        : _narrowGutterSize;
+    MediaQuery.widthOf(context) >= _materialGutterThreshold ? _wideGutterSize : _narrowGutterSize;
 
 /// Signature for the builder callback used by [_MasterDetailFlow].
 typedef _MasterViewBuilder = Widget Function(BuildContext context, bool isLateralUI);
@@ -1659,7 +1657,7 @@ class _DetailView extends StatelessWidget {
     if (_arguments == null) {
       return const SizedBox.shrink();
     }
-    final double screenHeight = MediaQuery.sizeOf(context).height;
+    final double screenHeight = MediaQuery.heightOf(context);
     final double minHeight = (screenHeight - kToolbarHeight) / screenHeight;
 
     return DraggableScrollableSheet(
diff --git a/packages/flutter/lib/src/material/bottom_navigation_bar.dart b/packages/flutter/lib/src/material/bottom_navigation_bar.dart
index e2fcc842078..5857c792506 100644
--- a/packages/flutter/lib/src/material/bottom_navigation_bar.dart
+++ b/packages/flutter/lib/src/material/bottom_navigation_bar.dart
@@ -1167,7 +1167,7 @@ class _Bar extends StatelessWidget {
       alignedChild = Align(
         alignment: Alignment.bottomCenter,
         heightFactor: 1,
-        child: SizedBox(width: MediaQuery.sizeOf(context).height, child: child),
+        child: SizedBox(width: MediaQuery.heightOf(context), child: child),
       );
     }
     return Material(elevation: elevation, color: color, child: alignedChild);
diff --git a/packages/flutter/lib/src/material/date_picker.dart b/packages/flutter/lib/src/material/date_picker.dart
index 4eace111935..455c97e5f4c 100644
--- a/packages/flutter/lib/src/material/date_picker.dart
+++ b/packages/flutter/lib/src/material/date_picker.dart
@@ -1879,7 +1879,7 @@ class _CalendarRangePickerDialog extends StatelessWidget {
             preferredSize: const Size(double.infinity, 64),
             child: Row(
               children: <Widget>[
-                SizedBox(width: MediaQuery.sizeOf(context).width < 360 ? 42 : 72),
+                SizedBox(width: MediaQuery.widthOf(context) < 360 ? 42 : 72),
                 Expanded(
                   child: Semantics(
                     label: '$helpText $startDateText to $endDateText',
diff --git a/packages/flutter/lib/src/material/desktop_text_selection.dart b/packages/flutter/lib/src/material/desktop_text_selection.dart
index 731ce68ac20..8226757eed0 100644
--- a/packages/flutter/lib/src/material/desktop_text_selection.dart
+++ b/packages/flutter/lib/src/material/desktop_text_selection.dart
@@ -187,7 +187,7 @@ class _DesktopTextSelectionControlsToolbarState
       clampDouble(
         widget.selectionMidpoint.dx - widget.globalEditableRegion.left,
         mediaQueryPadding.left,
-        MediaQuery.sizeOf(context).width - mediaQueryPadding.right,
+        MediaQuery.widthOf(context) - mediaQueryPadding.right,
       ),
       widget.selectionMidpoint.dy - widget.globalEditableRegion.top,
     );
diff --git a/packages/flutter/lib/src/material/predictive_back_page_transitions_builder.dart b/packages/flutter/lib/src/material/predictive_back_page_transitions_builder.dart
index da119e0ed30..aa7e303f482 100644
--- a/packages/flutter/lib/src/material/predictive_back_page_transitions_builder.dart
+++ b/packages/flutter/lib/src/material/predictive_back_page_transitions_builder.dart
@@ -189,8 +189,7 @@ class _PredictiveBackPageTransition extends StatelessWidget {
   final Widget child;
 
   Widget _secondaryAnimatedBuilder(BuildContext context, Widget? child) {
-    final Size size = MediaQuery.sizeOf(context);
-    final double screenWidth = size.width;
+    final double screenWidth = MediaQuery.widthOf(context);
     final double xShift = (screenWidth / _screenWidthDivisionFactor) - _xShiftAdjustment;
 
     final bool isCurrent = getIsCurrent();
@@ -233,8 +232,7 @@ class _PredictiveBackPageTransition extends StatelessWidget {
   }
 
   Widget _primaryAnimatedBuilder(BuildContext context, Widget? child) {
-    final Size size = MediaQuery.sizeOf(context);
-    final double screenWidth = size.width;
+    final double screenWidth = MediaQuery.widthOf(context);
     final double xShift = (screenWidth / _screenWidthDivisionFactor) - _xShiftAdjustment;
 
     final Animatable<double> xShiftTween = TweenSequence<double>(<TweenSequenceItem<double>>[
diff --git a/packages/flutter/lib/src/material/snack_bar.dart b/packages/flutter/lib/src/material/snack_bar.dart
index eec7eb99c2a..e8583e968b1 100644
--- a/packages/flutter/lib/src/material/snack_bar.dart
+++ b/packages/flutter/lib/src/material/snack_bar.dart
@@ -723,7 +723,7 @@ class _SnackBarState extends State<SnackBar> {
         defaults.insetPadding!;
 
     final double snackBarWidth =
-        widget.width ?? MediaQuery.sizeOf(context).width - (margin.left + margin.right);
+        widget.width ?? MediaQuery.widthOf(context) - (margin.left + margin.right);
     final double actionOverflowThreshold =
         widget.actionOverflowThreshold ??
         snackBarTheme.actionOverflowThreshold ??
diff --git a/packages/flutter/lib/src/painting/image_provider.dart b/packages/flutter/lib/src/painting/image_provider.dart
index e50aa71c6d9..67ec2fd15eb 100644
--- a/packages/flutter/lib/src/painting/image_provider.dart
+++ b/packages/flutter/lib/src/painting/image_provider.dart
@@ -1244,7 +1244,7 @@ enum ResizeImagePolicy {
 ///    Image(
 ///      image: ResizeImage(
 ///        FileImage(File('path/to/image')),
-///        width: MediaQuery.sizeOf(context).width ~/ 2, // Half of the screen's width.
+///        width: MediaQuery.widthOf(context) ~/ 2, // Half of the screen's width.
 ///      ),
 ///    );
 /// ```
diff --git a/packages/flutter/lib/src/widgets/overscroll_indicator.dart b/packages/flutter/lib/src/widgets/overscroll_indicator.dart
index cc0706764dd..d181655bd72 100644
--- a/packages/flutter/lib/src/widgets/overscroll_indicator.dart
+++ b/packages/flutter/lib/src/widgets/overscroll_indicator.dart
@@ -798,8 +798,6 @@ class _StretchingOverscrollIndicatorState extends State<StretchingOverscrollIndi
 
   @override
   Widget build(BuildContext context) {
-    final Size size = MediaQuery.sizeOf(context);
-    double mainAxisSize;
     return NotificationListener<ScrollNotification>(
       onNotification: _handleScrollNotification,
       child: AnimatedBuilder(
@@ -808,14 +806,15 @@ class _StretchingOverscrollIndicatorState extends State<StretchingOverscrollIndi
           final double stretch = _stretchController.value;
           double x = 1.0;
           double y = 1.0;
+          final double mainAxisSize;
 
           switch (widget.axis) {
             case Axis.horizontal:
               x += stretch;
-              mainAxisSize = size.width;
+              mainAxisSize = MediaQuery.widthOf(context);
             case Axis.vertical:
               y += stretch;
-              mainAxisSize = size.height;
+              mainAxisSize = MediaQuery.heightOf(context);
           }
 
           final AlignmentGeometry alignment = _getAlignmentForAxisDirection(