Showing
3 changed files
with
8 additions
and
8 deletions
@@ -54,12 +54,12 @@ class ParseRouteTree { | @@ -54,12 +54,12 @@ class ParseRouteTree { | ||
54 | 54 | ||
55 | List<GetPage> _flattenPage(GetPage route) { | 55 | List<GetPage> _flattenPage(GetPage route) { |
56 | final result = <GetPage>[]; | 56 | final result = <GetPage>[]; |
57 | - if (route.pages == null || route.pages.isEmpty) { | 57 | + if (route.children == null || route.children.isEmpty) { |
58 | return result; | 58 | return result; |
59 | } | 59 | } |
60 | 60 | ||
61 | final routePath = route.name; | 61 | final routePath = route.name; |
62 | - for (var page in route.pages) { | 62 | + for (var page in route.children) { |
63 | result.add(_changePath(page, routePath)); | 63 | result.add(_changePath(page, routePath)); |
64 | final children = _flattenPage(page); | 64 | final children = _flattenPage(page); |
65 | for (var child in children) { | 65 | for (var child in children) { |
@@ -20,7 +20,7 @@ class GetPage { | @@ -20,7 +20,7 @@ class GetPage { | ||
20 | final Duration transitionDuration; | 20 | final Duration transitionDuration; |
21 | final bool fullscreenDialog; | 21 | final bool fullscreenDialog; |
22 | final RouteSettings settings; | 22 | final RouteSettings settings; |
23 | - final List<GetPage> pages; | 23 | + final List<GetPage> children; |
24 | 24 | ||
25 | const GetPage({ | 25 | const GetPage({ |
26 | @required this.name, | 26 | @required this.name, |
@@ -39,7 +39,7 @@ class GetPage { | @@ -39,7 +39,7 @@ class GetPage { | ||
39 | this.transition, | 39 | this.transition, |
40 | this.customTransition, | 40 | this.customTransition, |
41 | this.fullscreenDialog = false, | 41 | this.fullscreenDialog = false, |
42 | - this.pages, | 42 | + this.children, |
43 | }) : assert(page != null), | 43 | }) : assert(page != null), |
44 | assert(name != null), | 44 | assert(name != null), |
45 | assert(maintainState != null), | 45 | assert(maintainState != null), |
@@ -6,13 +6,13 @@ import 'package:get/get_navigation/src/root/parse_route.dart'; | @@ -6,13 +6,13 @@ import 'package:get/get_navigation/src/root/parse_route.dart'; | ||
6 | void main() { | 6 | void main() { |
7 | test('Parse Page with children', () { | 7 | test('Parse Page with children', () { |
8 | final tree = ParseRouteTree(); | 8 | final tree = ParseRouteTree(); |
9 | - final pageTree = GetPage(name: '/city', page: () => Container(), pages: [ | ||
10 | - GetPage(name: '/home', page: () => Container(), pages: [ | 9 | + final pageTree = GetPage(name: '/city', page: () => Container(), children: [ |
10 | + GetPage(name: '/home', page: () => Container(), children: [ | ||
11 | GetPage(name: '/bed-room', page: () => Container()), | 11 | GetPage(name: '/bed-room', page: () => Container()), |
12 | GetPage(name: '/living-room', page: () => Container()), | 12 | GetPage(name: '/living-room', page: () => Container()), |
13 | ]), | 13 | ]), |
14 | - GetPage(name: '/work', page: () => Container(), pages: [ | ||
15 | - GetPage(name: '/office', page: () => Container(), pages: [ | 14 | + GetPage(name: '/work', page: () => Container(), children: [ |
15 | + GetPage(name: '/office', page: () => Container(), children: [ | ||
16 | GetPage(name: '/pen', page: () => Container()), | 16 | GetPage(name: '/pen', page: () => Container()), |
17 | GetPage(name: '/paper', page: () => Container()), | 17 | GetPage(name: '/paper', page: () => Container()), |
18 | ]), | 18 | ]), |
-
Please register or login to post a comment