Showing
2 changed files
with
6 additions
and
26 deletions
| @@ -71,9 +71,7 @@ class HomeView extends GetView<HomeController> { | @@ -71,9 +71,7 @@ class HomeView extends GetView<HomeController> { | ||
| 71 | shape: StadiumBorder(), | 71 | shape: StadiumBorder(), | 
| 72 | ), | 72 | ), | 
| 73 | onPressed: () async { | 73 | onPressed: () async { | 
| 74 | - final data = | ||
| 75 | - await Get.rootDelegate.toNamed('/home/country'); | ||
| 76 | - print('DATA: $data'); | 74 | + await Get.rootDelegate.toNamed('/home/country'); | 
| 77 | }, | 75 | }, | 
| 78 | child: Text( | 76 | child: Text( | 
| 79 | 'fetch_country'.tr, | 77 | 'fetch_country'.tr, | 
| @@ -299,14 +299,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | @@ -299,14 +299,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | ||
| 299 | ); | 299 | ); | 
| 300 | } | 300 | } | 
| 301 | 301 | ||
| 302 | - // @override | ||
| 303 | - // Future<void> setInitialRoutePath(GetNavConfig configuration) async { | ||
| 304 | - // //no need to clear history with Reorder route strategy | ||
| 305 | - // // _unsafeHistoryClear(); | ||
| 306 | - // // _resultCompleter.clear(); | ||
| 307 | - // await pushHistory(configuration); | ||
| 308 | - // } | ||
| 309 | - | ||
| 310 | @override | 302 | @override | 
| 311 | Future<void> setNewRoutePath(GetNavConfig configuration) async { | 303 | Future<void> setNewRoutePath(GetNavConfig configuration) async { | 
| 312 | await pushHistory(configuration); | 304 | await pushHistory(configuration); | 
| @@ -319,7 +311,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | @@ -319,7 +311,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | ||
| 319 | return route; | 311 | return route; | 
| 320 | } | 312 | } | 
| 321 | 313 | ||
| 322 | - Future<T> toNamed<T>( | 314 | + Future<void> toNamed( | 
| 323 | String page, { | 315 | String page, { | 
| 324 | dynamic arguments, | 316 | dynamic arguments, | 
| 325 | Map<String, String>? parameters, | 317 | Map<String, String>? parameters, | 
| @@ -332,10 +324,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | @@ -332,10 +324,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | ||
| 332 | final decoder = Get.routeTree.matchRoute(page, arguments: arguments); | 324 | final decoder = Get.routeTree.matchRoute(page, arguments: arguments); | 
| 333 | decoder.replaceArguments(arguments); | 325 | decoder.replaceArguments(arguments); | 
| 334 | 326 | ||
| 335 | - final completer = Completer<T>(); | ||
| 336 | - | ||
| 337 | if (decoder.route != null) { | 327 | if (decoder.route != null) { | 
| 338 | - _allCompleters[decoder.route!] = completer; | ||
| 339 | await pushHistory( | 328 | await pushHistory( | 
| 340 | GetNavConfig( | 329 | GetNavConfig( | 
| 341 | currentTreeBranch: decoder.treeBranch, | 330 | currentTreeBranch: decoder.treeBranch, | 
| @@ -343,8 +332,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | @@ -343,8 +332,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | ||
| 343 | state: null, //TODO: persist state? | 332 | state: null, //TODO: persist state? | 
| 344 | ), | 333 | ), | 
| 345 | ); | 334 | ); | 
| 346 | - | ||
| 347 | - return completer.future; | ||
| 348 | } else { | 335 | } else { | 
| 349 | ///TODO: IMPLEMENT ROUTE NOT FOUND | 336 | ///TODO: IMPLEMENT ROUTE NOT FOUND | 
| 350 | 337 | ||
| @@ -352,7 +339,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | @@ -352,7 +339,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | ||
| 352 | } | 339 | } | 
| 353 | } | 340 | } | 
| 354 | 341 | ||
| 355 | - Future<T?>? offAndToNamed<T>( | 342 | + Future<void>? offAndToNamed( | 
| 356 | String page, { | 343 | String page, { | 
| 357 | dynamic arguments, | 344 | dynamic arguments, | 
| 358 | int? id, | 345 | int? id, | 
| @@ -369,13 +356,13 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | @@ -369,13 +356,13 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | ||
| 369 | return toNamed(page, arguments: arguments, parameters: parameters); | 356 | return toNamed(page, arguments: arguments, parameters: parameters); | 
| 370 | } | 357 | } | 
| 371 | 358 | ||
| 372 | - Future<T> offNamed<T>( | 359 | + Future<void> offNamed( | 
| 373 | String page, { | 360 | String page, { | 
| 374 | dynamic arguments, | 361 | dynamic arguments, | 
| 375 | Map<String, String>? parameters, | 362 | Map<String, String>? parameters, | 
| 376 | }) async { | 363 | }) async { | 
| 377 | history.removeLast(); | 364 | history.removeLast(); | 
| 378 | - return toNamed<T>(page, arguments: arguments, parameters: parameters); | 365 | + return toNamed(page, arguments: arguments, parameters: parameters); | 
| 379 | } | 366 | } | 
| 380 | 367 | ||
| 381 | /// Removes routes according to [PopMode] | 368 | /// Removes routes according to [PopMode] | 
| @@ -428,8 +415,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | @@ -428,8 +415,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | ||
| 428 | return false; | 415 | return false; | 
| 429 | } | 416 | } | 
| 430 | 417 | ||
| 431 | - final _allCompleters = <GetPage, Completer>{}; | ||
| 432 | - | ||
| 433 | bool _onPopVisualRoute(Route<dynamic> route, dynamic result) { | 418 | bool _onPopVisualRoute(Route<dynamic> route, dynamic result) { | 
| 434 | final didPop = route.didPop(result); | 419 | final didPop = route.didPop(result); | 
| 435 | if (!didPop) { | 420 | if (!didPop) { | 
| @@ -444,9 +429,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | @@ -444,9 +429,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig> | ||
| 444 | if (config != null) { | 429 | if (config != null) { | 
| 445 | _removeHistoryEntry(config); | 430 | _removeHistoryEntry(config); | 
| 446 | } | 431 | } | 
| 447 | - if (_allCompleters.containsKey(settings)) { | ||
| 448 | - _allCompleters[settings]?.complete(route.popped); | ||
| 449 | - } | ||
| 450 | } | 432 | } | 
| 451 | refresh(); | 433 | refresh(); | 
| 452 | 434 | ||
| @@ -475,7 +457,7 @@ class GetNavigator extends Navigator { | @@ -475,7 +457,7 @@ class GetNavigator extends Navigator { | ||
| 475 | } | 457 | } | 
| 476 | return true; | 458 | return true; | 
| 477 | }, | 459 | }, | 
| 478 | - onGenerateRoute: (RouteSettings settings) { | 460 | + onGenerateRoute: (settings) { | 
| 479 | final selectedPageList = | 461 | final selectedPageList = | 
| 480 | pages.where((element) => element.name == settings.name); | 462 | pages.where((element) => element.name == settings.name); | 
| 481 | if (selectedPageList.isNotEmpty) { | 463 | if (selectedPageList.isNotEmpty) { | 
- 
Please register or login to post a comment