0.6.1 给方法添加了返回类型

lizhuoyuan
Commit 076a2cf528cd6258eaece1e7be28c86899dedf3b 076a2cf5 1 parent 1aec636a
Showing 14 changed files with 152 additions and 71 deletions
CHANGELOG.md
README.md
README_CN.md
example/android/.project
example/android/.settings/org.eclipse.buildship.core.prefs
example/android/app/.classpath
example/android/app/.project
example/android/app/.settings/org.eclipse.buildship.core.prefs
example/ios/Flutter/flutter_export_environment.sh
example/lib/main.dart
example/lib/main_zh.dart
example/pubspec.lock
lib/flutter_screenutil.dart
pubspec.yaml
--- a/CHANGELOG.md
View file @076a2cf
+++ b/CHANGELOG.md
View file @076a2cf
@@ -2,39 +2,47 @@
  * @Author: zhuoyuan93@gmail.com
  * @Date: 2018-10-16 19:43:03
  * @LastEditors: zhuoyuan93@gmail.com
- * @LastEditTime: 2019-08-23 16:41:10
+ * @LastEditTime: 2019-11-19 11:41
  * @Description: Update log
  -->
-# 0.0.1
+# 0.7.0
-- first version
+- 给所有方法添加返回类型.
-# 0.0.2
+# 0.6.0
-- Fixed bug when releasing
+- 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.2.2
+# 0.5.3
-- Optimize documentation
+- Change the units of statusBarHeight and bottomBarHeight to dp
-# 0.3.0
+# 0.5.2
-- Add font size adaptation
+- Change the parameter type from int to double
-# 0.3.1
+- setWidth,setHeight,setSp. for example: you can use setWidth(100) or setWidth(100.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
+# 0.5.1
-# 0.4.0
+- Fix the wrong way of using
-- Optimize font adaptation method
+- It is recommended to use `ScreenUtil.getInstance()` instead of `ScreenUtil()` , for example: `ScreenUtil.getInstance().setHeight(25)` instead of `ScreenUtil().setHeight(25)`
-# 0.4.1
+# 0.4.4
-- Fix font adaptation issues
+- 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
@@ -47,36 +55,37 @@
 - ///当前设备高度 dp
 - ScreenUtil.screenHeightDp
-# 0.4.3
+# 0.4.1
-- Modify the font to change with the system zoom mode. The default value is false.
+- Fix font adaptation issues
-- setSp(int fontSize, [allowFontScaling = false]) => allowFontScaling
-? setWidth(fontSize) \* \_textScaleFactor
-: setWidth(fontSize);
+# 0.4.0
-# 0.4.4
+- Optimize font adaptation method
-- Fix bugs that default fonts change with the system
+# 0.3.1
-# 0.5.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
-- 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.3.0
-# 0.5.2
+- Add font size adaptation
-- Change the parameter type from int to double
+# 0.2.2
-- setWidth,setHeight,setSp. for example: you can use setWidth(100) or setWidth(100.0)
+- Optimize documentation
+
+# 0.0.2
+
+- Fixed bug when releasing
+
+# 0.0.1
+
+- first version
-# 0.5.3
-- Change the units of statusBarHeight and bottomBarHeight to dp
-# 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
--- a/README.md
View file @076a2cf
+++ b/README.md
View file @076a2cf
@@ -143,7 +143,7 @@ Column(
 //import
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-...dart
+...
   @override
   Widget build(BuildContext context) {
@@ -178,6 +178,7 @@ 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),
                   color: Colors.red,
@@ -189,6 +190,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
                   ),
                 ),
                 Container(
+                  padding: EdgeInsets.all(ScreenUtil.getInstance().setWidth(10)),
                   width: ScreenUtil.getInstance().setWidth(375),
                   height: ScreenUtil.getInstance().setHeight(200),
                   color: Colors.blue,
--- a/README_CN.md
View file @076a2cf
+++ b/README_CN.md
View file @076a2cf
@@ -136,12 +136,12 @@ Column(
 ```
-```
+```dart
 //导入
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 ...
-
+ 
   @override
   Widget build(BuildContext context) {
     //设置适配尺寸 (填入设计稿中设备的屏幕尺寸) 假如设计稿是按iPhone6的尺寸设计的(iPhone6 750*1334)
@@ -175,6 +175,7 @@ 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),
                   color: Colors.red,
@@ -187,6 +188,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
                   ),
                 ),
                 Container(
+                  padding: EdgeInsets.all(ScreenUtil.getInstance().setWidth(10)),
                   width: ScreenUtil.getInstance().setWidth(375),
                   height: ScreenUtil.getInstance().setHeight(200),
                   color: Colors.blue,
--- a/example/android/.project 0 → 100644
View file @076a2cf
+++ b/example/android/.project 0 → 100644
View file @076a2cf
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
--- a/example/android/.settings/org.eclipse.buildship.core.prefs 0 → 100644
View file @076a2cf
+++ b/example/android/.settings/org.eclipse.buildship.core.prefs 0 → 100644
View file @076a2cf
+connection.project.dir=
+eclipse.preferences.version=1
--- a/example/android/app/.classpath 0 → 100644
View file @076a2cf
+++ b/example/android/app/.classpath 0 → 100644
View file @076a2cf
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
--- a/example/android/app/.project 0 → 100644
View file @076a2cf
+++ b/example/android/app/.project 0 → 100644
View file @076a2cf
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
--- a/example/android/app/.settings/org.eclipse.buildship.core.prefs 0 → 100644
View file @076a2cf
+++ b/example/android/app/.settings/org.eclipse.buildship.core.prefs 0 → 100644
View file @076a2cf
+connection.project.dir=..
+eclipse.preferences.version=1
--- a/example/ios/Flutter/flutter_export_environment.sh 0 → 100644
View file @076a2cf
+++ b/example/ios/Flutter/flutter_export_environment.sh 0 → 100644
View file @076a2cf
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=D:\flutter"
+export "FLUTTER_APPLICATION_PATH=D:\Project\flutter_ScreenUtil\example"
+export "FLUTTER_TARGET=lib\main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build\ios"
+export "FLUTTER_FRAMEWORK_DIR=D:\flutter\bin\cache\artifacts\engine\ios"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"
--- a/example/lib/main.dart
View file @076a2cf
+++ b/example/lib/main.dart
View file @076a2cf
@@ -61,6 +61,8 @@ class _MyHomePageState extends State<MyHomePage> {
             Row(
               children: <Widget>[
                 Container(
+                  padding:
+                      EdgeInsets.all(ScreenUtil.getInstance().setWidth(10)),
                   width: ScreenUtil.getInstance().setWidth(375),
                   height: ScreenUtil.getInstance().setHeight(200),
                   color: Colors.red,
@@ -72,6 +74,8 @@ class _MyHomePageState extends State<MyHomePage> {
                   ),
                 ),
                 Container(
+                  padding:
+                      EdgeInsets.all(ScreenUtil.getInstance().setWidth(10)),
                   width: ScreenUtil.getInstance().setWidth(375),
                   height: ScreenUtil.getInstance().setHeight(200),
                   color: Colors.blue,
--- a/example/lib/main_zh.dart
View file @076a2cf
+++ b/example/lib/main_zh.dart
View file @076a2cf
@@ -48,7 +48,7 @@ class _MyHomePageState extends State<MyHomePage> {
     print(
         '高度相对于设计稿放大的比例:${ScreenUtil.getInstance().scaleHeight * ScreenUtil.pixelRatio}');
     print('系统的字体缩放比例:${ScreenUtil.textScaleFactory}');
-  
+
     return Scaffold(
       appBar: AppBar(
         title: Text(widget.title),
@@ -68,6 +68,8 @@ class _MyHomePageState extends State<MyHomePage> {
             Row(
               children: <Widget>[
                 Container(
+                  padding:
+                      EdgeInsets.all(ScreenUtil.getInstance().setWidth(10)),
                   width: ScreenUtil.getInstance().setWidth(375),
                   height: ScreenUtil.getInstance().setHeight(200),
                   color: Colors.red,
@@ -80,6 +82,8 @@ class _MyHomePageState extends State<MyHomePage> {
                   ),
                 ),
                 Container(
+                  padding:
+                      EdgeInsets.all(ScreenUtil.getInstance().setWidth(10)),
                   width: ScreenUtil.getInstance().setWidth(375),
                   height: ScreenUtil.getInstance().setHeight(200),
                   color: Colors.blue,
--- a/example/pubspec.lock
View file @076a2cf
+++ b/example/pubspec.lock
View file @076a2cf
@@ -5,35 +5,35 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.14.11"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.2"
   flutter:
@@ -57,37 +57,37 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.5"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0+1"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -97,56 +97,56 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.5.5"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.9.3"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.5"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
 sdks:
--- a/lib/flutter_screenutil.dart
View file @076a2cf
+++ b/lib/flutter_screenutil.dart
View file @076a2cf
@@ -84,16 +84,16 @@ class ScreenUtil {
   /// 实际的dp与UI设计px的比例
   /// The ratio of the actual dp to the design draft px
-  get scaleWidth => _screenWidth / instance.width;
+  double get scaleWidth => _screenWidth / instance.width;
-  get scaleHeight => _screenHeight / instance.height;
+  double 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(num width) => width * scaleWidth;
+  num setWidth(num width) => width * scaleWidth;
   /// 根据UI设计的设备高度适配
   /// 当发现UI设计中的一屏显示的与当前样式效果不符合时,
@@ -103,14 +103,14 @@ class ScreenUtil {
   /// 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(num height) => height * scaleHeight;
+  num setHeight(num height) => height * scaleHeight;
   ///字体大小适配方法
   ///@param [fontSize] UI设计上字体的大小,单位px.
   ///Font size adaptation method
   ///@param [fontSize] The size of the font on the UI design, in px.
   ///@param [allowFontScaling]
-  setSp(num fontSize) => allowFontScaling
+  num setSp(num fontSize) => allowFontScaling
       ? setWidth(fontSize)
       : setWidth(fontSize) / _textScaleFactor;
 }
--- a/pubspec.yaml
View file @076a2cf
+++ b/pubspec.yaml
View file @076a2cf
 name: flutter_screenutil
 description: A flutter plugin for adapting screen and font size.Guaranteed to look good on different models
-version: 0.6.0
+version: 0.6.1
 author: LiZhuoyuan <zhuoyuan93@gmail.com>
 homepage: https://github.com/OpenFlutter/flutter_ScreenUtil