Merge branch 'develop' into dev/yisheng

# Conflicts: # lib/widgets/components/Bar/AppBar/index.dart # lib/widgets/components/Bar/BottomAppBar/demo.dart # lib/widgets/components/Bar/BottomAppBar/index.dart # lib/widgets/components/Bar/ButtonBar/index.dart # lib/widgets/components/Bar/FlexibleSpaceBar/index.dart # lib/widgets/components/Bar/SliverAppBar/index.dart # lib/widgets/components/Bar/SnackBar/index.dart # lib/widgets/components/Bar/SnackBarAction/index.dart # lib/widgets/components/Card/Card/index.dart # lib/widgets/components/LIst/ListBody/index.dart # lib/widgets/components/LIst/ListView/index.dart # lib/widgets/elements/Form/Button/DropdownButton/index.dart # lib/widgets/elements/Form/Button/FlatButton/index.dart # lib/widgets/elements/Form/Button/PopupMenuButton/index.dart # lib/widgets/elements/Form/CheckBox/Checkbox/index.dart # lib/widgets/elements/Form/CheckBox/CheckboxListTile/index.dart # lib/widgets/elements/Frame/Axis/crossAxis/index.dart # lib/widgets/elements/Frame/Axis/flipAxis/index.dart # lib/widgets/elements/Frame/Axis/mainAxis/index.dart # lib/widgets/elements/Media/Image/precacheImage/index.dart
2025-05-31 14:08:55 +08:00 · 2019-01-12 17:30:11 +08:00
parent c7b70a02f2 ea12dcbea5
commit c0d90db596
130 changed files with 613 additions and 692 deletions
--- a/lib/widgets/elements/Frame/Align/Align/demo.dart
+++ b/lib/widgets/elements/Frame/Align/Align/demo.dart
@ -1,6 +1,6 @@
 import 'package:flutter/widgets.dart';

-/**
+/*
 * Author: xiaojia.dxj
 * Date: 2018/11/22
 * Email: xiaojia.dxj@alibaba-inc.com
@ -14,7 +14,7 @@ class AlignAlignment extends StatelessWidget {
  final Alignment status;
  final String dec;

-  const AlignAlignment(Alignment this.status, String this.dec) : super();
+  const AlignAlignment( this.status,  this.dec) : super();

  @override
  Widget build(BuildContext context) {
@ -39,8 +39,8 @@ class AlignFactor extends StatelessWidget {
  final double hFactor;
  final String dec;

-  const AlignFactor(Alignment this.status, double this.wFactor,
-      double this.hFactor, String this.dec)
+  const AlignFactor( this.status,  this.wFactor,
+       this.hFactor,  this.dec)
      : super();

  @override
--- a/lib/widgets/elements/Frame/Align/Align/index.dart
+++ b/lib/widgets/elements/Frame/Align/Align/index.dart
@ -41,12 +41,12 @@ class _DemoState extends State<Demo> {
      contentList: [
        _flatText0,
        _flatText1,
-        _AlignCreate()
+        _alignCreate()
      ],
    );
  }

-  Column _AlignCreate() {
+  Column _alignCreate() {
    return new Column(
      children: <Widget>[
        SizedBox(height: 10.0),
--- a/lib/widgets/elements/Frame/Axis/crossAxis/index.dart
+++ b/lib/widgets/elements/Frame/Axis/crossAxis/index.dart
@ -11,7 +11,7 @@ class _DemoState extends State<Demo> {
  Widget build(BuildContext context) {
    return WidgetDemo(
      title: 'crossAxis',
-      child: Column(
+      contentList: [Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: <Widget>[
          Container(
@ -39,7 +39,7 @@ class _DemoState extends State<Demo> {
            margin: const EdgeInsets.all(10.0),
          ),
        ],
-      ),
+      )],
      docUrl: 'https://docs.flutter.io/flutter/widgets/Padding-class.html',
    );
  }
--- a/lib/widgets/elements/Frame/Axis/flipAxis/index.dart
+++ b/lib/widgets/elements/Frame/Axis/flipAxis/index.dart
@ -37,7 +37,7 @@ class _DemoState extends State<Demo> {
  Widget build(BuildContext context) {
    return WidgetDemo(
      title: 'flipAxis',
-      child: Flex(
+      contentList: [Flex(
        direction: _direction,
        mainAxisAlignment: MainAxisAlignment.center,
        mainAxisSize: MainAxisSize.max,
@ -72,7 +72,7 @@ class _DemoState extends State<Demo> {
            onPressed: _changeDirection,
          )
        ],
-      ),
+      )],
      docUrl: 'https://docs.flutter.io/flutter/painting/flipAxis.html',
    );
  }
--- a/lib/widgets/elements/Frame/Axis/index.dart
+++ b/lib/widgets/elements/Frame/Axis/index.dart
@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import '../../../../model/widget.dart';
-
-import './crossAxis/index.dart' as crossAxis;
-import './flipAxis/index.dart' as flipAxis;
-import './mainAxis/index.dart' as mainAxis;
-
-List<WidgetPoint> widgetPoints = [
-  WidgetPoint(
-    name: 'crossAxis',
-    routerName: crossAxis.Demo.routeName,
-    buildRouter: (BuildContext context) => crossAxis.Demo(),
-  ),
-  WidgetPoint(
-    name: 'flipAxis',
-    routerName: flipAxis.Demo.routeName,
-    buildRouter: (BuildContext context) => flipAxis.Demo(),
-  ),
-  WidgetPoint(
-    name: 'mainAxis',
-    routerName: mainAxis.Demo.routeName,
-    buildRouter: (BuildContext context) => mainAxis.Demo(),
-  ),
-];
--- a/lib/widgets/elements/Frame/Axis/mainAxis/index.dart
+++ b/lib/widgets/elements/Frame/Axis/mainAxis/index.dart
@ -11,7 +11,7 @@ class _DemoState extends State<Demo> {
  Widget build(BuildContext context) {
    return WidgetDemo(
      title: 'mainAxis',
-      child: Flex(
+      contentList: [Flex(
        direction: Axis.vertical,
        mainAxisAlignment: MainAxisAlignment.center,
        mainAxisSize: MainAxisSize.max,
@ -42,9 +42,8 @@ class _DemoState extends State<Demo> {
            margin: const EdgeInsets.all(10.0),
          ),
        ],
-      ),
-      docUrl:
-          'https://docs.flutter.io/flutter/material/MergeableMaterial/mainAxis.html',
+      )],
+      docUrl: 'https://docs.flutter.io/flutter/material/MergeableMaterial/mainAxis.html',
    );
  }
 }
--- a/lib/widgets/elements/Frame/Box/ConstrainedBox/demo.dart
+++ b/lib/widgets/elements/Frame/Box/ConstrainedBox/demo.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';

-/**
+/*
 * Author: xiaojia.dxj
 * Date: 2018/11/22
 * Email: xiaojia.dxj@alibaba-inc.com
--- a/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart
+++ b/lib/widgets/elements/Frame/Box/DecoratedBox/demo.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';

-/**
+/*
 * Author: xiaojia.dxj
 * Date: 2018/11/22
 * Email: xiaojia.dxj@alibaba-inc.com
--- a/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/DecoratedBox/index.dart
@ -32,13 +32,13 @@ class _DemoState extends State<Demo> {
      contentList: [
        _Text,
        _Text1,
-        _DecoratedBoxCreate(),
+        _decoratedBoxCreate(),
      ],
      docUrl: 'https://docs.flutter.io/flutter/widgets/DecoratedBox-class.html',
    );
  }

-  Column _DecoratedBoxCreate() {
+  Column _decoratedBoxCreate() {
    return new Column(
      children: <Widget>[
        Container(
--- a/lib/widgets/elements/Frame/Box/Fittedbox/demo.dart
+++ b/lib/widgets/elements/Frame/Box/Fittedbox/demo.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';

-/**
+/*
 * Author: xiaojia.dxj
 * Date: 2018/12/2
 * Email: xiaojia.dxj@alibaba-inc.com
@ -13,9 +13,9 @@ import 'package:flutter/widgets.dart';

 class FittedBoxDefault extends StatelessWidget {
  final BoxFit curfit;
-  String dec;
+  final String dec;

-  FittedBoxDefault({Key key, BoxFit this.curfit, this.dec});
+  FittedBoxDefault({Key key,  this.curfit, this.dec});

  @override
  Widget build(BuildContext context) {
--- a/lib/widgets/elements/Frame/Box/Fittedbox/index.dart
+++ b/lib/widgets/elements/Frame/Box/Fittedbox/index.dart
@ -42,12 +42,12 @@ class _DemoState extends State<Demo> {
      contentList: [
        Text0,
        Text1,
-        _FittedBoxCreate(),
+        _fittedBoxCreate(),
      ],
    );
  }

-  Column _FittedBoxCreate() {
+  Column _fittedBoxCreate() {
    return Column(
      children: <Widget>[
        Row(
--- a/lib/widgets/elements/Frame/Box/OverflowBox/demo.dart
+++ b/lib/widgets/elements/Frame/Box/OverflowBox/demo.dart
@ -2,19 +2,19 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';

 class OverflowBoxDefault extends StatelessWidget {
-  double curmaxHeight;
-  double curmaxWidth;
-  double curHeight;
-  double curWidth;
-  AlignmentGeometry curalignment;
+  final double curmaxHeight;
+  final double curmaxWidth;
+  final double curHeight;
+  final double curWidth;
+  final AlignmentGeometry curalignment;

  OverflowBoxDefault(
      {Key key,
-      double this.curmaxHeight,
-      double this.curmaxWidth,
-      double this.curWidth,
-      double this.curHeight,
-      AlignmentGeometry this.curalignment})
+       this.curmaxHeight,
+       this.curmaxWidth,
+       this.curWidth,
+       this.curHeight,
+       this.curalignment})
      : super(key: key);

  @override
--- a/lib/widgets/elements/Frame/Box/OverflowBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/OverflowBox/index.dart
@ -5,7 +5,6 @@
 * @Last Modified time: 2019-01-08 15:56:31 
 */
 import 'package:flutter/material.dart';
-import 'package:flutter_markdown/flutter_markdown.dart';
 import '../../../../../common/widget_demo.dart';
 import './demo.dart' as overflowBox;

@ -39,12 +38,12 @@ class _DemoState extends State<Demo> {
      contentList: [
        Text0,
        Text1,
-        _OverflowBoxCreate(),
+        _overflowBoxCreate(),
      ],
    );
  }

-  Row _OverflowBoxCreate() {
+  Row _overflowBoxCreate() {
    return Row(
      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
      children: <Widget>[
--- a/lib/widgets/elements/Frame/Box/RenderBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/RenderBox/index.dart
@ -6,7 +6,6 @@
 */
 import 'package:flutter/material.dart';
 import '../../../../../common/widget_demo.dart';
-import './demo.dart' as sizeBox;

 const String _Text = '''
 ### **简介**
@ -35,13 +34,13 @@ class _DemoState extends State<Demo> {
      codeUrl: 'elements/Frame/Box/RenderBox/demo.dart',
      contentList: [
        _Text,
-        _SizeBoxCreate(),
+        _sizeBoxCreate(),
      ],
      docUrl: 'https://docs.flutter.io/flutter/widgets/RenderBox-class.html',
    );
  }

-  Column _SizeBoxCreate() {
+  Column _sizeBoxCreate() {
    return new Column(
      children: <Widget>[
        /**
--- a/lib/widgets/elements/Frame/Box/SizeBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/SizeBox/index.dart
@ -21,13 +21,13 @@ class _DemoState extends State<Demo> {
      title: 'Table',
      codeUrl: 'elements/Frame/Box/SizedBox/demo.dart',
      contentList: [
-        _SizeBoxCreate(),
+        _sizeBoxCreate(),
      ],
      docUrl: 'https://docs.flutter.io/flutter/widgets/SizedBox-class.html',
    );
  }

-  Column _SizeBoxCreate() {
+  Column _sizeBoxCreate() {
    return new Column(
      children: <Widget>[
        new Text("SizedBox",
--- a/lib/widgets/elements/Frame/Box/SizedOverflowBox/demo.dart
+++ b/lib/widgets/elements/Frame/Box/SizedOverflowBox/demo.dart
@ -8,9 +8,9 @@ class SizeOverflowBoxDefault extends StatelessWidget {

  SizeOverflowBoxDefault(
      {Key key,
-      double this.curSizeWidth,
-      double this.curSizeHeight,
-      String this.text})
+       this.curSizeWidth,
+       this.curSizeHeight,
+       this.text})
      : super(key: key);

  @override
@ -36,7 +36,7 @@ class SizeBoxDefault extends StatelessWidget {
  final double curWidth;
  final double curHeight;

-  SizeBoxDefault({Key key, double this.curHeight, double this.curWidth})
+  SizeBoxDefault({Key key,  this.curHeight,  this.curWidth})
      : super(key: key);

  @override
--- a/lib/widgets/elements/Frame/Box/TextBox/index.dart
+++ b/lib/widgets/elements/Frame/Box/TextBox/index.dart
@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import '../../../../../common/widget_demo.dart';
-import './demo.dart' as TextBox;

 const String _Text = """### **TextBox简介**
 > 是一个包含一段文本的矩形
--- a/lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart
+++ b/lib/widgets/elements/Frame/Expanded/Expanded/expanded_demo.dart
@ -8,7 +8,7 @@ import 'package:flutter/material.dart';

 class ExpandedDemo extends StatelessWidget {

-  TextStyle txtColor = TextStyle(color: Colors.white);
+  final TextStyle txtColor = TextStyle(color: Colors.white);
  @override
  Widget build(BuildContext context) {
    return Column(
--- a/lib/widgets/elements/Frame/Layout/Column/demo.dart
+++ b/lib/widgets/elements/Frame/Layout/Column/demo.dart
@ -1,6 +1,6 @@
 import 'package:flutter/widgets.dart';

-/**
+/*
 * Author: xiaojia.dxj
 * Date: 2018/11/22
 * Email: xiaojia.dxj@alibaba-inc.com
--- a/lib/widgets/elements/Frame/Layout/Container/demo.dart
+++ b/lib/widgets/elements/Frame/Layout/Container/demo.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';

-/**
+/*
 * Author: xiaojia.dxj
 * Date: 2018/11/22
 * Email: xiaojia.dxj@alibaba-inc.com
--- a/lib/widgets/elements/Frame/Layout/Row/demo.dart
+++ b/lib/widgets/elements/Frame/Layout/Row/demo.dart
@ -1,6 +1,6 @@
 import 'package:flutter/widgets.dart';

-/**
+/*
 * Author: xiaojia.dxj
 * Date: 2018/11/22
 * Email: xiaojia.dxj@alibaba-inc.com
@ -10,7 +10,7 @@ import 'package:flutter/widgets.dart';
 * Describle:Row
 */
 class RowMainAxisAlignment extends StatelessWidget {
-  /**
+  /*
   * > mainAxisAlignment属性
   * - MainAxisAlignment.spaceEvenly/spaceAround/spaceBetween,
      - spaceEvenly：将主轴方向空白区域均分，使得children之间空间相等，包括首尾childre
@ -23,7 +23,7 @@ class RowMainAxisAlignment extends StatelessWidget {
   */
  final MainAxisAlignment status;

-  /**
+  /*
   * > CrossAxisAlignment 属性
      -  crossAxisAlignment: CrossAxisAlignment.center/end/start,
      - 即，根据设定的位置交叉对齐
@ -35,7 +35,7 @@ class RowMainAxisAlignment extends StatelessWidget {
  final CrossAxisAlignment crossStatus;

  const RowMainAxisAlignment(
-      MainAxisAlignment this.status, CrossAxisAlignment this.crossStatus)
+       this.status,  this.crossStatus)
      : super();

  @override
--- a/lib/widgets/elements/Frame/Layout/Row/index.dart
+++ b/lib/widgets/elements/Frame/Layout/Row/index.dart
@ -43,12 +43,12 @@ class _DemoState extends State<Demo> {
      contentList: [
        Text0,
        Text1,
-        _RowCreate(),
+        _rowCreate(),
      ],
    );
  }

-  Column _RowCreate() {
+  Column _rowCreate() {
    return new Column(
      children: <Widget>[
        RowLayout(),
--- a/lib/widgets/elements/Frame/Stack/IndexedStack/demo.dart
+++ b/lib/widgets/elements/Frame/Stack/IndexedStack/demo.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';

-/**
+/*
 * Author: xiaojia.dxj
 * Date: 2018/11/22
 * Email: xiaojia.dxj@alibaba-inc.com
@ -12,7 +12,7 @@ import 'package:flutter/material.dart';
 class StackDefault extends StatelessWidget {
  final int currIndex;

-  const StackDefault(int this.currIndex) : super();
+  const StackDefault( this.currIndex) : super();

  @override
  Widget build(BuildContext context) {
@ -54,7 +54,7 @@ class StackDefault extends StatelessWidget {
 class StackIndex extends StatelessWidget {
  final int currIndex;

-  const StackIndex(int this.currIndex) : super();
+  const StackIndex( this.currIndex) : super();

  @override
  Widget build(BuildContext context) {
--- a/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart
+++ b/lib/widgets/elements/Frame/Stack/IndexedStack/index.dart
@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_markdown/flutter_markdown.dart';
 import '../../../../../common/widget_demo.dart';
 import './demo.dart';

@ -22,7 +21,6 @@ class Demo extends StatefulWidget {
 }

 class _DemoState extends State<Demo> {
-  String _desc = "IndexedStack 使用";
  int currIndex = 0;

  void _indexAdd() {
@ -45,12 +43,12 @@ class _DemoState extends State<Demo> {
      contentList: [
        _stackText0,
        _stackText1,
-        _IndexedStackCreate(),
+        _indexedStackCreate(),
      ],
    );
  }

-  Column _IndexedStackCreate() {
+  Column _indexedStackCreate() {
    return new Column(
      children: <Widget>[
        SizedBox(
--- a/lib/widgets/elements/Frame/Stack/Stack/demo.dart
+++ b/lib/widgets/elements/Frame/Stack/Stack/demo.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';

-/**
+/*
 * Author: xiaojia.dxj
 * Date: 2018/11/22
 * Email: xiaojia.dxj@alibaba-inc.com
--- a/lib/widgets/elements/Frame/Stack/Stack/index.dart
+++ b/lib/widgets/elements/Frame/Stack/Stack/index.dart
@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_markdown/flutter_markdown.dart';
 import '../../../../../common/widget_demo.dart';
 import './demo.dart';

@ -36,7 +35,6 @@ class Demo extends StatefulWidget {
 }

 class _DemoState extends State<Demo> {
-  String _desc = "Stack 使用";

  @override
  Widget build(BuildContext context) {
@ -47,7 +45,7 @@ class _DemoState extends State<Demo> {
      docUrl: 'https://docs.flutter.io/flutter/widgets/Stack-class.html',
      contentList: [
        _stackText0,
-        _StackCreate(),
+        _stackCreate(),
        _stackText1,
        new Container(
          width: 300.0,
@ -67,7 +65,7 @@ class _DemoState extends State<Demo> {
    );
  }

-  Column _StackCreate() {
+  Column _stackCreate() {
    return new Column(
      children: <Widget>[
        Column(