Merge pull request #378 from Mounir-Bouaiche/master

Bug Fix: Reaching context that no longer used. (state: DEFUNCT)

@@ -77,15 +77,19 @@ class ScreenUtil {
   static void init(
   static void init(
     BuildContext? context, {
     BuildContext? context, {
     Orientation? orientation,
     Orientation? orientation,
+    Size? deviceSize,
     Size designSize = defaultSize,
     Size designSize = defaultSize,
     bool splitScreenMode = false,
     bool splitScreenMode = false,
     bool minTextAdapt = false,
     bool minTextAdapt = false,
   }) {
   }) {
-    final deviceData = context != null
-        ? MediaQuery.maybeOf(context).nonEmptySizeOrNull()
+    final mediaQueryContext =
+        context?.getElementForInheritedWidgetOfExactType<MediaQuery>();
+
+    final deviceData = mediaQueryContext != null
+        ? MediaQuery.of(context!).nonEmptySizeOrNull()
         : null;
         : null;
 
 
-    Size deviceSize = deviceData?.size ?? designSize;
+    deviceSize ??= deviceData?.size ?? designSize;
     orientation ??= deviceData?.orientation ??
     orientation ??= deviceData?.orientation ??
         (deviceSize.width > deviceSize.height
         (deviceSize.width > deviceSize.height
             ? Orientation.landscape
             ? Orientation.landscape
@@ -98,7 +102,7 @@ class ScreenUtil {
       .._orientation = orientation
       .._orientation = orientation
       .._screenWidth = deviceSize.width
       .._screenWidth = deviceSize.width
       .._screenHeight = deviceSize.height
       .._screenHeight = deviceSize.height
-      ..context = context;
+      ..context = mediaQueryContext;
   }
   }
 
 
   ///获取屏幕方向
   ///获取屏幕方向