Merge branch 'test'

Author: yangshangzhi

docs/widget/navigator/appbar/index.md

@@ -0,0 +1 @@
+## **AppBar**

docs/widget/navigator/scaffold/index.md

@@ -0,0 +1,34 @@
+## **Scallold**
+>
+页面的基础布局结构控件，
+
+### 构造方法
+``` dart
+Scaffold({
+Key key,
+PreferredSizeWidget appBar,
+Widget body,
+Widget floatingActionButton,
+FloatingActionButtonLocation floatingActionButtonLocation,
+FloatingActionButtonAnimator floatingActionButtonAnimator,
+List<Widget> persistentFooterButtons,
+Widget drawer,
+Widget endDrawer,
+Widget bottomNavigationBar,
+Widget bottomSheet,
+Color backgroundColor,
+bool resizeToAvoidBottomPadding,
+bool resizeToAvoidBottomInset,
+bool primary: true,
+DragStartBehavior drawerDragStartBehavior: DragStartBehavior.down })
+```
+
+### 属性介绍
+* appBar: 头部导航条
+* backgroundColor: 页面背景颜色
+* body : 整个scaffold主要显示模块内容
+* bottomNavigationBar：页面地方导航条
+* bottomSheet: 持久可见的底部sheet,即使用户在和其他页面部分有交互，底部sheet依然是可见的。
+可以使用showBottomSheet函数创建和显示模态底部sheet。如果用ShowBottomSheet这个函数
+创建了bottomSheet，那么在build一个含有bottomSheet的新的Scaffold的时候，当前的bottomSheet必须关闭。bottomSheet可以是任何形式的widget
+* drawer :页面的抽屉，有从左向右或者从右向左的显示效果

docs/widget/scrollview/scrollable/index.md

@@ -0,0 +1,18 @@
+## **GridView**
+
+> 
+Scrollable是一个可滚动的组件，ListView、GridView都会间接使用到该组件。
+
+### 构造方法
+```
+Scrollable({
+  Key key,
+  AxisDirection axisDirection: AxisDirection.down,
+  ScrollController controller,
+  ScrollPhysics physics,
+  @required ViewportBuilder viewportBuilder,
+  bool excludeFromSemantics: false,
+  int semanticChildCount,
+  DragStartBehavior dragStartBehavior: DragStartBehavior.down
+})
+```

flutter-ui

@@ -2,19 +2,22 @@ import 'package:flutter/material.dart';
 
 class Index extends StatelessWidget {
   final dynamic model;
-  Index({Key key, this.model}):super(key: key);
+  Index({Key key, this.model}) : super(key: key);
 
   @override
-  Widget build (BuildContext context) {
+  Widget build(BuildContext context) {
     return Container(
-      child: Center(
-        child: RaisedButton(
-          child: Text('当前为${model.config.state.isPro ? '线上' : '线下'}环境，点击进行切换'),
-          onPressed: () {
-            model.dispatch('config', 'setEnv');
-          },
-        ),
+      child: Row(
+        children: [
+          RaisedButton(
+            child:
+                Text('当前为${model.config.state.isPro ? '线上' : '线下'}环境，点击进行切换'),
+            onPressed: () {
+              model.dispatch('config', 'setEnv');
+            },
+          ),
+        ],
       ),
     );
   }
-}
+}

lib/page/mine/index.dart

@@ -1,6 +1,5 @@
 import 'package:scoped_model/scoped_model.dart';
 import 'user_model.dart' show UserModel;
-import 'theme_model.dart' show AppThemeModel;
 import 'config_state_model.dart' show ConfigModel;
 
 /**
@@ -12,7 +11,7 @@ import 'config_state_model.dart' show ConfigModel;
  */
 
 ///主数据模型，需要全局使用的数据在这里添加模型
-class MainStateModel extends Model with UserModel, AppThemeModel {
+class MainStateModel extends Model with UserModel {
   Map<String, dynamic> state = {};
   ConfigModel config = ConfigModel();
 

lib/store/models/main_state_model.dart

@@ -1,9 +1,10 @@
 import 'scrollview/index.dart' as scrollview;
 import 'regular/index.dart' as regular;
-
+import 'navigator/index.dart' as navigator;
 List getAllWidgets() {
   List routerMap =[];
   routerMap.addAll(scrollview.widgetMap);
   routerMap.addAll(regular.widgetMap);
+  routerMap.addAll(navigator.widgetMap);
   return routerMap;
 }

lib/store/models/theme_model.dart

@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+
+class Index extends StatefulWidget {
+  @override
+  _IndexState createState() => _IndexState();
+}
+
+class _IndexState extends State<Index> {
+  _airDress (){
+    print( '_airDress');
+  }
+  _restitchDress (){
+    print( '_restitchDress');
+  }
+  _repairDress (){
+    print( '_repairDress');
+  }
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('My Fancy Dress'),
+        actions: <Widget>[
+          IconButton(
+            icon: Icon(Icons.playlist_play),
+            tooltip: 'Air it',
+            onPressed: _airDress,
+          ),
+          IconButton(
+            icon: Icon(Icons.playlist_add),
+            tooltip: 'Restitch it',
+            onPressed: _restitchDress,
+          ),
+          IconButton(
+            icon: Icon(Icons.playlist_add_check),
+            tooltip: 'Repair it',
+            onPressed: _repairDress,
+          ),
+        ],
+      )
+    );
+  }
+}

lib/widget/index.dart

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:efox_flutter/components/widgetComp.dart' as WidgetComp;
+import 'demo.dart' as Demo;
+
+class Index extends StatefulWidget {
+  static String title = 'AppBar';
+  static String originCodeUrl = 'https://docs.flutter.io/flutter/material/AppBar-class.html';
+  static String mdUrl = 'docs/widget/navigator/appbar/index.md';
+
+  @override
+  _IndexState createState() => _IndexState();
+}
+
+class _IndexState extends State<Index> {
+  @override
+  Widget build(BuildContext context) {
+    return WidgetComp.Index(
+      title: Index.title,
+      originCodeUrl: Index.originCodeUrl,
+      mdUrl: Index.mdUrl,
+      demoChild: <Widget>[
+        Demo.Index()
+      ],
+    );
+  }
+}