0.6.0

lizhuoyuan
Commit 8e405a1a0c495d2e2dda86f179ca033e96830273 8e405a1a 1 parent b002b5cf
Showing 6 changed files with 169 additions and 113 deletions
.packages
CHANGELOG.md
example/pubspec.lock
lib/flutter_screenutil.dart
pubspec.lock
pubspec.yaml
--- a/.packages
View file @8e405a1
+++ b/.packages
View file @8e405a1
-# Generated by pub on 2019-06-24 14:51:33.826233.
-async:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.1.0/lib/
-boolean_selector:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.4/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/
+# Generated by pub on 2019-08-23 16:15:58.801584.
+async:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.2.0/lib/
+boolean_selector:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-1.0.4/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/
 flutter:file:///D:/flutter/packages/flutter/lib/
 flutter_test:file:///D:/flutter/packages/flutter_test/lib/
-matcher:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.5/lib/
-meta:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib/
-path:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib/
-pedantic:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.5.0/lib/
-quiver:file:///D:/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.2/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.6/lib/
+path:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.2/lib/
+pedantic:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.7.0/lib/
+quiver:file:///D:/flutter/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.0.3/lib/
 sky_engine:file:///D:/flutter/bin/cache/pkg/sky_engine/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.4/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.4/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/
+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.4/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/
 flutter_screenutil:lib/
--- a/CHANGELOG.md
View file @8e405a1
+++ b/CHANGELOG.md
View file @8e405a1
-## [0.0.1] - first version
+<!--
+ * @Author: zhuoyuan93@gmail.com
+ * @Date: 2018-10-16 19:43:03
+ * @LastEditors: zhuoyuan93@gmail.com
+ * @LastEditTime: 2019-08-23 16:26:24
+ * @Description: Update log
+ -->
-## [0.2.2] - Fixed bug when releasing
+# 0.0.1
-## [0.2.2] - Optimize documentation
+- first version
-## [0.3.0] - Add font size adaptation
+# 0.0.2
-## [0.3.0] - Perfect documentation
-Width is enlarged relative to the design draft => The ratio of font and width to the size of the design
-Height is enlarged relative to the design draft => The ratio of  height width to the size of the design
+- Fixed bug when releasing
-## [0.4.0] - Optimize font adaptation method
+# 0.2.2
-## [0.4.1] - Fix font adaptation issues
+- Optimize documentation
-## [0.4.2] - add two Properties
+# 0.3.0
-  ///Current device width dp <br/>
-  ///当前设备宽度 dp <br/>
-  ScreenUtil.screenWidthDp 
+- Add font size adaptation
-  ///Current device height dp <br/>
-  ///当前设备高度 dp <br/>
-  ScreenUtil.screenHeightDp   
+# 0.3.1
-## [0.4.2] - Modify the font to change with the system zoom mode. The default value is false.
+- Perfect documentation
+- Width is enlarged relative to the design draft => The ratio of font and width to the size of the design
+- Height is enlarged relative to the design draft => The ratio of height width to the size of the design
-setSp(int fontSize, [allowFontScaling = false]) => allowFontScaling
-      ? setWidth(fontSize) * _textScaleFactor
-      : setWidth(fontSize);
+# 0.4.0
-## [0.4.4] - Fix bugs that default fonts change with the system
+- Optimize font adaptation method
-## [0.5.1] - Fix the wrong way of using 
+# 0.4.1
-It is recommended to  use `ScreenUtil.getInstance()` instead of `ScreenUtil()` , for example: `ScreenUtil.getInstance().setHeight(25)` instead of `ScreenUtil().setHeight(25)`
+- Fix font adaptation issues
-## [0.5.2] - Change the parameter type from int to double
+# 0.4.2
-setWidth,setHeight,setSp.
-for example:
-you can use setWidth(100) or setWidth(100.0) 
+- add two Properties
+- ///Current device width dp
+- ///当前设备宽度 dp
+- ScreenUtil.screenWidthDp
-## [0.5.3] - Change the units of statusBarHeight and bottomBarHeight to dp
+- ///Current device height dp
+- ///当前设备高度 dp
+- ScreenUtil.screenHeightDp
+
+# 0.4.3
+
+- Modify the font to change with the system zoom mode. The default value is false.
+
+- setSp(int fontSize, [allowFontScaling = false]) => allowFontScaling
+? setWidth(fontSize) \* \_textScaleFactor
+: setWidth(fontSize);
+
+# 0.4.4
+
+- Fix bugs that default fonts change with the system
+
+# 0.5.1
+
+- Fix the wrong way of using
+
+- It is recommended to use `ScreenUtil.getInstance()` instead of `ScreenUtil()` , for example: `ScreenUtil.getInstance().setHeight(25)` instead of `ScreenUtil().setHeight(25)`
+
+# 0.5.2
+
+- Change the parameter type from int to double
+
+- setWidth,setHeight,setSp. for example: you can use setWidth(100) or setWidth(100.0)
+
+# 0.5.3
+
+- Change the units of statusBarHeight and bottomBarHeight to dp
+
+# 0.6.0
+
+- Completing comments , adding English commentsWelcome to add, correct
--- a/example/pubspec.lock
View file @8e405a1
+++ b/example/pubspec.lock
View file @8e405a1
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.14.11"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.2"
   flutter:
@@ -47,7 +47,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.5.3"
+    version: "0.6.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -57,37 +57,37 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.5"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.2"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.5.0"
+    version: "1.7.0"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -97,57 +97,57 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.5.5"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.9.3"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.4"
+    version: "0.2.5"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
 sdks:
-  dart: ">=2.2.0 <3.0.0"
+  dart: ">=2.2.2 <3.0.0"
--- a/lib/flutter_screenutil.dart
View file @8e405a1
+++ b/lib/flutter_screenutil.dart
View file @8e405a1
@@ -8,9 +8,13 @@ import 'package:flutter/material.dart';
 class ScreenUtil {
   static ScreenUtil instance = new ScreenUtil();
-  //设计稿的设备尺寸修改
+  /// UI设计中手机尺寸 , px
+  /// Size of the phone in UI Design , px
   double width;
   double height;
+
+  /// 控制字体是否要根据系统的“字体大小”辅助选项来进行缩放。默认值为false。
+  /// allowFontScaling Specifies whether fonts should scale to respect Text Size accessibility settings. The default is false.
   bool allowFontScaling;
   static MediaQueryData _mediaQueryData;
@@ -46,49 +50,66 @@ class ScreenUtil {
   static MediaQueryData get mediaQueryData => _mediaQueryData;
-  ///每个逻辑像素的字体像素数，字体的缩放比例
+  /// 每个逻辑像素的字体像素数，字体的缩放比例
+  /// The number of font pixels for each logical pixel.
   static double get textScaleFactory => _textScaleFactor;
-  ///设备的像素密度
+  /// 设备的像素密度
+  /// The size of the media in logical pixels (e.g, the size of the screen).
   static double get pixelRatio => _pixelRatio;
-  ///当前设备宽度 dp
+  /// 当前设备宽度 dp
+  /// The horizontal extent of this size.
   static double get screenWidthDp => _screenWidth;
   ///当前设备高度 dp
+  ///The vertical extent of this size. dp
   static double get screenHeightDp => _screenHeight;
-  ///当前设备宽度 px
+  /// 当前设备宽度 px
+  /// The vertical extent of this size. px
   static double get screenWidth => _screenWidth * _pixelRatio;
-  ///当前设备高度 px
+  /// 当前设备高度 px
+  /// The vertical extent of this size. px
   static double get screenHeight => _screenHeight * _pixelRatio;
-  ///状态栏高度 dp 刘海屏会更高
+  /// 状态栏高度 dp 刘海屏会更高
+  /// The offset from the top
   static double get statusBarHeight => _statusBarHeight;
-  ///底部安全区距离 dp
+  /// 底部安全区距离 dp
+  /// The offset from the bottom.
   static double get bottomBarHeight => _bottomBarHeight;
-  ///实际的dp与设计稿px的比例
+  /// 实际的dp与UI设计px的比例
+  /// The ratio of the actual dp to the design draft px
   get scaleWidth => _screenWidth / instance.width;
   get scaleHeight => _screenHeight / instance.height;
-  ///根据设计稿的设备宽度适配
-  ///高度也根据这个来做适配可以保证不变形
+  /// 根据UI设计的设备宽度适配
+  /// 高度也可以根据这个来做适配可以保证不变形,比如你先要一个正方形的时候.
+  /// Adapted to the device width of the UI Design.
+  /// Height can also be adapted according to this to ensure no deformation ,
+  /// if you want a square
   setWidth(double width) => width * scaleWidth;
-  /// 根据设计稿的设备高度适配
-  /// 当发现设计稿中的一屏显示的与当前样式效果不符合时,
-  /// 或者形状有差异时,高度适配建议使用此方法
-  /// 高度适配主要针对想根据设计稿的一屏展示一样的效果
+  /// 根据UI设计的设备高度适配
+  /// 当发现UI设计中的一屏显示的与当前样式效果不符合时,
+  /// 或者形状有差异时,建议使用此方法实现高度适配.
+  /// 高度适配主要针对想根据UI设计的一屏展示一样的效果
+  /// Highly adaptable to the device according to UI Design
+  /// It is recommended to use this method to achieve a high degree of adaptation
+  /// when it is found that one screen in the UI design
+  /// does not match the current style effect, or if there is a difference in shape.
   setHeight(double height) => height * scaleHeight;
   ///字体大小适配方法
-  ///@param fontSize 传入设计稿上字体的px ,
-  ///@param allowFontScaling 控制字体是否要根据系统的“字体大小”辅助选项来进行缩放。默认值为false。
-  ///@param allowFontScaling Specifies whether fonts should scale to respect Text Size accessibility settings. The default is false.
+  ///@param [fontSize] UI设计上字体的大小,单位px.
+  ///Font size adaptation method
+  ///@param [fontSize] The size of the font on the UI design, in px.
+  ///@param [allowFontScaling]
   setSp(double fontSize) => allowFontScaling
       ? setWidth(fontSize)
       : setWidth(fontSize) / _textScaleFactor;
--- a/pubspec.lock
View file @8e405a1
+++ b/pubspec.lock
View file @8e405a1
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.14.11"
   flutter:
@@ -43,37 +43,37 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.5"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.2"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.5.0"
+    version: "1.7.0"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -83,57 +83,57 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.5.5"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.9.3"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.4"
+    version: "0.2.5"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
 sdks:
-  dart: ">=2.2.0 <3.0.0"
+  dart: ">=2.2.2 <3.0.0"
--- a/pubspec.yaml
View file @8e405a1
+++ b/pubspec.yaml
View file @8e405a1
 name: flutter_screenutil
 description: A flutter plugin for adapting screen and font size.Guaranteed to look good on different models
-version: 0.5.3
+version: 0.6.0
 author: LiZhuoyuan <zhuoyuan93@gmail.com>
 homepage: https://github.com/OpenFlutter/flutter_ScreenUtil