1.0.0

fix OpenFlutter#68
fix OpenFlutter#87

.packages

@@ -1,22 +1,29 @@
-# Generated by pub on 2019-11-29 11:43:17.634960.
-async:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.3.0/lib/
-boolean_selector:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-1.0.5/lib/
-charcode:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.2/lib/
-collection:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.11/lib/
+# Generated by pub on 2020-01-06 16:51:35.863956.
+archive:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/archive-2.0.11/lib/
+args:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.5.2/lib/
+async:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.4.0/lib/
+boolean_selector:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.5/lib/
+charcode:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib/
+collection:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib/
+convert:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/lib/
+crypto:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.3/lib/
 flutter:file:///D:/flutter/packages/flutter/lib/
 flutter_test:file:///D:/flutter/packages/flutter_test/lib/
-matcher:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.5/lib/
-meta:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.7/lib/
-path:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.4/lib/
-pedantic:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.8.0+1/lib/
-quiver:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.0.5/lib/
+image:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/image-2.1.4/lib/
+matcher:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.6/lib/
+meta:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.8/lib/
+path:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.4/lib/
+pedantic:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.8.0+1/lib/
+petitparser:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/petitparser-2.4.0/lib/
+quiver:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.5/lib/
 sky_engine:file:///D:/flutter/bin/cache/pkg/sky_engine/lib/
-source_span:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.5/lib/
-stack_trace:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3/lib/
-stream_channel:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0/lib/
-string_scanner:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.5/lib/
-term_glyph:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0/lib/
-test_api:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.5/lib/
-typed_data:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6/lib/
-vector_math:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8/lib/
+source_span:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.5/lib/
+stack_trace:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib/
+stream_channel:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.0.0/lib/
+string_scanner:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.5/lib/
+term_glyph:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/lib/
+test_api:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.11/lib/
+typed_data:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib/
+vector_math:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib/
+xml:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/xml-3.5.0/lib/
 flutter_screenutil:lib/

CHANGELOG.md

@@ -2,10 +2,19 @@
  * @Author: zhuoyuan93@gmail.com
  * @Date: 2018-10-16 19:43:03
  * @LastEditors: zhuoyuan93@gmail.com
- * @LastEditTime: 2019-11-29 11:42
+ * @LastEditTime: 2020年1月6日 16:41:02
  * @Description: Update log
  -->
-
+
+#1.0.0
+- Rebuild code, change API
+- Modify the initialization method
+- Fix #68
+- CompileSdkVersion change to 28
+- Change example code
+
+If there is significant impact, please return to 0.7.0
+
 #0.7.0
 
 - Replace textScaleFactory with textScaleFactor , It's a typo.

README.md

@@ -23,7 +23,7 @@ dependencies:
   flutter:
     sdk: flutter
   # add flutter_screenutil
-  flutter_screenutil: ^0.7.0
+  flutter_screenutil: ^1.0.0
 ```
 
 ### Add the following imports to your Dart code:
@@ -48,13 +48,13 @@ Be sure to set the page in the MaterialApp's home(ie the entry file, just set it
 //fill in the screen size of the device in the design
 
 //default value : width : 1080px , height:1920px , allowFontScaling:false
-ScreenUtil.instance = ScreenUtil.getInstance()..init(context);
+ScreenUtil.init(context);
 
 //If the design is based on the size of the iPhone6 ​​(iPhone6 ​​750*1334)
-ScreenUtil.instance = ScreenUtil(width: 750, height: 1334)..init(context);
+ScreenUtil.init(context, width: 750, height: 1334);
 
 //If you want to set the font size is scaled according to the system's "font size" assist option
-ScreenUtil.instance = ScreenUtil(width: 750, height: 1334, allowFontScaling: true)..init(context);
+ScreenUtil.init(context, width: 750, height: 1334, allowFontScaling: true);
 
 ```
 
@@ -64,12 +64,9 @@ ScreenUtil.instance = ScreenUtil(width: 750, height: 1334, allowFontScaling: tru
 
 Pass the px size of the design draft：
 
-Adapted to screen width: `ScreenUtil.getInstance().setWidth(540)`,
+Adapted to screen width: `ScreenUtil().setWidth(540)`,
 
-Adapted to screen height: `ScreenUtil.getInstance().setHeight(200)`,
-
-You can also use `ScreenUtil()` instead of `ScreenUtil.getInstance()`,
-for example:`ScreenUtil().setHeight(200)`
+Adapted to screen height: `ScreenUtil().setHeight(200)`,
 
 **Note** 
 
@@ -81,15 +78,15 @@ setHeight method is mainly adapted in height, you want to control the height and
 //for example:
 //rectangle
 Container(
-           width: ScreenUtil.getInstance().setWidth(375),
-           height: ScreenUtil.getInstance().setHeight(200),
+           width: ScreenUtil().setWidth(375),
+           height: ScreenUtil().setHeight(200),
            ...
             ),
             
 ////If you want to display a square:
 Container(
-           width: ScreenUtil.getInstance().setWidth(300),
-           height: ScreenUtil.getInstance().setWidth(300),
+           width: ScreenUtil().setWidth(300),
+           height: ScreenUtil().setWidth(300),
             ),
             
 ```
@@ -98,11 +95,11 @@ Container(
 ``` dart
 //Incoming font size，the unit is pixel, fonts will not scale to respect Text Size accessibility settings
 //(AllowallowFontScaling when initializing ScreenUtil)
-ScreenUtil.getInstance().setSp(28)    
+ScreenUtil().setSp(28)    
      
 //Incoming font size，the unit is pixel，fonts will scale to respect Text Size accessibility settings
 //(If somewhere does not follow the global allowFontScaling setting)
-ScreenUtil(allowFontScaling: true).setSp(28)  
+ScreenUtil().setSp(24, allowFontScalingSelf: true)
 
 //for example:
 
@@ -113,18 +110,16 @@ Column(
                     'My font size is 24px on the design draft and will not change with the system.',
                     style: TextStyle(
                       color: Colors.black,
-                      fontSize: ScreenUtil.getInstance().setSp(24),
+                      fontSize: ScreenUtil().setSp(24),
                     )),
                 Text(
                     'My font size is 24px on the design draft and will change with the system.',
                     style: TextStyle(
-                      color: Colors.black,
-                      fontSize: ScreenUtil(allowFontScaling: true).setSp(24),
-                    )),
+                        color: Colors.black,
+                        fontSize: ScreenUtil()
+                            .setSp(24, allowFontScalingSelf: true))),
               ],
             )
-
-
 ```
 
 #### Other related apis：
@@ -136,39 +131,60 @@ Column(
     ScreenUtil.statusBarHeight  //Status bar height , Notch will be higher Unit px
     ScreenUtil.textScaleFactor //System font scaling factor
 
-    ScreenUtil.getInstance().scaleWidth //Ratio of actual width dp to design draft px
-    ScreenUtil.getInstance().scaleHeight //Ratio of actual height dp to design draft px
+    ScreenUtil().scaleWidth //Ratio of actual width dp to design draft px
+    ScreenUtil().scaleHeight //Ratio of actual height dp to design draft px
 
 ```
 
 ```dart
 //import
+import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-...
+void main() => runApp(new MyApp());
 
+class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    ///Set the fit size (fill in the screen size of the device in the design) If the design is based on the size of the iPhone6 ​​(iPhone6 ​​750*1334)
-    ScreenUtil.instance = ScreenUtil(width: 750, height: 1334)..init(context);
-    
-    print('Device width:${ScreenUtil.screenWidth}'); //Device width
-    print('Device height:${ScreenUtil.screenHeight}'); //Device height
-    print(
-        'Device pixel density:${ScreenUtil.pixelRatio}'); //Device pixel density
-    print(
-        'Bottom safe zone distance:${ScreenUtil.bottomBarHeight}'); //Bottom safe zone distance，suitable for buttons with full screen
-    print(
-        'Status bar height:${ScreenUtil.statusBarHeight}px'); //Status bar height , Notch will be higher Unit px
-    print(
-        'Ratio of actual width dp to design draft px:${ScreenUtil.getInstance().scaleWidth}'); 
-    print(
-        'Ratio of actual height dp to design draft px:${ScreenUtil.getInstance().scaleHeight}'); 
-    print(
-        'The ratio of font and width to the size of the design:${ScreenUtil.getInstance().scaleWidth * ScreenUtil.pixelRatio}');
-    print(
-        'The ratio of  height width to the size of the design:${ScreenUtil.getInstance().scaleHeight * ScreenUtil.pixelRatio}');
-        
+    return new MaterialApp(
+      debugShowCheckedModeBanner: false,
+      title: 'Flutter_ScreenUtil',
+      theme: new ThemeData(
+        primarySwatch: Colors.blue,
+      ),
+      home: new MyHomePage(),
+    );
+  }
+}
+
+class MyHomePage extends StatefulWidget {
+  @override
+  _MyHomePageState createState() => new _MyHomePageState();
+}
+
+class _MyHomePageState extends State<MyHomePage> {
+  @override
+  Widget build(BuildContext context) {
+    //Set the fit size (fill in the screen size of the device in the design) If the design is based on the size of the iPhone6 ​​(iPhone6 ​​750*1334)
+    ScreenUtil.init(context, width: 750, height: 1334, allowFontScaling: false);
+
+    return ExampleWidget(title: 'FlutterScreenUtil Demo');
+  }
+}
+
+class ExampleWidget extends StatefulWidget {
+  const ExampleWidget({Key key, this.title}) : super(key: key);
+
+  final String title;
+
+  @override
+  _ExampleWidgetState createState() => _ExampleWidgetState();
+}
+
+class _ExampleWidgetState extends State<ExampleWidget> {
+  @override
+  Widget build(BuildContext context) {
+    printScreenInformation();
     return new Scaffold(
       appBar: new AppBar(
         title: new Text(widget.title),
@@ -180,52 +196,48 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
             Row(
               children: <Widget>[
                 Container(
-                  padding: EdgeInsets.all(ScreenUtil.getInstance().setWidth(10)),
-                  width: ScreenUtil.getInstance().setWidth(375),
-                  height: ScreenUtil.getInstance().setHeight(200),
+                  padding: EdgeInsets.all(ScreenUtil().setWidth(10)),
+                  width: ScreenUtil().setWidth(375),
+                  height: ScreenUtil().setHeight(200),
                   color: Colors.red,
                   child: Text(
-                    'My width:${ScreenUtil.getInstance().setWidth(375)}dp',
+                    'My width:${ScreenUtil().setWidth(375)}dp \n'
+                    'My height:${ScreenUtil().setHeight(200)}dp',
                     style: TextStyle(
-                        color: Colors.white,
-                        fontSize: ScreenUtil.getInstance().setSp(12)),
+                        color: Colors.white, fontSize: ScreenUtil().setSp(24)),
                   ),
                 ),
                 Container(
-                  padding: EdgeInsets.all(ScreenUtil.getInstance().setWidth(10)),
-                  width: ScreenUtil.getInstance().setWidth(375),
-                  height: ScreenUtil.getInstance().setHeight(200),
+                  padding: EdgeInsets.all(ScreenUtil().setWidth(10)),
+                  width: ScreenUtil().setWidth(375),
+                  height: ScreenUtil().setHeight(200),
                   color: Colors.blue,
-                  child: Text('My width:${ScreenUtil.getInstance().setWidth(375)}dp',
+                  child: Text(
+                      'My width:${ScreenUtil().setWidth(375)}dp \n'
+                      'My height:${ScreenUtil().setHeight(200)}dp',
                       style: TextStyle(
                           color: Colors.white,
-                          fontSize: ScreenUtil.getInstance().setSp(12))),
+                          fontSize: ScreenUtil().setSp(24))),
                 ),
               ],
             ),
             Text('Device width:${ScreenUtil.screenWidth}px'),
             Text('Device height:${ScreenUtil.screenHeight}px'),
+            Text('Device width:${ScreenUtil.screenWidthDp}dp'),
+            Text('Device height:${ScreenUtil.screenHeightDp}dp'),
             Text('Device pixel density:${ScreenUtil.pixelRatio}'),
-            Text('Bottom safe zone distance:${ScreenUtil.bottomBarHeight}px'),
-            Text('Status bar height:${ScreenUtil.statusBarHeight}px'),
+            Text('Bottom safe zone distance:${ScreenUtil.bottomBarHeight}dp'),
+            Text('Status bar height:${ScreenUtil.statusBarHeight}dp'),
             Text(
-              'Ratio of actual width dp to design draft px:${ScreenUtil.getInstance().scaleWidth}',
+              'Ratio of actual width dp to design draft px:${ScreenUtil().scaleWidth}',
               textAlign: TextAlign.center,
             ),
             Text(
-              'Ratio of actual height dp to design draft px:${ScreenUtil.getInstance().scaleHeight}',
-              textAlign: TextAlign.center,
-            ),
-            Text(
-              'The ratio of font and width to the size of the design:${ScreenUtil.getInstance().scaleWidth * ScreenUtil.pixelRatio}',
-              textAlign: TextAlign.center,
-            ),
-            Text(
-              'The ratio of  height width to the size of the design:${ScreenUtil.getInstance().scaleHeight * ScreenUtil.pixelRatio}',
+              'Ratio of actual height dp to design draft px:${ScreenUtil().scaleHeight}',
               textAlign: TextAlign.center,
             ),
             SizedBox(
-              height: ScreenUtil.getInstance().setHeight(100),
+              height: ScreenUtil().setHeight(100),
             ),
             Text('System font scaling factor:${ScreenUtil.textScaleFactor}'),
             Column(
@@ -235,27 +247,57 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
                     'My font size is 24px on the design draft and will not change with the system.',
                     style: TextStyle(
                       color: Colors.black,
-                      fontSize: ScreenUtil.getInstance().setSp(24),
+                      fontSize: ScreenUtil().setSp(24),
                     )),
                 Text(
                     'My font size is 24px on the design draft and will change with the system.',
                     style: TextStyle(
-                      color: Colors.black,
-                      fontSize: ScreenUtil(allowFontScaling: true).setSp(24),
-                    )),
+                        color: Colors.black,
+                        fontSize: ScreenUtil()
+                            .setSp(24, allowFontScalingSelf: true))),
               ],
             )
           ],
         ),
       ),
+      floatingActionButton: FloatingActionButton(
+        child: Icon(Icons.title),
+        onPressed: () {
+          ScreenUtil.init(context,
+              width: 1500, height: 1334, allowFontScaling: false);
+          setState(() {});
+        },
+      ),
     );
   }
+
+  void printScreenInformation() {
+    print('Device width px:${ScreenUtil.screenWidth}'); //Device width
+    print('Device height px:${ScreenUtil.screenHeight}'); //Device height
+    print(
+        'Device pixel density:${ScreenUtil.pixelRatio}'); //Device pixel density
+    print(
+        'Bottom safe zone distance dp:${ScreenUtil.bottomBarHeight}'); //Bottom safe zone distance，suitable for buttons with full screen
+    print(
+        'Status bar height px:${ScreenUtil.statusBarHeight}dp'); //Status bar height , Notch will be higher Unit px
+    print(
+        'Ratio of actual width dp to design draft px:${ScreenUtil().scaleWidth}');
+    print(
+        'Ratio of actual height dp to design draft px:${ScreenUtil().scaleHeight}');
+    print(
+        'The ratio of font and width to the size of the design:${ScreenUtil().scaleWidth * ScreenUtil.pixelRatio}');
+    print(
+        'The ratio of  height width to the size of the design:${ScreenUtil().scaleHeight * ScreenUtil.pixelRatio}');
+  }
+}
+
 ```
 
 ### example:
 
-[example demo](/example/lib/main_zh.dart)
+[example demo](/example/lib/main.dart)
 
 effect:
 
-![效果](demo_en.png)
+![effect](demo_en.png)
+![tablet effect](demo_tablet_en.png)