0.7.0 修复一个拼写错误

lizhuoyuan
Commit ccb666f4b837dea03e1564925c33c4d384d4d0bf ccb666f4 1 parent 5a775c5a
Showing 9 changed files with 190 additions and 186 deletions
.packages
CHANGELOG.md
README_CN.md
README_PT.md
example/lib/main.dart
example/lib/main_zh.dart
example/pubspec.lock
pubspec.lock
pubspec.yaml
--- a/.packages
View file @ccb666f
+++ b/.packages
View file @ccb666f
-# 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/
+# Generated by pub on 2019-11-29 11:35:05.551229.
+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/
 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.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/
+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/
 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.4/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/
--- a/CHANGELOG.md
View file @ccb666f
+++ b/CHANGELOG.md
View file @ccb666f
-<!--
- * @Author: zhuoyuan93@gmail.com
- * @Date: 2018-10-16 19:43:03
- * @LastEditors: zhuoyuan93@gmail.com
- * @LastEditTime: 2019-11-19 11:41
- * @Description: Update log
- -->
-
-# 0.6.1
-
-- 给所有方法添加返回类型.
-
-# 0.6.0
-
-- Completing comments , adding English commentsWelcome to add, correct
-- 参数同时支持传入 int / double 或者是var size = 100 , var size = 100.0.
-- The argument also supports passing in in / double / var size = 100 /var size = 100.0
-
-# 0.5.3
-
-- Change the units of statusBarHeight and bottomBarHeight to dp
-
-# 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.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.4.4
-
-- Fix bugs that default fonts change with the system
-
-# 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.2
-
-- add two Properties
-- ///Current device width dp
-- ///当前设备宽度 dp
-- ScreenUtil.screenWidthDp
-
-- ///Current device height dp
-- ///当前设备高度 dp
-- ScreenUtil.screenHeightDp
-
-# 0.4.1
-
-- Fix font adaptation issues
-
-# 0.4.0
-
-- Optimize font adaptation method
-
-# 0.3.1
-
-- 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
-
-
-# 0.3.0
-
-- Add font size adaptation
-
-# 0.2.2
-
-- Optimize documentation
-
-# 0.0.2
-
-- Fixed bug when releasing
-
-# 0.0.1
-
-- first version
-
-
-
-
+<!--
+ * @Author: zhuoyuan93@gmail.com
+ * @Date: 2018-10-16 19:43:03
+ * @LastEditors: zhuoyuan93@gmail.com
+ * @LastEditTime: 2019-11-19 11:41
+ * @Description: Update log
+ -->
+ 
+#0.7.0
+
+- Replace textScaleFactory with textScaleFactor , It's a typo.
+
+# 0.6.1
+
+- Add return types to all methods.
+
+# 0.6.0
+
+- Completing comments , adding English commentsWelcome to add, correct
+- 参数同时支持传入 int / double 或者是var size = 100 , var size = 100.0.
+- The argument also supports passing in in / double / var size = 100 /var size = 100.0
+
+# 0.5.3
+
+- Change the units of statusBarHeight and bottomBarHeight to dp
+
+# 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.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.4.4
+
+- Fix bugs that default fonts change with the system
+
+# 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.2
+
+- add two Properties
+- ///Current device width dp
+- ///当前设备宽度 dp
+- ScreenUtil.screenWidthDp
+
+- ///Current device height dp
+- ///当前设备高度 dp
+- ScreenUtil.screenHeightDp
+
+# 0.4.1
+
+- Fix font adaptation issues
+
+# 0.4.0
+
+- Optimize font adaptation method
+
+# 0.3.1
+
+- 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
+
+
+# 0.3.0
+
+- Add font size adaptation
+
+# 0.2.2
+
+- Optimize documentation
+
+# 0.0.2
+
+- Fixed bug when releasing
+
+# 0.0.1
+
+- first version
+
+
+
+
--- a/README_CN.md
View file @ccb666f
+++ b/README_CN.md
View file @ccb666f
@@ -130,7 +130,7 @@ Column(
     ScreenUtil.screenHeight     //设备高度
     ScreenUtil.bottomBarHeight  //底部安全区距离，适用于全面屏下面有按键的
     ScreenUtil.statusBarHeight  //状态栏高度 刘海屏会更高  单位px
-    ScreenUtil.textScaleFactory //系统字体缩放比例
+    ScreenUtil.textScaleFactor //系统字体缩放比例
     ScreenUtil.getInstance().scaleWidth  // 实际宽度的dp与设计稿px的比例
     ScreenUtil.getInstance().scaleHeight // 实际高度的dp与设计稿px的比例
@@ -163,7 +163,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
         '宽度和字体相对于设计稿放大的比例:${ScreenUtil.getInstance().scaleWidth * ScreenUtil.pixelRatio}'); 
     print(
         '高度相对于设计稿放大的比例:${ScreenUtil.getInstance().scaleHeight * ScreenUtil.pixelRatio}'); 
-    print('系统的字体缩放比例:${ScreenUtil.textScaleFactory}');
+    print('系统的字体缩放比例:${ScreenUtil.textScaleFactor}');
     return new Scaffold(
       appBar: new AppBar(
@@ -225,7 +225,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
             SizedBox(
               height: ScreenUtil.getInstance().setHeight(100),
             ),
-            Text('系统的字体缩放比例:${ScreenUtil.textScaleFactory}'),
+            Text('系统的字体缩放比例:${ScreenUtil.textScaleFactor}'),
             Column(
                          crossAxisAlignment: CrossAxisAlignment.start,
                          children: <Widget>[
--- a/README_PT.md
View file @ccb666f
+++ b/README_PT.md
View file @ccb666f
@@ -134,7 +134,7 @@ Column(
     ScreenUtil.screenHeight     //Altura da tela do dispositivo
     ScreenUtil.bottomBarHeight  //Distância segura do rodapé, adequada para botões em tela cheia
     ScreenUtil.statusBarHeight  //Altura da status bar em pixels, Notch será maior
-    ScreenUtil.textScaleFactory //Fator de escala da fonte do sistema
+    ScreenUtil.textScaleFactor //Fator de escala da fonte do sistema
     ScreenUtil.getInstance().scaleWidth //Razão entre a largura atual e a largura do protótipo de design em pixels
     ScreenUtil.getInstance().scaleHeight //Razão entre a altura atual e a altura do protótipo de design em pixels
@@ -227,7 +227,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
             SizedBox(
               height: ScreenUtil.getInstance().setHeight(100),
             ),
-            Text('Fator de escala da fonte do sistema:${ScreenUtil.textScaleFactory}'),
+            Text('Fator de escala da fonte do sistema:${ScreenUtil.textScaleFactor}'),
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
--- a/example/lib/main.dart
View file @ccb666f
+++ b/example/lib/main.dart
View file @ccb666f
@@ -105,7 +105,7 @@ class _MyHomePageState extends State<MyHomePage> {
             SizedBox(
               height: ScreenUtil.getInstance().setHeight(100),
             ),
-            Text('System font scaling factor:${ScreenUtil.textScaleFactory}'),
+            Text('System font scaling factor:${ScreenUtil.textScaleFactor}'),
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
--- a/example/lib/main_zh.dart
View file @ccb666f
+++ b/example/lib/main_zh.dart
View file @ccb666f
@@ -47,7 +47,7 @@ class _MyHomePageState extends State<MyHomePage> {
         '宽度和字体相对于设计稿放大的比例:${ScreenUtil.getInstance().scaleWidth * ScreenUtil.pixelRatio}');
     print(
         '高度相对于设计稿放大的比例:${ScreenUtil.getInstance().scaleHeight * ScreenUtil.pixelRatio}');
-    print('系统的字体缩放比例:${ScreenUtil.textScaleFactory}');
+    print('系统的字体缩放比例:${ScreenUtil.textScaleFactor}');
     return Scaffold(
       appBar: AppBar(
@@ -115,7 +115,7 @@ class _MyHomePageState extends State<MyHomePage> {
             SizedBox(
               height: ScreenUtil.getInstance().setHeight(100),
             ),
-            Text('系统的字体缩放比例:${ScreenUtil.textScaleFactory}'),
+            Text('系统的字体缩放比例:${ScreenUtil.textScaleFactor}'),
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
--- a/example/pubspec.lock
View file @ccb666f
+++ b/example/pubspec.lock
View file @ccb666f
@@ -5,35 +5,35 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.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.5"
   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.6.0"
+    version: "0.6.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -57,35 +57,35 @@ 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.7"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0+1"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   sky_engine:
@@ -97,56 +97,56 @@ 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.5"
   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.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:
--- a/pubspec.lock
View file @ccb666f
+++ b/pubspec.lock
View file @ccb666f
@@ -7,14 +7,14 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
@@ -52,28 +52,28 @@ packages:
       name: meta
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0+1"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -106,7 +106,7 @@ packages:
       name: string_scanner
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   term_glyph:
     dependency: transitive
     description:
--- a/pubspec.yaml
View file @ccb666f
+++ b/pubspec.yaml
View file @ccb666f
-name: flutter_screenutil
-description: A flutter plugin for adapting screen and font size.Guaranteed to look good on different models
-version: 0.6.1
-author: LiZhuoyuan <zhuoyuan93@gmail.com>
-homepage: https://github.com/OpenFlutter/flutter_ScreenUtil
-
-environment:
-  sdk: ">=2.0.0-dev.68.0 <3.0.0"
-
-dependencies:
-  flutter:
-    sdk: flutter
-
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
-# For information on the generic Dart part of this file, see the
-# following page: https://www.dartlang.org/tools/pub/pubspec
-
-# The following section is specific to Flutter.
-flutter:
-
-  # To add assets to your package, add an assets section, like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
-  #  - images/a_dot_ham.jpeg
-  #
-  # For details regarding assets in packages, see
-  # https://flutter.io/assets-and-images/#from-packages
-  #
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.io/assets-and-images/#resolution-aware.
-
-  # To add custom fonts to your package, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts in packages, see
-  # https://flutter.io/custom-fonts/#from-packages
+name: flutter_screenutil
+description: A flutter plugin for adapting screen and font size.Guaranteed to look good on different models
+version: 0.7.0
+author: LiZhuoyuan <zhuoyuan93@gmail.com>
+homepage: https://github.com/OpenFlutter/flutter_ScreenUtil
+
+environment:
+  sdk: ">=2.0.0-dev.68.0 <3.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+
+# For information on the generic Dart part of this file, see the
+# following page: https://www.dartlang.org/tools/pub/pubspec
+
+# The following section is specific to Flutter.
+flutter:
+
+  # To add assets to your package, add an assets section, like this:
+  # assets:
+  #  - images/a_dot_burr.jpeg
+  #  - images/a_dot_ham.jpeg
+  #
+  # For details regarding assets in packages, see
+  # https://flutter.io/assets-and-images/#from-packages
+  #
+  # An image asset can refer to one or more resolution-specific "variants", see
+  # https://flutter.io/assets-and-images/#resolution-aware.
+
+  # To add custom fonts to your package, add a fonts section here,
+  # in this "flutter" section. Each entry in this list should have a
+  # "family" key with the font family name, and a "fonts" key with a
+  # list giving the asset and other descriptors for the font. For
+  # example:
+  # fonts:
+  #   - family: Schyler
+  #     fonts:
+  #       - asset: fonts/Schyler-Regular.ttf
+  #       - asset: fonts/Schyler-Italic.ttf
+  #         style: italic
+  #   - family: Trajan Pro
+  #     fonts:
+  #       - asset: fonts/TrajanPro.ttf
+  #       - asset: fonts/TrajanPro_Bold.ttf
+  #         weight: 700
+  #
+  # For details regarding fonts in packages, see
+  # https://flutter.io/custom-fonts/#from-packages