added screen size as an extension

offa · May 7, 2023 · c238c5a · c238c5a
1 parent 3d3c539
commit c238c5a
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 19 deletions.
diff --git a/lib/extensions/screen_size.dart b/lib/extensions/screen_size.dart
@@ -0,0 +1,5 @@
+import 'package:flutter/material.dart';
+
+extension SizeExtension on BuildContext {
+  Size get screenSize => MediaQuery.of(this).size;
+}
diff --git a/lib/screens/artist_page.dart b/lib/screens/artist_page.dart
@@ -4,6 +4,7 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:musify/API/musify.dart';
 import 'package:musify/extensions/l10n.dart';
+import 'package:musify/extensions/screen_size.dart';
 import 'package:musify/services/audio_manager.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/utilities/flutter_toast.dart';
@@ -101,7 +102,7 @@ class _ArtistPagePageState extends State<ArtistPage> {
                 ],
               )
             : SizedBox(
-                height: MediaQuery.of(context).size.height - 100,
+                height: context.screenSize.height - 100,
                 child: const Spinner(),
               ),
       ),
@@ -245,7 +246,7 @@ class _ArtistPagePageState extends State<ArtistPage> {
       );
     else
       return SizedBox(
-        height: MediaQuery.of(context).size.height - 100,
+        height: context.screenSize.height - 100,
         child: const Spinner(),
       );
   }
@@ -281,7 +282,7 @@ class _ArtistPagePageState extends State<ArtistPage> {
               children: <Widget>[
                 Padding(
                   padding: EdgeInsets.only(
-                    top: MediaQuery.of(context).size.height / 55,
+                    top: context.screenSize.height / 55,
                     bottom: 10,
                     left: 20,
                     right: 20,

diff --git a/lib/screens/home_page.dart b/lib/screens/home_page.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:musify/API/musify.dart';
 import 'package:musify/extensions/l10n.dart';
+import 'package:musify/extensions/screen_size.dart';
 import 'package:musify/screens/artist_page.dart';
 import 'package:musify/screens/playlists_page.dart';
 import 'package:musify/services/offline_audio.dart';
@@ -51,8 +52,7 @@ class _HomePageState extends State<HomePage> {
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
                                 SizedBox(
-                                  width:
-                                      MediaQuery.of(context).size.width / 1.4,
+                                  width: context.screenSize.width / 1.4,
                                   child: MarqueeWidget(
                                     direction: Axis.horizontal,
                                     child: Text(
@@ -84,7 +84,7 @@ class _HomePageState extends State<HomePage> {
                             ),
                           ),
                           SizedBox(
-                            height: MediaQuery.of(context).size.height * 0.25,
+                            height: context.screenSize.height * 0.25,
                             child: ListView.separated(
                               scrollDirection: Axis.horizontal,
                               separatorBuilder: (_, __) =>
@@ -115,8 +115,7 @@ class _HomePageState extends State<HomePage> {
             FutureBuilder(
               future: getArtists(),
               builder: (context, AsyncSnapshot<List<ArtistModel>> data) {
-                final calculatedSize =
-                    MediaQuery.of(context).size.height * 0.25;
+                final calculatedSize = context.screenSize.height * 0.25;
                 return data.hasData
                     ? Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
@@ -132,8 +131,7 @@ class _HomePageState extends State<HomePage> {
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
                                 SizedBox(
-                                  width:
-                                      MediaQuery.of(context).size.width / 1.4,
+                                  width: context.screenSize.width / 1.4,
                                   child: MarqueeWidget(
                                     direction: Axis.horizontal,
                                     child: Text(
@@ -242,7 +240,7 @@ class _HomePageState extends State<HomePage> {
                       children: <Widget>[
                         Padding(
                           padding: EdgeInsets.only(
-                            top: MediaQuery.of(context).size.height / 55,
+                            top: context.screenSize.height / 55,
                             bottom: 10,
                             left: 20,
                             right: 20,

diff --git a/lib/screens/player.dart b/lib/screens/player.dart
@@ -6,6 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:just_audio/just_audio.dart';
 import 'package:musify/API/musify.dart';
 import 'package:musify/extensions/l10n.dart';
+import 'package:musify/extensions/screen_size.dart';
 import 'package:musify/services/audio_manager.dart';
 import 'package:musify/services/download_manager.dart';
 import 'package:musify/services/settings_manager.dart';
@@ -25,7 +26,7 @@ class AudioApp extends StatefulWidget {
 class AudioAppState extends State<AudioApp> {
   @override
   Widget build(BuildContext context) {
-    final size = MediaQuery.of(context).size;
+    final size = context.screenSize;
     final w70 = size.width - 70;
     return Scaffold(
       appBar: AppBar(

diff --git a/lib/screens/playlist_page.dart b/lib/screens/playlist_page.dart
@@ -3,6 +3,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:musify/API/musify.dart';
 import 'package:musify/extensions/l10n.dart';
+import 'package:musify/extensions/screen_size.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/utilities/flutter_toast.dart';
 import 'package:musify/widgets/playlist_cube.dart';
@@ -103,7 +104,7 @@ class _PlaylistPageState extends State<PlaylistPage> {
                 ],
               )
             : SizedBox(
-                height: MediaQuery.of(context).size.height - 100,
+                height: context.screenSize.height - 100,
                 child: const Spinner(),
               ),
       ),
@@ -191,7 +192,7 @@ class _PlaylistPageState extends State<PlaylistPage> {
       );
     else
       return SizedBox(
-        height: MediaQuery.of(context).size.height - 100,
+        height: context.screenSize.height - 100,
         child: const Spinner(),
       );
   }

diff --git a/lib/screens/root_page.dart b/lib/screens/root_page.dart
@@ -5,6 +5,7 @@ import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:just_audio/just_audio.dart';
 import 'package:musify/extensions/l10n.dart';
+import 'package:musify/extensions/screen_size.dart';
 import 'package:musify/main.dart';
 import 'package:musify/screens/home_page.dart';
 import 'package:musify/screens/more_page.dart';
@@ -262,9 +263,8 @@ class AppState extends State<Musify> {
                                 processingState == ProcessingState.buffering) {
                               return Container(
                                 margin: const EdgeInsets.all(8),
-                                width: MediaQuery.of(context).size.width * 0.08,
-                                height:
-                                    MediaQuery.of(context).size.width * 0.08,
+                                width: context.screenSize.width * 0.08,
+                                height: context.screenSize.width * 0.08,
                                 child: CircularProgressIndicator(
                                   valueColor: AlwaysStoppedAnimation<Color>(
                                     colorScheme.primary,

diff --git a/lib/widgets/artist_cube.dart b/lib/widgets/artist_cube.dart
@@ -1,5 +1,6 @@
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
+import 'package:musify/extensions/screen_size.dart';
 import 'package:musify/style/app_themes.dart';
 
 class ArtistCube extends StatelessWidget {
@@ -12,7 +13,7 @@ class ArtistCube extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final calculatedSize = MediaQuery.of(context).size.height * 0.25;
+    final calculatedSize = context.screenSize.height * 0.25;
     return ClipRRect(
       borderRadius: BorderRadius.circular(150),
       child: Container(

diff --git a/lib/widgets/playlist_cube.dart b/lib/widgets/playlist_cube.dart
@@ -2,6 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
 import 'package:musify/API/musify.dart';
+import 'package:musify/extensions/screen_size.dart';
 import 'package:musify/screens/playlist_page.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/widgets/delayed_display.dart';
@@ -29,7 +30,7 @@ class PlaylistCube extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final calculatedSize = MediaQuery.of(context).size.height * 0.25;
+    final calculatedSize = context.screenSize.height * 0.25;
     return Stack(
       children: <Widget>[
         DelayedDisplay(