@@ -28,7 +28,10 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
2828 final ReportPop reportPop;
2929 List <NavigatorObserver > observers = [];
3030
31- ModularRouterDelegate ({required this .parser, required this .navigatorKey, required this .reportPop});
31+ ModularRouterDelegate (
32+ {required this .parser,
33+ required this .navigatorKey,
34+ required this .reportPop});
3235
3336 @override
3437 ModularBook ? currentConfiguration;
@@ -67,8 +70,11 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
6770 Future <void > setNewRoutePath (ModularBook book) async {
6871 final disposableRoutes = < ParallelRoute > [];
6972
70- for (var route in currentConfiguration? .routes ?? < ParallelRoute <dynamic >> []) {
71- if (book.routes.indexWhere ((element) => element.uri.path == route.uri.path) == - 1 ) {
73+ for (var route
74+ in currentConfiguration? .routes ?? < ParallelRoute <dynamic >> []) {
75+ if (book.routes
76+ .indexWhere ((element) => element.uri.path == route.uri.path) ==
77+ - 1 ) {
7278 disposableRoutes.add (route);
7379 }
7480 }
@@ -106,28 +112,41 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
106112 final parallel = page.route;
107113 parallel.popCallback? .call (result);
108114 currentConfiguration? .routes.remove (parallel);
109- if (currentConfiguration? .routes.indexWhere ((element) => element.uri.toString () == parallel.uri.toString ()) == - 1 ) {
115+ if (currentConfiguration? .routes.indexWhere (
116+ (element) => element.uri.toString () == parallel.uri.toString ()) ==
117+ - 1 ) {
110118 reportPop.call (parallel);
111119 }
112- final arguments = parser.getArguments ().getOrElse ((l) => ModularArguments .empty ());
120+ final arguments =
121+ parser.getArguments ().getOrElse ((l) => ModularArguments .empty ());
113122 parser.setArguments (arguments.copyWith (uri: currentConfiguration! .uri));
114123 notifyListeners ();
115124
116125 return true ;
117126 }
118127
119128 @override
120- Future <T ?> pushNamed <T extends Object ?>(String routeName, {Object ? arguments, bool forRoot = false }) async {
129+ Future <T ?> pushNamed <T extends Object ?>(String routeName,
130+ {Object ? arguments, bool forRoot = false }) async {
121131 final popComplete = Completer ();
122- var book = await parser.selectBook (routeName, arguments: arguments, popCallback: popComplete.complete);
132+ var book = await parser.selectBook (routeName,
133+ arguments: arguments, popCallback: popComplete.complete);
123134 if (forRoot) {
124- book = currentConfiguration! .copyWith (routes: [...currentConfiguration! .routes, book.routes.last.copyWith (schema: '' )]);
135+ book = currentConfiguration! .copyWith (routes: [
136+ ...currentConfiguration! .routes,
137+ book.routes.last.copyWith (schema: '' )
138+ ]);
125139 await setNewRoutePath (book);
126140 } else {
127141 final list = [...currentConfiguration! .routes];
128142
129143 for (var route in book.routes.reversed) {
130- if (list.firstWhere ((element) => element.uri.toString () == route.uri.toString (), orElse: () => ParallelRoute .empty ()).name == '' ) {
144+ if (list
145+ .firstWhere (
146+ (element) => element.uri.toString () == route.uri.toString (),
147+ orElse: () => ParallelRoute .empty ())
148+ .name ==
149+ '' ) {
131150 list.add (route);
132151 }
133152 }
@@ -143,20 +162,31 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
143162 }
144163
145164 @override
146- Future <T ?> pushReplacementNamed <T extends Object ?, TO extends Object ?>(String routeName, {TO ? result, Object ? arguments, bool forRoot = false }) async {
165+ Future <T ?> pushReplacementNamed <T extends Object ?, TO extends Object ?>(
166+ String routeName,
167+ {TO ? result,
168+ Object ? arguments,
169+ bool forRoot = false }) async {
147170 final popComplete = Completer ();
148- var book = await parser.selectBook (routeName, arguments: arguments, popCallback: popComplete.complete);
171+ var book = await parser.selectBook (routeName,
172+ arguments: arguments, popCallback: popComplete.complete);
149173 final currentRoutes = [...currentConfiguration! .routes];
150174 if (forRoot) {
151175 currentRoutes.removeWhere ((element) => element.schema != '' );
152176 currentRoutes.removeLast ();
153- book = currentConfiguration! .copyWith (routes: [...currentRoutes, book.routes.first.copyWith (schema: '' )]);
177+ book = currentConfiguration! .copyWith (
178+ routes: [...currentRoutes, book.routes.first.copyWith (schema: '' )]);
154179 await setNewRoutePath (book);
155180 } else {
156181 final list = [...currentConfiguration! .routes]..removeLast ();
157182
158183 for (var route in book.routes.reversed) {
159- if (list.firstWhere ((element) => element.uri.toString () == route.uri.toString (), orElse: () => ParallelRoute .empty ()).name == '' ) {
184+ if (list
185+ .firstWhere (
186+ (element) => element.uri.toString () == route.uri.toString (),
187+ orElse: () => ParallelRoute .empty ())
188+ .name ==
189+ '' ) {
160190 list.add (route);
161191 }
162192 }
@@ -167,7 +197,11 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
167197 }
168198
169199 @override
170- Future <T ?> popAndPushNamed <T extends Object ?, TO extends Object ?>(String routeName, {TO ? result, Object ? arguments, bool forRoot = false }) {
200+ Future <T ?> popAndPushNamed <T extends Object ?, TO extends Object ?>(
201+ String routeName,
202+ {TO ? result,
203+ Object ? arguments,
204+ bool forRoot = false }) {
171205 pop (result);
172206 return pushNamed (routeName, arguments: arguments);
173207 }
@@ -176,15 +210,20 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
176210 bool canPop () => navigatorKey.currentState? .canPop () ?? false ;
177211
178212 @override
179- Future <bool > maybePop <T extends Object ?>([T ? result]) => navigatorKey.currentState? .maybePop (result) ?? Future .value (false );
213+ Future <bool > maybePop <T extends Object ?>([T ? result]) =>
214+ navigatorKey.currentState? .maybePop (result) ?? Future .value (false );
180215
181216 @override
182- void pop <T extends Object ?>([T ? result]) => navigatorKey.currentState? .pop (result);
217+ void pop <T extends Object ?>([T ? result]) =>
218+ navigatorKey.currentState? .pop (result);
183219
184220 @override
185221 void popUntil (bool Function (Route ) predicate) {
186222 var isFoundedPages = currentConfiguration? .routes.where ((route) {
187- return predicate (CustomModalRoute (ModularPage (route: route, args: ModularArguments .empty (), flags: ModularFlags ())));
223+ return predicate (CustomModalRoute (ModularPage (
224+ route: route,
225+ args: ModularArguments .empty (),
226+ flags: ModularFlags ())));
188227 });
189228
190229 isFoundedPages ?? = [];
@@ -196,7 +235,9 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
196235 }
197236
198237 @override
199- Future <T ?> pushNamedAndRemoveUntil <T extends Object ?>(String newRouteName, bool Function (Route ) predicate, {Object ? arguments, bool forRoot = false }) {
238+ Future <T ?> pushNamedAndRemoveUntil <T extends Object ?>(
239+ String newRouteName, bool Function (Route ) predicate,
240+ {Object ? arguments, bool forRoot = false }) {
200241 popUntil (predicate);
201242 return pushNamed <T >(newRouteName, arguments: arguments, forRoot: forRoot);
202243 }
@@ -223,7 +264,8 @@ class CustomModalRoute extends ModalRoute {
223264 String ? get barrierLabel => throw UnimplementedError ();
224265
225266 @override
226- Widget buildPage (BuildContext context, Animation <double > animation, Animation <double > secondaryAnimation) {
267+ Widget buildPage (BuildContext context, Animation <double > animation,
268+ Animation <double > secondaryAnimation) {
227269 throw UnimplementedError ();
228270 }
229271
0 commit comments