flutter/flutter-go
1
0
Fork 0
mirror of https://github.com/alibaba/flutter-go.git synced 2025-06-01 14:58:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dev/yisheng

Browse Source 
# 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
parent c7b70a02f2 ea12dcbea5
commit c0d90db596
130 changed files with 613 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/widgets/components/Navigation/BottomNavigationBar/demo.dart
View File

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

6
lib/widgets/components/Navigation/BottomNavigationBar/index.dart
View File

@ -6,7 +6,7 @@
* email: zhu.yan@alibaba-inc.com
* tartget: BottomNavigationBar 的示例
*/
import '../../../../routers/application.dart';
import 'package:flutter/material.dart';
import '../../../../common/widget_demo.dart';
@ -42,7 +42,7 @@ class _DemoState extends State<Demo> {
Widget build(BuildContext context) {
return WidgetDemo(
title: 'BottomNavigationBar',
codeUrl: '${Application.github['widgetsURL']}components/Navigation/BottomNavigationBar/demo.dart',
codeUrl: 'components/Navigation/BottomNavigationBar/demo.dart',
contentList: [allDemoBoxs(context, this)],
docUrl: 'https://docs.flutter.io/flutter/material/BottomNavigationBar-class.html',
bottomNaviBar:BottomNavigationBarDemo.BottomNavigationBarFullDefault()
@ -50,7 +50,7 @@ class _DemoState extends State<Demo> {
}
}
/**
/*
* 所有的 BottomNavigationBar widget
* context: 运行上下文
* that: 指向有状态的 StatefulWidget