feat: route add TransitionType.nativeModal

zymxxxs · zymxxxs · commit 4dd9a083177d · 2019-11-08T13:18:19.000+08:00
diff --git a/lib/components/list_view_item.dart b/lib/components/list_view_item.dart
@@ -1,3 +1,5 @@
+import 'package:fluro/fluro.dart';
+
 /// @Author: 一凨
 /// @Date: 2019-01-14 17:53:54
 /// @Last Modified by: 一凨
@@ -25,8 +27,11 @@ class ListViewItem extends StatelessWidget {
       child: ListTile(
         onTap: () {
           // _launchURL(itemUrl, context);
-          Application.router.navigateTo(context,
-              '${Routes.webViewPage}?title=${Uri.encodeComponent(itemTitle)}&url=${Uri.encodeComponent(itemUrl)}');
+          Application.router.navigateTo(
+            context,
+            '${Routes.webViewPage}?title=${Uri.encodeComponent(itemTitle)}&url=${Uri.encodeComponent(itemUrl)}',
+            transition: TransitionType.nativeModal,
+          );
         },
         title: Padding(
           child: Text(
diff --git a/lib/components/widget_demo.dart b/lib/components/widget_demo.dart
@@ -3,6 +3,7 @@
 
 import 'dart:core';
 
+import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_go/utils/data_utils.dart';
 
@@ -136,11 +137,17 @@ class _WidgetDemoState extends State<WidgetDemo> {
   void _selectValue(value) {
     if (value == 'doc') {
       // _launchURL(widget.docUrl);
-      Application.router.navigateTo(context,
-          '${Routes.webViewPage}?title=${Uri.encodeComponent(widget.title)} Doc&&url=${Uri.encodeComponent(widget.docUrl)}');
+      Application.router.navigateTo(
+        context,
+        '${Routes.webViewPage}?title=${Uri.encodeComponent(widget.title)} Doc&&url=${Uri.encodeComponent(widget.docUrl)}',
+        transition: TransitionType.nativeModal,
+      );
     } else if (value == 'code') {
-      Application.router.navigateTo(context,
-          '${Routes.codeView}?filePath=${Uri.encodeComponent(widget.codeUrl)}');
+      Application.router.navigateTo(
+        context,
+        '${Routes.codeView}?filePath=${Uri.encodeComponent(widget.codeUrl)}',
+        transition: TransitionType.nativeModal,
+      );
     }
   }
 
diff --git a/lib/components/widget_item_container.dart b/lib/components/widget_item_container.dart
@@ -36,15 +36,21 @@ class WidgetItemContainer extends StatelessWidget {
         targetRouter = targetRouter.toLowerCase();
       }
     });
-    Application.router.navigateTo(context, targetRouter,
-        transition: TransitionType.native);
+    Application.router.navigateTo(
+      context,
+      targetRouter,
+      transition: TransitionType.native,
+    );
   }
 
   /// 跳转到新的标准页
   void tapToStandardPage(WidgetLeaf leaf, BuildContext context) {
     String targetRouter = '/standard-page/${leaf.pageId}';
-    Application.router.navigateTo(context, targetRouter,
-        transition: TransitionType.native);
+    Application.router.navigateTo(
+      context,
+      targetRouter,
+      transition: TransitionType.native,
+    );
   }
 
   List<Widget> _buildColumns(context) {
diff --git a/lib/views/collection_page/collection_page.dart b/lib/views/collection_page/collection_page.dart
@@ -1,3 +1,5 @@
+import 'package:fluro/fluro.dart';
+
 /// @Author: 一凨
 /// @Date: 2019-01-08 17:12:58
 /// @Last Modified by: 一凨
@@ -118,11 +120,17 @@ class _CollectionPageState extends State<CollectionPage> {
         onTap: () {
           if (_collectionList[index - 1].router.contains('http')) {
             // 注意这里title已经转义过了
-            Application.router.navigateTo(context,
-                '${Routes.webViewPage}?title=${_collectionList[index - 1].name}&url=${Uri.encodeComponent(_collectionList[index - 1].router)}');
+            Application.router.navigateTo(
+              context,
+              '${Routes.webViewPage}?title=${_collectionList[index - 1].name}&url=${Uri.encodeComponent(_collectionList[index - 1].router)}',
+              transition: TransitionType.nativeModal,
+            );
           } else {
-            Application.router
-                .navigateTo(context, "${_collectionList[index - 1].router}");
+            Application.router.navigateTo(
+              context,
+              "${_collectionList[index - 1].router}",
+              transition: TransitionType.nativeModal,
+            );
           }
         },
       ),
diff --git a/lib/views/first_page/drawer_page.dart b/lib/views/first_page/drawer_page.dart
@@ -172,9 +172,11 @@ class _DrawerPageState extends State<DrawerPage> {
             style: textStyle,
           ),
           onTap: () {
-            Application.router.navigateTo(context,
-                '${Routes.collectionFullPage}?hasLogin=${hasLogin.toString()}',
-                transition: TransitionType.fadeIn);
+            Application.router.navigateTo(
+              context,
+              '${Routes.collectionFullPage}?hasLogin=${hasLogin.toString()}',
+              transition: TransitionType.nativeModal,
+            );
           },
         ),
         // new Divider(),
@@ -205,10 +207,18 @@ class _DrawerPageState extends State<DrawerPage> {
           onTap: () {
             if (hasLogin) {
               //issue 未登陆状态 返回登陆页面
-              Application.router.navigateTo(context, '${Routes.issuesMessage}');
+              Application.router.navigateTo(
+                context,
+                '${Routes.issuesMessage}',
+                transition: TransitionType.nativeModal,
+              );
             } else {
               //No description provided.
-              Application.router.navigateTo(context, '${Routes.loginPage}');
+              Application.router.navigateTo(
+                context,
+                '${Routes.loginPage}',
+                transition: TransitionType.nativeModal,
+              );
             }
           },
         ),
diff --git a/lib/views/first_page/main_page.dart b/lib/views/first_page/main_page.dart
@@ -1,3 +1,4 @@
+import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_go/views/first_page/drawer_page.dart';
@@ -84,16 +85,22 @@ class TabLayout extends StatelessWidget {
         onTap: (index) {
           if (index == 1) {
             DefaultTabController.of(context).animateTo(0);
-            Application.router.navigateTo(context,
-                '${Routes.webViewPage}?title=${Uri.encodeComponent('Flutter Go 官方网站')}&url=${Uri.encodeComponent('https://flutter-go.pub')}');
+            Application.router.navigateTo(
+              context,
+              '${Routes.webViewPage}?title=${Uri.encodeComponent('Flutter Go 官方网站')}&url=${Uri.encodeComponent('https://flutter-go.pub')}',
+              transition: TransitionType.nativeModal,
+            );
           } else if (index == 2) {
 //          new Future.delayed(const Duration(seconds: 1),(){
 //            showAlertDialog(Application.globalContext);
 //          });
 
             DefaultTabController.of(context).animateTo(0);
-            Application.router.navigateTo(context,
-                '${Routes.webViewPage}?title=${Uri.encodeComponent('Flutter Go web版(H5)')}&url=${Uri.encodeComponent('https://flutter-go.pub/flutter_go_web')}');
+            Application.router.navigateTo(
+              context,
+              '${Routes.webViewPage}?title=${Uri.encodeComponent('Flutter Go web版(H5)')}&url=${Uri.encodeComponent('https://flutter-go.pub/flutter_go_web')}',
+              transition: TransitionType.nativeModal,
+            );
           }
         });
     return _tabBar;
diff --git a/lib/views/first_page/search_page.dart b/lib/views/first_page/search_page.dart
@@ -1,3 +1,4 @@
+import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter/cupertino.dart';
@@ -27,8 +28,11 @@ final _industryPage = Industry.IndustryPage(itemTitle: (state) {
           print(state.res[index].source);
           final itemTitle = state.res[index].title;
           final itemUrl = state.res[index].source;
-          Application.router.navigateTo(context,
-              '${Routes.webViewPage}?title=${Uri.encodeComponent(itemTitle)}&url=${Uri.encodeComponent(itemUrl)}');
+          Application.router.navigateTo(
+            context,
+            '${Routes.webViewPage}?title=${Uri.encodeComponent(itemTitle)}&url=${Uri.encodeComponent(itemUrl)}',
+            transition: TransitionType.nativeModal,
+          );
         },
       );
     },
diff --git a/lib/views/fourth_page/pages.dart b/lib/views/fourth_page/pages.dart
@@ -1,3 +1,4 @@
+import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
 
 import '../../routers/application.dart';
@@ -51,8 +52,11 @@ class Page extends StatelessWidget {
               ..putBool(SharedPreferencesKeys.showWelcome, false);
             _goHomePage(context);
           } else if (type == 'goGithub') {
-            Application.router.navigateTo(context,
-                '${Routes.webViewPage}?title=${Uri.encodeComponent(txt)} Doc&&url=${Uri.encodeComponent("https://github.com/alibaba/flutter-go")}');
+            Application.router.navigateTo(
+              context,
+              '${Routes.webViewPage}?title=${Uri.encodeComponent(txt)} Doc&&url=${Uri.encodeComponent("https://github.com/alibaba/flutter-go")}',
+              transition: TransitionType.nativeModal,
+            );
           }
         },
         elevation: 10.0,
@@ -93,8 +97,12 @@ class Page extends StatelessWidget {
           Positioned(
               right: -5.0,
               top: paddingTop + 2.0,
-              child: creatButton(context, 'GitHub', Icons.arrow_forward, 'goGithub')
-          ),
+              child: creatButton(
+                context,
+                'GitHub',
+                Icons.arrow_forward,
+                'goGithub',
+              )),
         ]);
   }
 
diff --git a/lib/views/login_page/login_page.dart b/lib/views/login_page/login_page.dart
@@ -1,3 +1,4 @@
+import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:event_bus/event_bus.dart';
@@ -376,8 +377,11 @@ class _LoginPageState extends State<LoginPage> {
                                   decoration: TextDecoration.underline),
                             ),
                             onPressed: () {
-                              Application.router.navigateTo(context,
-                                  '${Routes.webViewPage}?title=Github&url=${Uri.encodeComponent("https://github.com/login/oauth/authorize?client_id=cfe4795e76382ae8a5bd&scope=user,public_repo")}');
+                              Application.router.navigateTo(
+                                context,
+                                '${Routes.webViewPage}?title=Github&url=${Uri.encodeComponent("https://github.com/login/oauth/authorize?client_id=cfe4795e76382ae8a5bd&scope=user,public_repo")}',
+                                transition: TransitionType.nativeModal,
+                              );
                             },
                           ),
                           FlatButton(
@@ -389,8 +393,11 @@ class _LoginPageState extends State<LoginPage> {
                             ),
                             onPressed: () {
                               Application.router.navigateTo(
-                                  context, Routes.home,
-                                  clearStack: true);
+                                context,
+                                Routes.home,
+                                clearStack: true,
+                                transition: TransitionType.nativeModal,
+                              );
                             },
                           )
                         ],
diff --git a/lib/views/standard_demo_page/index.dart b/lib/views/standard_demo_page/index.dart
@@ -7,6 +7,7 @@
 // tartget:  xxx
 //
 
+import 'package:fluro/fluro.dart';
 import 'package:flutter/material.dart';
 import '../../components/widget_demo.dart';
 import 'dart:convert';
@@ -146,8 +147,11 @@ class _StandardView extends State<StandardView> {
 
     String remoteSouceCode =
         '$githubHost/lib/page_demo_package/${demoDetail['name']}_${demoDetail['author']}_${demoDetail['id']}/src/index.dart';
-    Application.router.navigateTo(context,
-        '${Routes.githubCodeView}?remotePath=${Uri.encodeComponent(remoteSouceCode)}');
+    Application.router.navigateTo(
+      context,
+      '${Routes.githubCodeView}?remotePath=${Uri.encodeComponent(remoteSouceCode)}',
+      transition: TransitionType.nativeModal,
+    );
   }
 
   Widget buildFootInfo() {
