diff --git a/lib/config/themes.dart b/lib/config/themes.dart index 91bdc0db8..6b20af645 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -14,10 +14,10 @@ abstract class FluffyThemes { width > columnWidth * 2 + navRailWidth; static bool isColumnMode(BuildContext context) => - isColumnModeByWidth(MediaQuery.of(context).size.width); + isColumnModeByWidth(MediaQuery.sizeOf(context).width); static bool isThreeColumnMode(BuildContext context) => - MediaQuery.of(context).size.width > FluffyThemes.columnWidth * 3.5; + MediaQuery.sizeOf(context).width > FluffyThemes.columnWidth * 3.5; static LinearGradient backgroundGradient( BuildContext context, diff --git a/lib/pages/chat/chat_emoji_picker.dart b/lib/pages/chat/chat_emoji_picker.dart index e635a5bc6..d20dac9a4 100644 --- a/lib/pages/chat/chat_emoji_picker.dart +++ b/lib/pages/chat/chat_emoji_picker.dart @@ -21,7 +21,7 @@ class ChatEmojiPicker extends StatelessWidget { clipBehavior: Clip.hardEdge, decoration: const BoxDecoration(), height: controller.showEmojiPicker - ? MediaQuery.of(context).size.height / 2 + ? MediaQuery.sizeOf(context).height / 2 : 0, child: controller.showEmojiPicker ? DefaultTabController( diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index 1e97c6fa6..eb9b0e234 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -274,8 +274,8 @@ class ChatView extends StatelessWidget { cacheKey: accountConfig.wallpaperUrl.toString(), uri: accountConfig.wallpaperUrl, fit: BoxFit.cover, - height: MediaQuery.of(context).size.height, - width: MediaQuery.of(context).size.width, + height: MediaQuery.sizeOf(context).height, + width: MediaQuery.sizeOf(context).width, isThumbnail: false, placeholder: (_) => Container(), ), diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index ced1908de..0fcf6472e 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -463,8 +463,8 @@ class Message extends StatelessWidget { colors: colors, ignore: noBubble || !ownMessage || - MediaQuery.of(context) - .highContrast, + MediaQuery.highContrastOf( + context), scrollController: scrollController, child: Container( diff --git a/lib/pages/dialer/dialer.dart b/lib/pages/dialer/dialer.dart index 9ff54030e..d14d5dfa7 100644 --- a/lib/pages/dialer/dialer.dart +++ b/lib/pages/dialer/dialer.dart @@ -238,18 +238,18 @@ class MyCallingPage extends State { void _resizeLocalVideo(Orientation orientation) { final shortSide = min( - MediaQuery.of(widget.context).size.width, - MediaQuery.of(widget.context).size.height, + MediaQuery.sizeOf(widget.context).width, + MediaQuery.sizeOf(widget.context).height, ); _localVideoMargin = remoteStream != null ? const EdgeInsets.only(top: 20.0, right: 20.0) : EdgeInsets.zero; _localVideoWidth = remoteStream != null ? shortSide / 3 - : MediaQuery.of(widget.context).size.width; + : MediaQuery.sizeOf(widget.context).width; _localVideoHeight = remoteStream != null ? shortSide / 4 - : MediaQuery.of(widget.context).size.height; + : MediaQuery.sizeOf(widget.context).height; } void _handleCallState(CallState state) { diff --git a/lib/pages/dialer/pip/pip_view.dart b/lib/pages/dialer/pip/pip_view.dart index d9aa3d90f..78facfaa0 100644 --- a/lib/pages/dialer/pip/pip_view.dart +++ b/lib/pages/dialer/pip/pip_view.dart @@ -138,10 +138,9 @@ class PIPViewState extends State with TickerProviderStateMixin { @override Widget build(BuildContext context) { - final mediaQuery = MediaQuery.of(context); - var windowPadding = mediaQuery.padding; + var windowPadding = MediaQuery.paddingOf(context); if (widget.avoidKeyboard) { - windowPadding += mediaQuery.viewInsets; + windowPadding += MediaQuery.viewInsetsOf(context); } final isFloating = _floating; diff --git a/lib/pages/image_viewer/image_viewer.dart b/lib/pages/image_viewer/image_viewer.dart index 3527ea68a..3ae3410a1 100644 --- a/lib/pages/image_viewer/image_viewer.dart +++ b/lib/pages/image_viewer/image_viewer.dart @@ -111,7 +111,7 @@ class ImageViewerController extends State { void onInteractionEnds(ScaleEndDetails endDetails) { if (PlatformInfos.usesTouchscreen == false) { if (endDetails.velocity.pixelsPerSecond.dy > - MediaQuery.of(context).size.height * maxScaleFactor) { + MediaQuery.sizeOf(context).height * maxScaleFactor) { Navigator.of(context, rootNavigator: false).pop(); } } diff --git a/lib/pages/image_viewer/video_player.dart b/lib/pages/image_viewer/video_player.dart index 29c48275e..a362b94c3 100644 --- a/lib/pages/image_viewer/video_player.dart +++ b/lib/pages/image_viewer/video_player.dart @@ -127,7 +127,7 @@ class EventVideoPlayerState extends State { final infoMap = widget.event.content.tryGetMap('info'); final videoWidth = infoMap?.tryGet('w') ?? 400; final videoHeight = infoMap?.tryGet('h') ?? 300; - final height = MediaQuery.of(context).size.height - 52; + final height = MediaQuery.sizeOf(context).height - 52; final width = videoWidth * (height / videoHeight); final chewieController = _chewieController; diff --git a/lib/utils/adaptive_bottom_sheet.dart b/lib/utils/adaptive_bottom_sheet.dart index faa7f5ce8..db9a11ede 100644 --- a/lib/utils/adaptive_bottom_sheet.dart +++ b/lib/utils/adaptive_bottom_sheet.dart @@ -54,7 +54,7 @@ Future showAdaptiveBottomSheet({ isDismissible: isDismissible, isScrollControlled: isScrollControlled, constraints: BoxConstraints( - maxHeight: min(MediaQuery.of(context).size.height - 32, 600), + maxHeight: min(MediaQuery.sizeOf(context).height - 32, 600), maxWidth: FluffyThemes.columnWidth * 1.25, ), backgroundColor: Colors.transparent, diff --git a/lib/widgets/adaptive_dialogs/show_modal_action_popup.dart b/lib/widgets/adaptive_dialogs/show_modal_action_popup.dart index 7e6709871..47db330f1 100644 --- a/lib/widgets/adaptive_dialogs/show_modal_action_popup.dart +++ b/lib/widgets/adaptive_dialogs/show_modal_action_popup.dart @@ -23,7 +23,7 @@ Future showModalActionPopup({ clipBehavior: Clip.hardEdge, constraints: BoxConstraints( maxWidth: 512, - maxHeight: MediaQuery.of(context).size.height - 32, + maxHeight: MediaQuery.sizeOf(context).height - 32, ), builder: (context) => ListView( shrinkWrap: true, diff --git a/lib/widgets/layouts/empty_page.dart b/lib/widgets/layouts/empty_page.dart index 4a30abe7a..5a0be7862 100644 --- a/lib/widgets/layouts/empty_page.dart +++ b/lib/widgets/layouts/empty_page.dart @@ -7,7 +7,7 @@ class EmptyPage extends StatelessWidget { const EmptyPage({super.key}); @override Widget build(BuildContext context) { - final width = min(MediaQuery.of(context).size.width, EmptyPage._width) / 2; + final width = min(MediaQuery.sizeOf(context).width, EmptyPage._width) / 2; final theme = Theme.of(context); return Scaffold( // Add invisible appbar to make status bar on Android tablets bright. diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart index 37ed5e27a..f5ae03a4e 100644 --- a/lib/widgets/mxc_image.dart +++ b/lib/widgets/mxc_image.dart @@ -73,7 +73,7 @@ class _MxcImageState extends State { final event = widget.event; if (uri != null) { - final devicePixelRatio = MediaQuery.of(context).devicePixelRatio; + final devicePixelRatio = MediaQuery.devicePixelRatioOf(context); final width = widget.width; final realWidth = width == null ? null : width * devicePixelRatio; final height = widget.height; diff --git a/lib/widgets/mxc_image_viewer.dart b/lib/widgets/mxc_image_viewer.dart index 1d806d858..be075d79b 100644 --- a/lib/widgets/mxc_image_viewer.dart +++ b/lib/widgets/mxc_image_viewer.dart @@ -35,7 +35,7 @@ class MxcImageViewer extends StatelessWidget { maxScale: 10.0, onInteractionEnd: (endDetails) { if (endDetails.velocity.pixelsPerSecond.dy > - MediaQuery.of(context).size.height * 1.5) { + MediaQuery.sizeOf(context).height * 1.5) { Navigator.of(context, rootNavigator: false).pop(); } },