Merge branch 'dev' of https://github.com/efoxTeam/flutter-ui into dev

ckken · ckken · commit 204dfe51c7f8 · 2019-03-21T17:10:52.000+08:00
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.flutter.beer">
+    package="com.flutter.beer"
+    android:installLocation="preferExternal">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
@@ -37,3 +38,4 @@
         </activity>
     </application>
 </manifest>
+
diff --git a/docs/widget/vision/transform/index.md b/docs/widget/vision/transform/index.md
@@ -1 +1,24 @@
-## **文档完善中**
+## **Transform**
+
+> 在绘制子元素前应用转换的组件
+
+### 构造方法
+```
+Transform({
+  Key key, 
+  @required Matrix4 transform,
+  Offset origin,
+  AlignmentGeometry alignment,
+  bool transformHitTests: true,
+  Widget child
+})
+```
+
+### 属性介绍
+origin：坐标系的原点（相对于此渲染对象的左上角）应用矩阵的原点
+alignment：原点的对齐方式
+transform： 在绘制过程中改变子元素的矩阵
+transformHitTests：在测试时是否执行转换
+
+
+### 实例
diff --git a/lib/components/widgetComp.dart b/lib/components/widgetComp.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:efox_flutter/store/index.dart' show Store;
-import 'headerComp.dart' as Header;
 import 'package:efox_flutter/components/markdownComp.dart' as MarkDownComp;
 import 'package:efox_flutter/lang/index.dart' show AppLocalizations;
 import 'package:efox_flutter/components/baseComp.dart' as BaseComp;
diff --git a/lib/config/index.dart b/lib/config/index.dart
@@ -1,6 +1,6 @@
 import 'development.dart' as Development;
 import 'production.dart' as Production;
 
-const bool isPro = true;
+const bool isPro = false;
 
 Object env = isPro ? Production.Config() : Development.Config();
diff --git a/lib/page/component/tabs.dart b/lib/page/component/tabs.dart
@@ -5,7 +5,6 @@ import 'package:efox_flutter/config/theme.dart' show AppTheme;
 import 'package:efox_flutter/widget/index.dart' as WidgetRoot;
 import 'package:efox_flutter/router/index.dart' show FluroRouter;
 import 'package:efox_flutter/lang/index.dart' show AppLocalizations;
-// import 'package:efox_flutter/components/headerComp.dart' as Header;
 
 class Index extends StatefulWidget {
   final MainStateModel model;
@@ -45,12 +44,6 @@ class _IndexState extends State<Index>
   Widget build(BuildContext context) {
     return Scaffold(
         key: _scaffoldKey,
-        /* appBar: AppBar(
-          title: Header.Index(
-            AppLocalizations.$t('nav_title_0'),
-          ),
-          actions: appBarActions(),
-        ), */
         appBar: PreferredSize(
           preferredSize: Size.fromHeight(kToolbarHeight),
           child: Container(
@@ -76,13 +69,6 @@ class _IndexState extends State<Index>
         tabs: _mapList.map((v) {
           return new Tab(
             text: AppLocalizations.$t(v.typeName),
-            /* icon: Icon(
-              IconData(
-                v.code,
-                fontFamily: 'MaterialIcons',
-                matchTextDirection: true,
-              ),
-            ), */
           );
         }).toList());
   }
@@ -152,36 +138,4 @@ class _IndexState extends State<Index>
       ),
     );
   }
-
-  List<Widget> appBarActions() {
-    return [
-      PopupMenuButton(
-        icon: Icon(
-          Icons.more_vert,
-        ),
-        onSelected: (local) {
-          AppLocalizations.changeLanguage(Locale(local));
-          print('local=$local');
-        },
-        itemBuilder: (context) => [
-              PopupMenuItem(
-                child: Row(
-                  children: <Widget>[
-                    Text('中文'),
-                  ],
-                ),
-                value: 'zh',
-              ),
-              PopupMenuItem(
-                child: Row(
-                  children: <Widget>[
-                    Text('english'),
-                  ],
-                ),
-                value: 'en',
-              ),
-            ],
-      ),
-    ];
-  }
 }
diff --git a/lib/widget/gestures/gesturedetector/demo.dart b/lib/widget/gestures/gesturedetector/demo.dart
@@ -6,19 +6,135 @@ class Index extends StatefulWidget {
 }
 
 class _IndexState extends State<Index> {
+  bool isOn = false;
+  String _value = '';
+  String _value2 = '';
   @override
   void initState() {
     super.initState();
   }
 
+  updateText(txt) {
+    setState(() {
+      _value = txt;
+    });
+  }
+
+  updateText2(txt) {
+    setState(() {
+      _value2 = txt;
+    });
+  }
+
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         title: Text('GestureDetector'),
       ),
       body: Center(
-        child: Text('更新中'),
+        child: Column(
+          children: <Widget>[
+            GestureDetector(
+              onTap: () {
+                Scaffold.of(context).showSnackBar(
+                    SnackBar(content: Text('you click the button')));
+              },
+              child: Icon(
+                Icons.share,
+                color: Colors.red,
+              ),
+            ),
+            GestureDetector(
+              onPanStart: (ev) {
+                updateText('onPanStart $ev');
+              },
+              onPanEnd: (ev) {
+                updateText('onPanEnd $ev');
+              },
+              onPanCancel: () {
+                updateText('onPanCancel');
+              },
+              onPanDown: (ev) {
+                updateText('onPanDown $ev');
+              },
+              onPanUpdate: (ev) {
+                updateText('onPanUpdate $ev');
+              },
+              onDoubleTap: () {
+                updateText('onDoubleTap');
+              },
+              // 连接点击两次的话，不会触发onTap，只会触发 onDoubleTap
+              onTap: () {
+                updateText('onTap');
+                setState(() {
+                  isOn = !isOn;
+                });
+              },
+              child: Container(
+                alignment: Alignment.center,
+                height: 100,
+                width: 200,
+                color: Colors.blue,
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: <Widget>[
+                    Text('TURN LIGHTS ON'),
+                    Divider(),
+                    Icon(
+                      Icons.lightbulb_outline,
+                      color: isOn ? Colors.yellow : Colors.grey,
+                    )
+                  ],
+                ),
+              ),
+            ),
+            Text(_value),
+            GestureDetector(
+              onLongPress: () {
+                updateText2('onLongPress');
+              },
+              onForcePressEnd: (ev) {
+                updateText2('onForcePressEnd ${ev.globalPosition}');
+              },
+              onForcePressStart: (ev) {
+                updateText2('onForcePressStart ${ev.globalPosition}');
+              },
+              onForcePressUpdate: (ev) {
+                updateText2('onForcePressUpdate ${ev.globalPosition}');
+              },
+              onForcePressPeak: (ev) {
+                updateText2('onForcePressPeak ${ev.globalPosition}');
+              },
+              // 连接点击两次的话，不会触发onTap，只会触发 onDoubleTap
+              onTap: () {
+                updateText2('onDoubleTap');
+                setState(() {
+                  isOn = !isOn;
+                });
+              },
+              child: Container(
+                alignment: Alignment.center,
+                height: 100,
+                width: 200,
+                color: Colors.blue,
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: <Widget>[
+                    Text('Tap or DoubleTap is not useful'),
+                    Divider(),
+                    Icon(
+                      Icons.lightbulb_outline,
+                      color: isOn ? Colors.yellow : Colors.grey,
+                    )
+                  ],
+                ),
+              ),
+            ),
+            Text(_value2),
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/widget/gestures/gesturedetector/demo_drag.dart b/lib/widget/gestures/gesturedetector/demo_drag.dart
@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+
+class Index extends StatefulWidget {
+  @override
+  State<StatefulWidget> createState() => _IndexState();
+}
+
+class _IndexState extends State<Index> {
+  double _top = 0;
+  double _left = 0;
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  setPanEvent(txt, [ev]) {
+    print('$txt  $ev');
+
+    if (ev != null && ev.delta != null) {
+      setState(() {
+        _top += ev.delta.dy;
+        _left += ev.delta.dx;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('GestureDetectorDrag'),
+      ),
+      body: Center(
+        child: Stack(
+          children: <Widget>[
+            Positioned(
+              width:40,
+              height: 40,
+              top: _top,
+              left: _left,
+              child: GestureDetector(
+                child: CircleAvatar(
+                  child: Text("Drag"),
+                ),
+                onPanStart: (ev) {
+                  setPanEvent('onPanStart', ev);
+                },
+                // DragEndDetails结束时用户滑动的瞬间速度
+                onPanEnd: (DragEndDetails ev) {
+                  // setPanEvent('onPanEnd', ev);
+                  print('end $ev');
+                },
+                onPanCancel: () {
+                  setPanEvent('onPanCancel');
+                },
+                // DragDownDetails返回相对屏幕的位置
+                onPanDown: (DragDownDetails ev) {
+                  // setPanEvent('onPanDown', ev);
+                  print('DragDownDetails ${ev.globalPosition}');
+                },
+                onPanUpdate: (DragUpdateDetails ev) {
+                  setPanEvent('onPanUpdate', ev);
+                },
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widget/gestures/gesturedetector/index.dart b/lib/widget/gestures/gesturedetector/index.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:efox_flutter/components/widgetComp.dart' as WidgetComp;
 import 'demo.dart' as Demo;
+import 'demo_drag.dart' as DemoDrag;
 
 class Index extends StatefulWidget {
   static String title = 'GestureDetector';
@@ -20,6 +21,7 @@ class _IndexState extends State<Index> {
       mdUrl: Index.mdUrl,
       demoChild: [
         Demo.Index(),
+        DemoDrag.Index(),
       ],
     );
   }
diff --git a/lib/widget/vision/transform/demo.dart b/lib/widget/vision/transform/demo.dart
@@ -15,10 +15,16 @@ class _IndexState extends State<Index> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text('SingleChildScrollView'),
+        title: Text('Transform'),
       ),
-      body: Center(
-        child: Text('更新中'),
+      body: Transform(
+        alignment: Alignment.center,
+        transform: Matrix4.skewY(0.1),
+        child: Container(
+          padding: const EdgeInsets.all(8.0),
+          color: const Color(0xFFE8581C),
+          child: const Text('Apartment for rent!'),
+        ),
       ),
     );
   }
diff --git a/locale/zh.json b/locale/zh.json
@@ -12,8 +12,8 @@
         "compProgress": "组件进度"
     },
     "common_mine_1" : {
-        "cn": "CN",
-        "en": "EN",
+        "cn": "中文",
+        "en": "英文",
         "language": "选择语言",
         "environment": "选择环境",
         "compProgress": "组件进度",
