From 7b8a150f8933486e8e45525302732b11ea7f6146 Mon Sep 17 00:00:00 2001 From: Stenio Oliveira Date: Fri, 16 Feb 2024 10:31:32 -0300 Subject: [PATCH 1/7] remove unnecessary value --- .../navigation/modular_route_information_parser.dart | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 84693519..7e71fb2f 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,7 +22,7 @@ class ModularRouteInformationParser final ReportPush reportPush; final UrlService urlService; - bool _firstParse = false; + final bool _firstParse = false; ModularRouteInformationParser({ required this.getRoute, @@ -40,7 +40,7 @@ class ModularRouteInformationParser // 3.10 wrapper final location = [null].contains(routeInformation.location) ? '/' - : routeInformation.location!; + : routeInformation.location; if (location == '/') { // ignore: invalid_use_of_visible_for_testing_member path = urlService.getPath() ?? Modular.initialRoutePath; @@ -48,8 +48,6 @@ class ModularRouteInformationParser // 3.10 wrapper path = location; } - - _firstParse = true; } else { // ignore: invalid_use_of_visible_for_testing_member path = urlService.getPath() ?? Modular.initialRoutePath; From 1a9e73f87ef96b609a08fd958bd0ec4bb21f84da Mon Sep 17 00:00:00 2001 From: Stenio Oliveira Date: Mon, 1 Apr 2024 13:58:45 -0300 Subject: [PATCH 2/7] remove unnecessary condition --- .../modular_route_information_parser.dart | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) 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 7e71fb2f..a41476fa 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,8 +22,6 @@ class ModularRouteInformationParser final ReportPush reportPush; final UrlService urlService; - final bool _firstParse = false; - ModularRouteInformationParser({ required this.getRoute, required this.getArguments, @@ -36,23 +34,21 @@ class ModularRouteInformationParser Future parseRouteInformation( RouteInformation routeInformation) async { var path = ''; - if (!_firstParse) { - // 3.10 wrapper - final location = [null].contains(routeInformation.location) - ? '/' - : routeInformation.location; - if (location == '/') { - // ignore: invalid_use_of_visible_for_testing_member - path = urlService.getPath() ?? Modular.initialRoutePath; - } else { - // 3.10 wrapper - path = location; - } - } else { + + final location = [null].contains(routeInformation.location) + ? '/' + : routeInformation.location; + if (location == '/') { // ignore: invalid_use_of_visible_for_testing_member path = urlService.getPath() ?? Modular.initialRoutePath; + } else { + // 3.10 wrapper + path = location; } + // ignore: invalid_use_of_visible_for_testing_member + path = urlService.getPath() ?? Modular.initialRoutePath; + return selectBook(path); } From 76828137c0cbc75a846b94db3f8e7185c2db6a31 Mon Sep 17 00:00:00 2001 From: Stenio Oliveira Date: Mon, 1 Apr 2024 14:45:18 -0300 Subject: [PATCH 3/7] adjusted comment --- .../presenter/navigation/modular_route_information_parser.dart | 1 + 1 file changed, 1 insertion(+) 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 a41476fa..d1220f4f 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 @@ -35,6 +35,7 @@ class ModularRouteInformationParser RouteInformation routeInformation) async { var path = ''; + // 3.10 wrapper final location = [null].contains(routeInformation.location) ? '/' : routeInformation.location; From a281fe681f41e131b27ee5c491f7535554ec5751 Mon Sep 17 00:00:00 2001 From: Stenio Oliveira Date: Mon, 1 Apr 2024 16:59:58 -0300 Subject: [PATCH 4/7] removed path attribution --- .../presenter/navigation/modular_route_information_parser.dart | 3 --- 1 file changed, 3 deletions(-) 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 d1220f4f..61888641 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 @@ -47,9 +47,6 @@ class ModularRouteInformationParser path = location; } - // ignore: invalid_use_of_visible_for_testing_member - path = urlService.getPath() ?? Modular.initialRoutePath; - return selectBook(path); } From 5a1bf84caaf707f1967d8db8b72f4edf698a4906 Mon Sep 17 00:00:00 2001 From: Stenio Oliveira Date: Thu, 4 Apr 2024 13:59:25 -0300 Subject: [PATCH 5/7] adjusted deprecated location to uri path --- .../presenter/navigation/modular_route_information_parser.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 61888641..6bf11254 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 @@ -38,7 +38,7 @@ class ModularRouteInformationParser // 3.10 wrapper final location = [null].contains(routeInformation.location) ? '/' - : routeInformation.location; + : routeInformation.uri.path; if (location == '/') { // ignore: invalid_use_of_visible_for_testing_member path = urlService.getPath() ?? Modular.initialRoutePath; From f40f9ac894e1baae3806dd569fa06ffcac0b1226 Mon Sep 17 00:00:00 2001 From: Stenio Oliveira Date: Thu, 4 Apr 2024 13:59:48 -0300 Subject: [PATCH 6/7] adjusted const error in test --- .../test/src/infra/services/bind_service_impl_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shelf_modular/test/src/infra/services/bind_service_impl_test.dart b/shelf_modular/test/src/infra/services/bind_service_impl_test.dart index 2bde731a..07a7c800 100644 --- a/shelf_modular/test/src/infra/services/bind_service_impl_test.dart +++ b/shelf_modular/test/src/infra/services/bind_service_impl_test.dart @@ -18,7 +18,7 @@ void main() { }); test('should throw error not found bind', () { when(() => injector.get()).thenThrow( - const AutoInjectorException('String'), + AutoInjectorException('String'), ); expect( service.getBind().fold(id, id), From 6fed1be0c01697d69332a82085ea1e5c7d2e38a1 Mon Sep 17 00:00:00 2001 From: Stenio Oliveira Date: Thu, 4 Apr 2024 16:17:26 -0300 Subject: [PATCH 7/7] changed deprecated parameter --- .../presenter/navigation/modular_route_information_parser.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6bf11254..42ea2333 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 @@ -36,7 +36,7 @@ class ModularRouteInformationParser var path = ''; // 3.10 wrapper - final location = [null].contains(routeInformation.location) + final location = [null].contains(routeInformation.uri.path) ? '/' : routeInformation.uri.path; if (location == '/') {