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

@ -7,7 +7,6 @@
* tartget: AppBar 的示例
*/
import 'dart:math';
import 'package:flutter/material.dart';
/*

View File

@ -7,7 +7,7 @@
* tartget: AppBar 的示例
*/
import '../../../../common/widget_demo.dart';
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
@ -48,18 +48,18 @@ class _DemoState extends State<Demo> {
return WidgetDemo(
title: 'AppBar',
codeUrl: 'componentss/Bar/AppBar/demo.dart',
contentList: [ allDemoBoxs(context, this) ],
contentList: [allCheckboxs(context, this)],
docUrl: 'https://docs.flutter.io/flutter/material/AppBar-class.html',
);
}
}
/**
/*
* 所有的 AppBar widget
* context: 运行上下文
* that: 指向有状态的 StatefulWidget
*/
Widget allDemoBoxs(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(