Merge branch 'ysz' into test

Author: yangshangzhi

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,7 @@
 import 'package:efox_flutter/store/objects/widget_info.dart';
 import 'gridview/index.dart' as gridview;
 import 'listview/index.dart' as listview;
+import 'scrollable/index.dart' as scrollable;
 
 const nameSpaces = '/scrollview_';
 
@@ -14,14 +15,19 @@ List widgets = [
     widget: listview.Index(),
     code: 59631, // view_list
     title: listview.Index.title,
+  ),
+  ItemInfo(
+    widget: scrollable.Index(),
+    code: 59631, // view_list
+    title: scrollable.Index.title,
   )
 ];
 
 List widgetMap = [
   ItemListInfo(
     nameSpaces: nameSpaces,
     widgetList: widgets,
-    typeName: 'ScrollView',
+    typeName: 'ScrollComponents',
     code: 58353,
   )
 ];

lib/widget/scrollview/index.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+
+class Index extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _IndexState();
+}
+
+class _IndexState extends State<Index> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Scrollable(
+        viewportBuilder: (context, offset) {
+          return Scrollable(
+            axisDirection: AxisDirection.right,
+            viewportBuilder: (context, offset) {
+              return SingleChildScrollView(
+                child: Column(
+                  mainAxisSize: MainAxisSize.max,
+                  children: List.generate(20, (index) {
+                    return RaisedButton(
+                      child: Text('index $index'),
+                      onPressed: () {
+                        print('$offset');
+                      },
+                    );
+                  }),
+                ),
+              );
+            },
+          );
+        },
+      ),
+    );
+  }
+}

lib/widget/scrollview/scrollable/demo.dart

@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+
+class Index extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _IndexState();
+}
+
+class _IndexState extends State<Index> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scrollable(
+        axisDirection: AxisDirection.left,
+        controller: ScrollController(),
+        viewportBuilder: (context, offset) {
+          return CustomScrollView(
+            slivers: [
+              SliverAppBar(
+                pinned: true,
+                expandedHeight: 250.0,
+                flexibleSpace: FlexibleSpaceBar(
+                  title: Text('这里的标题会随着滚动向移'),
+                ),
+              ),
+              SliverGrid(
+                gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
+                  maxCrossAxisExtent: 200.0,
+                  mainAxisSpacing: 10.0,
+                  crossAxisSpacing: 10.0,
+                  childAspectRatio: 4.0,
+                ),
+                delegate: SliverChildBuilderDelegate(
+                  (BuildContext context, int index) {
+                    return Container(
+                      alignment: Alignment.center,
+                      color: Colors.teal[100 * (index % 9)],
+                      child: Text('grid item $index'),
+                    );
+                  },
+                  childCount: 20,
+                ),
+              ),
+              SliverFixedExtentList(
+                itemExtent: 50.0,
+                delegate: SliverChildBuilderDelegate(
+                  (BuildContext context, int index) {
+                    return Container(
+                      alignment: Alignment.center,
+                      color: Colors.lightBlue[100 * (index % 9)],
+                      child: Text('list item $index'),
+                    );
+                  },
+                  childCount: 20
+                ),
+              ),
+            ],
+          );
+        },
+    );
+  }
+}

lib/widget/scrollview/scrollable/demo_custom_scrollview.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 = 'Scrollable';
+  static String mdUrl = 'docs/widget/scrollview/scrollable/index.md';
+  static String originCodeUrl = 'https://docs.flutter.io/flutter/widgets/Scrollable-class.html';
+
+  @override
+  _IndexState createState() => new _IndexState();
+}
+
+class _IndexState extends State<Index> {
+  @override
+  Widget build(BuildContext context) {
+    return WidgetComp.Index(
+      title: Index.title,
+      originCodeUrl: Index.originCodeUrl,
+      mdUrl: Index.mdUrl,
+      demoChild: [
+        Demo.Index(),
+      ]
+    );
+  }
+}

lib/widget/scrollview/scrollable/index.dart

@@ -57,6 +57,7 @@ flutter:
   assets:
       - locale/
       - docs/widget/scrollview/gridview/
+      - docs/widget/scrollview/scrollable/
       - docs/widget/regular/row/
       - docs/widget/regular/column/
       - docs/widget/regular/container/