mirror of
https://github.com/alibaba/flutter-go.git
synced 2025-07-15 03:04:25 +08:00
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:
@ -69,7 +69,7 @@ class _DemoState extends State<Demo> {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* 所有的 OutlineButton 按钮
|
||||
*/
|
||||
Widget allOutlineButtons(BuildContext context,_DemoState that){
|
||||
@ -130,26 +130,26 @@ Widget allOutlineButtons(BuildContext context,_DemoState that){
|
||||
* alert 弹框
|
||||
* context:容器的父级
|
||||
* */
|
||||
void _showMessage(String name, BuildContext context) {
|
||||
showDialog(
|
||||
// alert 的父级
|
||||
context: context,
|
||||
builder: (BuildContext context) {
|
||||
return AlertDialog(
|
||||
title: new Text('提示'),
|
||||
content: new Text(name),
|
||||
actions: <Widget>[
|
||||
new FlatButton(
|
||||
// alert 的取消按钮
|
||||
onPressed: () {
|
||||
// 取消的事件
|
||||
Navigator.of(context).pop(true);
|
||||
},
|
||||
child: new Text('取消'))
|
||||
]);
|
||||
}
|
||||
);
|
||||
}
|
||||
// void _showMessage(String name, BuildContext context) {
|
||||
// showDialog(
|
||||
// // alert 的父级
|
||||
// context: context,
|
||||
// builder: (BuildContext context) {
|
||||
// return AlertDialog(
|
||||
// title: new Text('提示'),
|
||||
// content: new Text(name),
|
||||
// actions: <Widget>[
|
||||
// new FlatButton(
|
||||
// // alert 的取消按钮
|
||||
// onPressed: () {
|
||||
// // 取消的事件
|
||||
// Navigator.of(context).pop(true);
|
||||
// },
|
||||
// child: new Text('取消'))
|
||||
// ]);
|
||||
// }
|
||||
// );
|
||||
// }
|
||||
|
||||
/*
|
||||
* 带align的text
|
||||
|
Reference in New Issue
Block a user