refactor: add hide Router to Widgets and Material imports

Flutterando · Aug 14, 2020 · 5f7dd03 · 5f7dd03
1 parent 542adc4
commit 5f7dd03
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 24 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/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/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);
   });