Merge pull request OpenFlutter#211 from idootop/master

fix OpenFlutter#196, OpenFlutter#209
HannibalKcc · Feb 5, 2021 · 65459b0 · 65459b0
2 parents 7dcf623 + 170cbf1
commit 65459b0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ class MyApp extends StatelessWidget {
     return ScreenUtilInit(
       designSize: Size(360, 690),
       allowFontScaling: false,
-      child: MaterialApp(
+      builder: () => MaterialApp(
         ...
       ),
     );

diff --git a/README_CN.md b/README_CN.md
@@ -58,7 +58,7 @@ class MyApp extends StatelessWidget {
     return ScreenUtilInit(
       designSize: Size(360, 690),
       allowFontScaling: false,
-      child: MaterialApp(
+      builder: () => MaterialApp(
         ...
       ),
     );

diff --git a/README_PT.md b/README_PT.md
@@ -54,7 +54,7 @@ class MyApp extends StatelessWidget {
     return ScreenUtilInit(
       designSize: Size(360, 690),
       allowFontScaling: false,
-      child: MaterialApp(
+      builder: () => MaterialApp(
         ...
       ),
     );

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -10,7 +10,7 @@ class MyApp extends StatelessWidget {
     return ScreenUtilInit(
       designSize: Size(360, 690),
       allowFontScaling: false,
-      child: MaterialApp(
+      builder: () => MaterialApp(
         debugShowCheckedModeBanner: false,
         title: 'Flutter_ScreenUtil',
         theme: ThemeData(

diff --git a/example/lib/main_zh.dart b/example/lib/main_zh.dart
@@ -10,7 +10,7 @@ class MyApp extends StatelessWidget {
     return ScreenUtilInit(
       designSize: Size(750, 1334),
       allowFontScaling: false,
-      child: MaterialApp(
+      builder: () => MaterialApp(
         debugShowCheckedModeBanner: false,
         title: 'Flutter_ScreenUtil',
         theme: ThemeData(

diff --git a/lib/screenutil_init.dart b/lib/screenutil_init.dart
@@ -5,13 +5,13 @@ import 'screenutil.dart';
 class ScreenUtilInit extends StatelessWidget {
   /// A helper widget that initializes [ScreenUtil]
   ScreenUtilInit({
-    required this.child,
+    required this.builder,
     this.designSize = ScreenUtil.defaultSize,
     this.allowFontScaling = false,
     Key? key,
   }) : super(key: key);
 
-  final Widget child;
+  final Widget Function() builder;
 
   /// The [Size] of the device in the design draft, in dp
   final Size designSize;
@@ -31,7 +31,7 @@ class ScreenUtilInit extends StatelessWidget {
             allowFontScaling: allowFontScaling,
           );
         }
-        return child;
+        return builder();
       },
     );
   }