Merge branch 'lhr', remote-tracking branch 'origin' into test

Author: DIVINER-only

docs/widget/animate/animationcontroller/index.md

@@ -0,0 +1,30 @@
+## **AnimationController**
+
+>
+AnimationController是一个特殊的Animation对象
+* 默认情况下，AnimationController在给定的时间段内会线性的生成从0.0到1.0的数字
+* 创建一个AnimationController时需要传递一个vsync参数，存在vsync时会防止屏幕外动画（动画的UI不在当前屏幕时）消耗不必要的资源，通过将SingleTickerProviderStateMixin添加到类定义中
+* 实例化一个AnimationController不会启动它运行，可以通过 .forward()方法启动动画
+* AnimationController的addListener方法可以监听动画每一帧
+* AnimationController的addStatusListener方法可以监听动画的状态
+
+
+### 构造方法
+``` dart
+AnimationController({
+  double value,
+  this.duration,
+  this.debugLabel,
+  this.lowerBound = 0.0,
+  this.upperBound = 1.0,
+  this.animationBehavior = AnimationBehavior.normal,
+  @required TickerProvider vsync,
+})
+```
+
+### 属性介绍
+* value: 动画值
+* lowerBound: 动画最小值
+* upperBound: 动画最大值
+* duration: 动画持续时间
+* vsync: vsync对象会绑定动画的定时器到一个可视的widget，所以当widget不显示时，动画定时器将会暂停，当widget再次显示时，动画定时器重新恢复执行，这样就可以避免动画相关UI不在当前屏幕时消耗资源。 如果要使用自定义的State对象作为vsync时，请包含TickerProviderStateMixin，因为是当前Widget使用动画，所以一般绑定值为 this

docs/widget/common/text/index.md

@@ -1 +1,32 @@
-## ****
+## **Text**
+
+>
+单一样式的文本,文本可多行显示，也可能全部显示在同一行上
+* 默认会继承最接近控件的DefaultTextStyle
+* 最基本的文本组件
+
+### 构造方法
+
+``` dart
+Text(this.data, {
+  Key key,
+  this.style,
+  this.textAlign,
+  this.textDirection,
+  this.locale,
+  this.softWrap,
+  this.overflow,
+  this.textScaleFactor,
+  this.maxLines,
+  this.semanticsLabel,
+})
+```
+
+### 属性介绍
+* data: Text显示的文本，必选参数
+* style: 文本样式
+* textAlign: 文本对齐方式
+* textDirection: 文本显示方向
+* maxLines: 文本最多显示几行
+* overflow: 文本溢出显示的截断方式
+* textScaleFactor: 文本缩放比例

lib/widget/animate/animationcontroller/demo.dart

@@ -0,0 +1,104 @@
+import 'package:flutter/material.dart';
+
+class Index extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('AnimationController'),
+      ),
+      body: AnimationDemo()
+    );
+  }
+}
+
+class AnimationDemo extends StatefulWidget {
+  @override
+  _AnimationDemoState createState() => _AnimationDemoState();
+}
+
+class _AnimationDemoState extends State<AnimationDemo>
+  with TickerProviderStateMixin{
+
+  AnimationController animationDemoController;
+  Animation animation;
+  Animation animationColor;
+  CurvedAnimation curve;
+
+  @override
+    void initState() {
+      // TODO: implement initState
+      super.initState();
+      animationDemoController = AnimationController(
+        // value: 32,
+        // lowerBound: 32,
+        // upperBound: 100,
+        duration: Duration(milliseconds: 2500),
+        vsync: this
+      );
+      
+
+      curve = CurvedAnimation(parent: animationDemoController, curve: Curves.bounceOut);
+
+      animation = Tween(begin: 32.0, end: 100.0).animate(curve);
+      animationColor = ColorTween(begin: Colors.pinkAccent, end: Colors.red).animate(curve);
+
+      animationDemoController.addListener(() {
+        print('当前动画值：${animationDemoController.value}');
+      });
+      animationDemoController.addStatusListener((AnimationStatus status) {
+        print('当前动画状态:${status}');
+      });
+      animationDemoController.forward();
+    }
+
+    @override
+      void dispose() {
+        // TODO: implement dispose
+        super.dispose();
+        animationDemoController.dispose();
+      }
+
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: AnimatedHeart(
+        animations: [
+          animation,
+          animationColor
+        ],
+        controller: animationDemoController,
+      ),
+    );
+  }
+}
+
+
+class AnimatedHeart extends AnimatedWidget {
+  final List animations;
+  final AnimationController controller;
+
+  AnimatedHeart({
+    this.animations,
+    this.controller
+  }):super(listenable: controller);
+
+  @override
+  Widget build(BuildContext context) {
+    return IconButton(
+      icon: Icon(Icons.favorite),
+      iconSize: animations[0].value,
+      color: animations[1].value,
+      onPressed: (){
+        switch (controller.status) {
+          case AnimationStatus.completed:
+            controller.reverse();
+            break;
+          default:
+            controller.forward();
+        }
+      },
+    );
+  }
+}

lib/widget/animate/animationcontroller/index.dart

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:efox_flutter/components/widgetComp.dart' as WidgetComp;
+import 'demo.dart' as Demo;
+
+class Index extends StatefulWidget {
+  static String title = 'AnimationController';
+  static String mdUrl = 'docs/widget/animate/animationcontroller/index.md';
+  static String originCodeUrl = 'https://docs.flutter.io/flutter/animation/AnimationController-class.html';
+
+  @override
+  _IndexState createState() => new _IndexState();
+}
+
+class _IndexState extends State<Index> {
+  @override
+  Widget build(BuildContext context) {
+    return WidgetComp.Index(
+      title: Index.title,
+      originCodeUrl: Index.originCodeUrl,
+      mdUrl: Index.mdUrl,
+      demoChild: [
+        Demo.Index(),
+      ],
+    );
+  }
+}

lib/widget/animate/index.dart

@@ -1,4 +1,5 @@
 import 'package:efox_flutter/store/objects/widget_info.dart';
+import 'animationcontroller/index.dart' as AnimationController;
 import 'animatedopacity/index.dart' as animatedopacity;
 import 'animatedphysicalmodel/index.dart' as animatedphysicalmodel;
 import 'animatedpositioned/index.dart' as animatedpositioned;
@@ -23,104 +24,109 @@ import 'animatedbuilder/index.dart' as animatedbuilder;
 const nameSpaces = '/animate_';
 
 List widgets = [
+  ItemInfo(
+    widget: AnimationController.Index(),
+    code: 57685, // gesture
+    title: AnimationController.Index.title,
+  ),
   ItemInfo(
     widget: animatedbuilder.Index(),
-    code: 58348, // grid_on
+    code: 58295, // color_lens
     title: animatedbuilder.Index.title,
   ),
   ItemInfo(
     widget: animatedcontainer.Index(),
-    code: 58348, // grid_on
+    code: 58297, // compare
     title: animatedcontainer.Index.title,
   ),
   ItemInfo(
     widget: animatedcrossfade.Index(),
-    code: 58348, // grid_on
+    code: 58936, // confirmation_number
     title: animatedcrossfade.Index.title,
   ),
   ItemInfo(
     widget: animateddefaulttextstyle.Index(),
-    code: 58348, // grid_on
+    code: 57678, // content_cut
     title: animateddefaulttextstyle.Index.title,
   ),
   ItemInfo(
     widget: animatedliststate.Index(),
-    code: 58348, // grid_on
+    code: 59660, // copyright 
     title: animatedliststate.Index.title,
   ),
   ItemInfo(
     widget: animatedmodalbarrier.Index(),
-    code: 58348, // grid_on
+    code: 58060, // create_new_folder
     title: animatedmodalbarrier.Index.title,
   ),
   ItemInfo(
     widget: slidetransition.Index(),
-    code: 58348, // grid_on
+    code: 59505, // dashboard
     title: slidetransition.Index.title,
   ),
   ItemInfo(
     widget: sizetransition.Index(),
-    code: 58348, // grid_on
+    code: 58742, // departure_board
     title: sizetransition.Index.title,
   ),
   ItemInfo(
     widget: scaletransition.Index(),
-    code: 58348, // grid_on
+    code: 58125, // developer_board
     title: scaletransition.Index.title,
   ),
   ItemInfo(
     widget: rotationtransition.Index(),
-    code: 58348, // grid_on
+    code: 57776, // developer_mode
     title: rotationtransition.Index.title,
   ),
   ItemInfo(
     widget: positionedtransition.Index(),
-    code: 58348, // grid_on
+    code: 58165, // device_hub
     title: positionedtransition.Index.title,
   ),
   ItemInfo(
     widget: hero.Index(),
-    code: 58348, // grid_on
+    code: 58167, // devices_other
     title: hero.Index.title,
   ),
   ItemInfo(
     widget: fadetransition.Index(),
-    code: 58348, // grid_on
+    code: 58674, // directions_boat
     title: fadetransition.Index.title,
   ),
   ItemInfo(
     widget: decoratedboxtransition.Index(),
-    code: 58348, // grid_on
+    code: 58896, // disc_full 
     title: decoratedboxtransition.Index.title,
   ),
   ItemInfo(
     widget: animatedwidgetbasestate.Index(),
-    code: 58348, // grid_on
+    code: 59509, // dns
     title: animatedwidgetbasestate.Index.title,
   ),
   ItemInfo(
     widget: animatedwidget.Index(),
-    code: 58348, // grid_on
+    code: 59672, // donut_small 
     title: animatedwidget.Index.title,
   ),
   ItemInfo(
     widget: animatedsize.Index(),
-    code: 58348, // grid_on
+    code: 57778, // dvr
     title: animatedsize.Index.title,
   ),
   ItemInfo(
     widget: animatedpositioned.Index(),
-    code: 58348, // grid_on
+    code: 57373, // equalizer
     title: animatedpositioned.Index.title,
   ),
   ItemInfo(
     widget: animatedphysicalmodel.Index(),
-    code: 58348, // grid_on
+    code: 59686, // euro_symbol
     title: animatedphysicalmodel.Index.title,
   ),
   ItemInfo(
     widget: animatedopacity.Index(),
-    code: 58348, // grid_on
+    code: 58733, // ev_station
     title: animatedopacity.Index.title,
   ),
 ];