Merge 5f7dd03 into 691e0b7

Flutterando · Aug 14, 2020 · c29cc02 · c29cc02
2 parents 691e0b7 + 5f7dd03
commit c29cc02
Show file tree

Hide file tree

Showing 22 changed files with 68 additions and 42 deletions.
diff --git a/flutter_modular/example/lib/app/app_module.dart b/flutter_modular/example/lib/app/app_module.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart' hide Router;
 import 'package:flutter_modular/flutter_modular.dart';
 
 import 'app_widget.dart';

diff --git a/flutter_modular/example/lib/app/modules/home/home_module.dart b/flutter_modular/example/lib/app/modules/home/home_module.dart
@@ -1,6 +1,9 @@
-import 'package:example/app/modules/home/pages/list/list_widget.dart';
+import 'package:flutter/material.dart' hide Router;
+
 import 'package:flutter_modular/flutter_modular.dart';
-import 'package:flutter/material.dart';
+
+import 'pages/list/list_widget.dart';
+
 import 'guard/guard.dart';
 import 'home_bloc.dart';
 import 'home_widget.dart';

diff --git a/flutter_modular/example/lib/app/modules/home/home_widget.dart b/flutter_modular/example/lib/app/modules/home/home_widget.dart
@@ -1,8 +1,10 @@
-import 'package:example/app/modules/home/home_bloc.dart';
-import 'package:example/app/modules/home/home_module.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_modular/flutter_modular.dart';
 
+import 'home_bloc.dart';
+import 'home_module.dart';
+
 class HomeWidget extends ModularStatelessWidget<HomeModule> {
   HomeWidget() {
     var c = Modular.get<HomeBloc>();

diff --git a/flutter_modular/example/lib/app/modules/home/pages/list/list_widget.dart b/flutter_modular/example/lib/app/modules/home/pages/list/list_widget.dart
@@ -1,8 +1,10 @@
-import 'package:example/app/modules/home/home_bloc.dart';
-import 'package:example/app/modules/home/home_module.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_modular/flutter_modular.dart';
 
+import '../../home_bloc.dart';
+import '../../home_module.dart';
+
 class ListWidget extends ModularStatelessWidget<HomeModule> {
   final int param;
 

diff --git a/flutter_modular/example/lib/app/modules/tabs/modules/tab1/tab1_module.dart b/flutter_modular/example/lib/app/modules/tabs/modules/tab1/tab1_module.dart
@@ -1,10 +1,13 @@
-import 'package:example/app/modules/tabs/modules/tab1/pages/page1/page1_page.dart';
-import 'package:example/app/modules/tabs/modules/tab1/pages/page2/page2_bloc.dart';
-import 'package:example/app/modules/tabs/modules/tab1/pages/page1/page1_bloc.dart';
-import 'package:example/app/modules/tabs/modules/tab1/pages/page2/page2_page.dart';
-import 'package:example/app/modules/tabs/modules/tab1/tab1_bloc.dart';
 import 'package:flutter_modular/flutter_modular.dart';
-import 'package:example/app/modules/tabs/modules/tab1/tab1_page.dart';
+
+import 'pages/page1/page1_bloc.dart';
+import 'pages/page1/page1_page.dart';
+
+import 'pages/page2/page2_bloc.dart';
+import 'pages/page2/page2_page.dart';
+
+import 'tab1_bloc.dart';
+import 'tab1_page.dart';
 
 class Tab1Module extends ChildModule {
   @override

diff --git a/flutter_modular/example/lib/app/modules/tabs/modules/tab2/tab2_module.dart b/flutter_modular/example/lib/app/modules/tabs/modules/tab2/tab2_module.dart
@@ -1,6 +1,7 @@
-import 'package:example/app/modules/tabs/modules/tab2/tab2_bloc.dart';
 import 'package:flutter_modular/flutter_modular.dart';
-import 'package:example/app/modules/tabs/modules/tab2/tab2_page.dart';
+
+import 'tab2_bloc.dart';
+import 'tab2_page.dart';
 
 class Tab2Module extends ChildModule {
   @override

diff --git a/flutter_modular/example/lib/app/modules/tabs/tabs_module.dart b/flutter_modular/example/lib/app/modules/tabs/tabs_module.dart
@@ -1,6 +1,7 @@
-import 'package:example/app/modules/tabs/tabs_bloc.dart';
 import 'package:flutter_modular/flutter_modular.dart';
-import 'package:example/app/modules/tabs/tabs_page.dart';
+
+import 'tabs_bloc.dart';
+import 'tabs_page.dart';
 
 class TabsModule extends ChildModule {
   @override

diff --git a/flutter_modular/example/lib/app/modules/tabs/tabs_page.dart b/flutter_modular/example/lib/app/modules/tabs/tabs_page.dart
@@ -1,10 +1,12 @@
-import 'package:example/app/modules/tabs/tabs_bloc.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_modular/flutter_modular.dart';
 
 import 'modules/tab1/tab1_module.dart';
 import 'modules/tab2/tab2_module.dart';
 
+import 'tabs_bloc.dart';
+
 class TabsPage extends StatefulWidget {
   final String title;
   const TabsPage({Key key, this.title = "Tabs"}) : super(key: key);

diff --git a/flutter_modular/example/lib/main.dart b/flutter_modular/example/lib/main.dart
@@ -1,5 +1,7 @@
-import 'package:example/app/app_module.dart';
 import 'package:flutter/widgets.dart';
+
 import 'package:flutter_modular/flutter_modular.dart';
 
+import 'app/app_module.dart';
+
 void main() => runApp(ModularApp(module: AppModule()));
diff --git a/flutter_modular/example/lib/main_guardtest.dart b/flutter_modular/example/lib/main_guardtest.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_modular/flutter_modular.dart';
 
 void main() => runApp(ModularApp(module: AppModule()));

diff --git a/flutter_modular/example/pubspec.yaml b/flutter_modular/example/pubspec.yaml
@@ -17,7 +17,6 @@ environment:
   sdk: ">=2.1.0 <3.0.0"
 
 dependencies:
-
   mobx: ^1.2.1+1
   rxdart: ^0.23.1
   flutter:
@@ -31,7 +30,7 @@ dependencies:
 dev_dependencies:
   mobx_codegen: ^1.1.0+1
   build_runner: ^1.10.0
-  modular_codegen: ^1.0.0-dev.8
+  modular_codegen: ^1.0.1+3
   flutter_test:
     sdk: flutter
 

diff --git a/flutter_modular/lib/src/interfaces/child_module.dart b/flutter_modular/lib/src/interfaces/child_module.dart
@@ -1,4 +1,5 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart' hide Router;
+import 'package:flutter/widgets.dart' hide Router;
 
 import '../../flutter_modular.dart';
 import '../routers/router.dart';

diff --git a/flutter_modular/lib/src/modular_base.dart b/flutter_modular/lib/src/modular_base.dart
@@ -1,5 +1,7 @@
+import 'package:flutter/material.dart' hide Router;
+
 import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart' hide Router;
 
 import '../flutter_modular.dart';
 import 'interfaces/child_module.dart';

diff --git a/flutter_modular/lib/src/routers/router.dart b/flutter_modular/lib/src/routers/router.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
+
 import '../../flutter_modular.dart';
 import '../interfaces/child_module.dart';
 import '../interfaces/route_guard.dart';

diff --git a/flutter_modular/lib/src/widgets/module_widget.dart b/flutter_modular/lib/src/widgets/module_widget.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart' hide Router;
 import '../../flutter_modular.dart';
 
 _debugPrintModular(String text) {

diff --git a/flutter_modular/lib/src/widgets/widget_module.dart b/flutter_modular/lib/src/widgets/widget_module.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart' hide Router;
 import '../../flutter_modular.dart';
 
 _debugPrintModular(String text) {

diff --git a/flutter_modular/test/abstract_router_test.dart b/flutter_modular/test/abstract_router_test.dart
@@ -1,5 +1,7 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Router;
+
 import 'package:flutter_modular/flutter_modular.dart';
+
 import 'package:flutter_test/flutter_test.dart';
 
 class DynamicModule extends ChildModule {

diff --git a/flutter_modular/test/app/app_module.dart b/flutter_modular/test/app/app_module.dart
@@ -1,4 +1,5 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart' hide Router;
+
 import 'package:flutter_modular/flutter_modular.dart';
 
 import 'app_bloc.dart';

diff --git a/flutter_modular/test/app/modules/home/home_module.dart b/flutter_modular/test/app/modules/home/home_module.dart
@@ -1,4 +1,5 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart' hide Router;
+
 import 'package:flutter_modular/flutter_modular.dart';
 
 import '../../app_bloc.dart';

diff --git a/flutter_modular/test/app/modules/product/product_module.dart b/flutter_modular/test/app/modules/product/product_module.dart
@@ -1,4 +1,5 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart' hide Router;
+
 import 'package:flutter_modular/flutter_modular.dart';
 
 import 'product_bloc.dart';

diff --git a/flutter_modular/test/modular_test.dart b/flutter_modular/test/modular_test.dart
@@ -1,6 +1,9 @@
-import 'package:flutter/widgets.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter/widgets.dart' hide Router;
+
 import 'package:flutter_modular/flutter_modular.dart';
+
+import 'package:flutter_test/flutter_test.dart';
+
 import 'app/app_module.dart';
 
 void main() {

diff --git a/flutter_modular/test/routers/router_test.dart b/flutter_modular/test/routers/router_test.dart
@@ -1,5 +1,7 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart' hide Router;
+
 import 'package:flutter_modular/flutter_modular.dart';
+
 import 'package:flutter_test/flutter_test.dart';
 
 class TestModule extends ChildModule {
@@ -8,7 +10,6 @@ class TestModule extends ChildModule {
 
   @override
   List<Router> get routers => [];
-
 }
 
 void main() {
@@ -22,18 +23,16 @@ void main() {
 
   test('throws ArgumentError if both the module and child was provided', () {
     expect(() {
-      Router('/',
-        module: TestModule(),
-        child: (_, __) => SizedBox.shrink()
-      );
+      Router('/', module: TestModule(), child: (_, __) => SizedBox.shrink());
     }, throwsArgumentError);
   });
 
   test('throws ArgumentError if transaction is null', () {
     expect(() {
-      Router('/',
-          child: (_, __) => SizedBox.shrink(),
-          transition: null,
+      Router(
+        '/',
+        child: (_, __) => SizedBox.shrink(),
+        transition: null,
       );
     }, throwsArgumentError);
   });