Skip to content

Commit 1454f41

Browse files
jacobaraujo7jacobaraujo7
committed
fix format
1 parent 3c5cb66 commit 1454f41

File tree

4 files changed

+94
-33
lines changed

4 files changed

+94
-33
lines changed

‎flutter_modular/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## [4.0.0+10] - 2021-09-16
1+
## [4.0.0+11] - 2021-09-16
22

33
* New documentation is here! [https://modular.flutterando.com.br](https://modular.flutterando.com.br).
44
* Modular design now uses Layered Architecture (Clean Architecture) with 100% code coverage.

‎flutter_modular/lib/src/presenter/navigation/modular_router_delegate.dart‎

Lines changed: 60 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -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
}
@@ -80,7 +86,8 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
8086
reportPop.call(disposableRoute);
8187
}
8288

83-
final arguments = parser.getArguments().getOrElse((l) => ModularArguments.empty());
89+
final arguments =
90+
parser.getArguments().getOrElse((l) => ModularArguments.empty());
8491
parser.setArguments(arguments.copyWith(params: {}, data: null));
8592
}
8693

@@ -110,25 +117,36 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
110117
parallel.popCallback?.call(result);
111118
currentConfiguration?.routes.remove(parallel);
112119
reportPop.call(parallel);
113-
final arguments = parser.getArguments().getOrElse((l) => ModularArguments.empty());
120+
final arguments =
121+
parser.getArguments().getOrElse((l) => ModularArguments.empty());
114122
parser.setArguments(arguments.copyWith(uri: currentConfiguration!.uri));
115123
notifyListeners();
116124

117125
return true;
118126
}
119127

120128
@override
121-
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 {
122131
final popComplete = Completer();
123-
var book = await parser.selectBook(routeName, arguments: arguments, popCallback: popComplete.complete);
132+
var book = await parser.selectBook(routeName,
133+
arguments: arguments, popCallback: popComplete.complete);
124134
if (forRoot) {
125-
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+
]);
126139
await setNewRoutePath(book);
127140
} else {
128141
final list = [...currentConfiguration!.routes];
129142

130143
for (var route in book.routes.reversed) {
131-
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+
'') {
132150
list.add(route);
133151
}
134152
}
@@ -144,20 +162,31 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
144162
}
145163

146164
@override
147-
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 {
148170
final popComplete = Completer();
149-
var book = await parser.selectBook(routeName, arguments: arguments, popCallback: popComplete.complete);
171+
var book = await parser.selectBook(routeName,
172+
arguments: arguments, popCallback: popComplete.complete);
150173
final currentRoutes = [...currentConfiguration!.routes];
151174
if (forRoot) {
152175
currentRoutes.removeWhere((element) => element.schema != '');
153176
currentRoutes.removeLast();
154-
book = currentConfiguration!.copyWith(routes: [...currentRoutes, book.routes.first.copyWith(schema: '')]);
177+
book = currentConfiguration!.copyWith(
178+
routes: [...currentRoutes, book.routes.first.copyWith(schema: '')]);
155179
await setNewRoutePath(book);
156180
} else {
157181
final list = [...currentConfiguration!.routes]..removeLast();
158182

159183
for (var route in book.routes.reversed) {
160-
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+
'') {
161190
list.add(route);
162191
}
163192
}
@@ -168,7 +197,11 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
168197
}
169198

170199
@override
171-
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}) {
172205
pop(result);
173206
return pushNamed(routeName, arguments: arguments);
174207
}
@@ -177,15 +210,20 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
177210
bool canPop() => navigatorKey.currentState?.canPop() ?? false;
178211

179212
@override
180-
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);
181215

182216
@override
183-
void pop<T extends Object?>([T? result]) => navigatorKey.currentState?.pop(result);
217+
void pop<T extends Object?>([T? result]) =>
218+
navigatorKey.currentState?.pop(result);
184219

185220
@override
186221
void popUntil(bool Function(Route) predicate) {
187222
var isFoundedPages = currentConfiguration?.routes.where((route) {
188-
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())));
189227
});
190228

191229
isFoundedPages ??= [];
@@ -197,7 +235,9 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
197235
}
198236

199237
@override
200-
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}) {
201241
popUntil(predicate);
202242
return pushNamed<T>(newRouteName, arguments: arguments, forRoot: forRoot);
203243
}
@@ -224,7 +264,8 @@ class CustomModalRoute extends ModalRoute {
224264
String? get barrierLabel => throw UnimplementedError();
225265

226266
@override
227-
Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) {
267+
Widget buildPage(BuildContext context, Animation<double> animation,
268+
Animation<double> secondaryAnimation) {
228269
throw UnimplementedError();
229270
}
230271

‎flutter_modular/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flutter_modular
22
description: Smart project structure with dependency injection and route management
3-
version: 4.0.0+10
3+
version: 4.0.0+11
44
homepage: https://github.com/Flutterando/modular
55

66
environment:

‎flutter_modular/test/src/presenter/navigation/modular_router_delegate_test.dart‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import '../modular_base_test.dart' hide GetArgumentsMock;
1717
import 'modular_page_test.dart';
1818
import 'modular_route_information_parser_test.dart';
1919

20-
class ModularRouteInformationParserMock extends Mock implements ModularRouteInformationParser {}
20+
class ModularRouteInformationParserMock extends Mock
21+
implements ModularRouteInformationParser {}
2122

2223
class BuildContextMock extends Mock implements BuildContext {}
2324

@@ -51,7 +52,8 @@ void main() {
5152
reportPopMock = ReportPopMock();
5253
when(() => key.currentState).thenReturn(navigatorState);
5354
parser = ModularRouteInformationParserMock();
54-
delegate = ModularRouterDelegate(parser: parser, navigatorKey: key, reportPop: reportPopMock);
55+
delegate = ModularRouterDelegate(
56+
parser: parser, navigatorKey: key, reportPop: reportPopMock);
5557
});
5658

5759
test('setObserver', () {
@@ -86,7 +88,8 @@ void main() {
8688
test('navigate', () async {
8789
final route1 = ParallelRouteMock();
8890
when(() => route1.uri).thenReturn(Uri.parse('/test'));
89-
when(() => parser.selectBook('/test')).thenAnswer((_) async => ModularBook(routes: [route1]));
91+
when(() => parser.selectBook('/test'))
92+
.thenAnswer((_) async => ModularBook(routes: [route1]));
9093

9194
final getArgsMock = GetArgumentsMock();
9295
final setArgsMock = SetArgumentsMock();
@@ -110,7 +113,8 @@ void main() {
110113
final route = RouteMock();
111114
final parallel = ParallelRouteMock();
112115
when(() => parallel.uri).thenReturn(Uri.parse('/'));
113-
final page = ModularPage(route: parallel, args: ModularArguments.empty(), flags: ModularFlags());
116+
final page = ModularPage(
117+
route: parallel, args: ModularArguments.empty(), flags: ModularFlags());
114118
when(() => route.didPop(null)).thenReturn(true);
115119
when(() => route.settings).thenReturn(page);
116120
when(() => route.isFirst).thenReturn(false);
@@ -156,7 +160,9 @@ void main() {
156160

157161
delegate.currentConfiguration = ModularBook(routes: [route1]);
158162

159-
when(() => parser.selectBook('/pushForce', popCallback: any(named: 'popCallback'))).thenAnswer((_) async => ModularBook(routes: [route2]));
163+
when(() => parser.selectBook('/pushForce',
164+
popCallback: any(named: 'popCallback')))
165+
.thenAnswer((_) async => ModularBook(routes: [route2]));
160166
// ignore: unawaited_futures
161167
delegate.pushNamed('/pushForce', forRoot: true);
162168
await Future.delayed(Duration(milliseconds: 400));
@@ -190,7 +196,9 @@ void main() {
190196

191197
delegate.currentConfiguration = ModularBook(routes: [route1]);
192198

193-
when(() => parser.selectBook('/pushForce', popCallback: any(named: 'popCallback'))).thenAnswer((_) async => ModularBook(routes: [route2]));
199+
when(() => parser.selectBook('/pushForce',
200+
popCallback: any(named: 'popCallback')))
201+
.thenAnswer((_) async => ModularBook(routes: [route2]));
194202
// ignore: unawaited_futures
195203
delegate.pushNamed('/pushForce');
196204
await Future.delayed(Duration(milliseconds: 400));
@@ -227,7 +235,9 @@ void main() {
227235

228236
delegate.currentConfiguration = ModularBook(routes: [route1]);
229237

230-
when(() => parser.selectBook('/pushForce', popCallback: any(named: 'popCallback'))).thenAnswer((_) async => ModularBook(routes: [route2]));
238+
when(() => parser.selectBook('/pushForce',
239+
popCallback: any(named: 'popCallback')))
240+
.thenAnswer((_) async => ModularBook(routes: [route2]));
231241
// ignore: unawaited_futures
232242
delegate.pushReplacementNamed('/pushForce', forRoot: true);
233243
await Future.delayed(Duration(milliseconds: 400));
@@ -269,7 +279,9 @@ void main() {
269279

270280
delegate.currentConfiguration = ModularBook(routes: [route1, route2]);
271281

272-
when(() => parser.selectBook('/pushForce', popCallback: any(named: 'popCallback'))).thenAnswer((_) async => ModularBook(routes: [route3]));
282+
when(() => parser.selectBook('/pushForce',
283+
popCallback: any(named: 'popCallback')))
284+
.thenAnswer((_) async => ModularBook(routes: [route3]));
273285
// ignore: unawaited_futures
274286
delegate.pushReplacementNamed('/pushForce');
275287
await Future.delayed(Duration(milliseconds: 400));
@@ -302,7 +314,9 @@ void main() {
302314

303315
delegate.currentConfiguration = ModularBook(routes: [route1]);
304316

305-
when(() => parser.selectBook('/pushForce', popCallback: any(named: 'popCallback'))).thenAnswer((_) async => ModularBook(routes: [route2]));
317+
when(() => parser.selectBook('/pushForce',
318+
popCallback: any(named: 'popCallback')))
319+
.thenAnswer((_) async => ModularBook(routes: [route2]));
306320
// ignore: unawaited_futures
307321
delegate.popAndPushNamed('/pushForce');
308322
await Future.delayed(Duration(milliseconds: 400));
@@ -317,7 +331,8 @@ void main() {
317331
});
318332
test('push ', () async {
319333
final route = MaterialPageRoute(builder: (_) => Container());
320-
when(() => navigatorState.push(route)).thenAnswer((_) => Future.value(true));
334+
when(() => navigatorState.push(route))
335+
.thenAnswer((_) => Future.value(true));
321336
await delegate.push(route);
322337
verify(() => navigatorState.push(route));
323338
});
@@ -375,7 +390,9 @@ void main() {
375390

376391
delegate.currentConfiguration = ModularBook(routes: [route1]);
377392

378-
when(() => parser.selectBook('/pushForce', popCallback: any(named: 'popCallback'))).thenAnswer((_) async => ModularBook(routes: [route2]));
393+
when(() => parser.selectBook('/pushForce',
394+
popCallback: any(named: 'popCallback')))
395+
.thenAnswer((_) async => ModularBook(routes: [route2]));
379396
// ignore: unawaited_futures
380397
delegate.pushNamedAndRemoveUntil('/pushForce', (_) => false);
381398
await Future.delayed(Duration(milliseconds: 400));
@@ -392,6 +409,9 @@ void main() {
392409
expect(() => route.opaque, throwsA(isA<UnimplementedError>()));
393410
expect(() => route.transitionDuration, throwsA(isA<UnimplementedError>()));
394411
expect(() => route.barrierLabel, throwsA(isA<UnimplementedError>()));
395-
expect(() => route.buildPage(BuildContextMock(), AnimationMock(), AnimationMock()), throwsA(isA<UnimplementedError>()));
412+
expect(
413+
() => route.buildPage(
414+
BuildContextMock(), AnimationMock(), AnimationMock()),
415+
throwsA(isA<UnimplementedError>()));
396416
});
397417
}

0 commit comments

Comments
 (0)