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
This commit is contained in:
ryan730
2019-01-12 17:30:11 +08:00
130 changed files with 613 additions and 692 deletions

View File

@ -6,6 +6,7 @@
* email: zhu.yan@alibaba-inc.com
* tartget: BottomAppBar 的示例
*/
import 'package:flutter/material.dart';
/*

View File

@ -7,6 +7,7 @@
* tartget: BottomAppBar 的示例
*/
import '../../../../common/widget_demo.dart';
import 'package:flutter/material.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
@ -24,11 +25,6 @@ const String _Text1 =
> 通常与Scaffold和FloatingActionButton一起使用。
""";
const String _Text2 =
"""### **进阶用法**
> BottomAppBar
-
""";
class Demo extends StatefulWidget {
static const String routeName = '/components//Bar/BottomAppBar';
@ -43,18 +39,18 @@ class _DemoState extends State<Demo> {
return WidgetDemo(
title: 'BottomAppBar',
codeUrl: 'componentss/Bar/BottomAppBar/demo.dart',
contentList: [allDomeBoxs(context, this)],
contentList: [allCheckboxs(context, this)],
docUrl: 'https://docs.flutter.io/flutter/material/BottomAppBar-class.html',
);
}
}
/**
/*
* 所有的 BottomAppBar widget
* context: 运行上下文
* that: 指向有状态的 StatefulWidget
*/
Widget allDomeBoxs(BuildContext context, _DemoState that) {
Widget allCheckboxs(BuildContext context, _DemoState that) {
return Container(
//padding: new EdgeInsets.only(bottom: 20.0, top: 20.0, left: 0, right: 0),
child: Column(