diff --git a/flutter_modular/lib/src/flutter_modular_module.dart b/flutter_modular/lib/src/flutter_modular_module.dart index 82f05ede..d6e65992 100644 --- a/flutter_modular/lib/src/flutter_modular_module.dart +++ b/flutter_modular/lib/src/flutter_modular_module.dart @@ -60,8 +60,7 @@ final injector = AutoInjector( //presenter i.addInstance(GlobalKey()); i.addSingleton( - ModularRouteInformationParser.new, - ); + ModularRouteInformationParser.new); i.addSingleton(ModularRouterDelegate.new); i.add(() => i()); i.addLazySingleton(ModularBase.new); diff --git a/flutter_modular/lib/src/presenter/modular_base.dart b/flutter_modular/lib/src/presenter/modular_base.dart index 28cc61ed..1934aebd 100644 --- a/flutter_modular/lib/src/presenter/modular_base.dart +++ b/flutter_modular/lib/src/presenter/modular_base.dart @@ -116,20 +116,20 @@ class ModularBase implements IModularBase { @override String get initialRoutePath => _initialRoutePath; - ModularBase({ - required this.routeInformationParser, - required this.routerDelegate, - required this.disposeBind, - required this.getArguments, - required this.finishModule, - required this.getBind, - required this.startModule, - required this.navigator, - required this.setArgumentsUsecase, - required this.bindModuleUsecase, - required this.unbindModuleUsecase, - required this.replaceInstanceUsecase, - }); + ModularBase( + this.routeInformationParser, + this.routerDelegate, + this.disposeBind, + this.getArguments, + this.finishModule, + this.getBind, + this.startModule, + this.navigator, + this.setArgumentsUsecase, + this.bindModuleUsecase, + this.unbindModuleUsecase, + this.replaceInstanceUsecase, + ); @override bool dispose({String? key}) => diff --git a/flutter_modular/lib/src/presenter/navigation/modular_route_information_parser.dart b/flutter_modular/lib/src/presenter/navigation/modular_route_information_parser.dart index 42ea2333..3300095e 100644 --- a/flutter_modular/lib/src/presenter/navigation/modular_route_information_parser.dart +++ b/flutter_modular/lib/src/presenter/navigation/modular_route_information_parser.dart @@ -22,13 +22,13 @@ class ModularRouteInformationParser final ReportPush reportPush; final UrlService urlService; - ModularRouteInformationParser({ - required this.getRoute, - required this.getArguments, - required this.setArguments, - required this.reportPush, - required this.urlService, - }); + ModularRouteInformationParser( + this.getRoute, + this.getArguments, + this.setArguments, + this.reportPush, + this.urlService, + ); @override Future parseRouteInformation( diff --git a/flutter_modular/lib/src/presenter/navigation/modular_router_delegate.dart b/flutter_modular/lib/src/presenter/navigation/modular_router_delegate.dart index d97d77d6..ad6e679e 100644 --- a/flutter_modular/lib/src/presenter/navigation/modular_router_delegate.dart +++ b/flutter_modular/lib/src/presenter/navigation/modular_router_delegate.dart @@ -23,10 +23,7 @@ class ModularRouterDelegate extends RouterDelegate final ReportPop reportPop; List observers = []; - ModularRouterDelegate( - {required this.parser, - required this.navigatorKey, - required this.reportPop}); + ModularRouterDelegate(this.parser, this.navigatorKey, this.reportPop); @override ModularBook? currentConfiguration; diff --git a/flutter_modular/test/src/presenter/modular_base_test.dart b/flutter_modular/test/src/presenter/modular_base_test.dart index 1cb4e764..75a514ac 100644 --- a/flutter_modular/test/src/presenter/modular_base_test.dart +++ b/flutter_modular/test/src/presenter/modular_base_test.dart @@ -84,18 +84,18 @@ void main() { setUp(() { modularBase = ModularBase( - disposeBind: disposeBind, - finishModule: finishModule, - getArguments: getArguments, - getBind: getBind, - navigator: modularNavigator, - startModule: startModule, - routeInformationParser: routeInformationParser, - routerDelegate: routerDelegate, - setArgumentsUsecase: setArguments, - bindModuleUsecase: bindModule, - replaceInstanceUsecase: replaceInstance, - unbindModuleUsecase: unbindModule, + routeInformationParser, + routerDelegate, + disposeBind, + getArguments, + finishModule, + getBind, + startModule, + modularNavigator, + setArguments, + bindModule, + unbindModule, + replaceInstance, ); reset(disposeBind); diff --git a/flutter_modular/test/src/presenter/navigation/modular_route_information_parser_test.dart b/flutter_modular/test/src/presenter/navigation/modular_route_information_parser_test.dart index 2805634b..ef7298fe 100644 --- a/flutter_modular/test/src/presenter/navigation/modular_route_information_parser_test.dart +++ b/flutter_modular/test/src/presenter/navigation/modular_route_information_parser_test.dart @@ -48,11 +48,11 @@ void main() { reportPush = ReportPushMock(); urlService = UrlServiceMock(); parser = ModularRouteInformationParser( - getArguments: getArguments, - getRoute: getRoute, - setArguments: setArguments, - reportPush: reportPush, - urlService: urlService, + getRoute, + getArguments, + setArguments, + reportPush, + urlService, ); }); diff --git a/flutter_modular/test/src/presenter/navigation/modular_router_delegate_test.dart b/flutter_modular/test/src/presenter/navigation/modular_router_delegate_test.dart index 8c2a894e..8b372eff 100644 --- a/flutter_modular/test/src/presenter/navigation/modular_router_delegate_test.dart +++ b/flutter_modular/test/src/presenter/navigation/modular_router_delegate_test.dart @@ -54,11 +54,7 @@ void main() { reportPopMock = ReportPopMock(); when(() => key.currentState).thenReturn(navigatorState); parser = ModularRouteInformationParserMock(); - delegate = ModularRouterDelegate( - parser: parser, - navigatorKey: key, - reportPop: reportPopMock, - ); + delegate = ModularRouterDelegate(parser, key, reportPopMock); }); test('setObserver', () {