-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/change router #282
Conversation
# Conflicts: # ios/Podfile.lock # lib/services/auth.dart
# Conflicts: # lib/app/app.dart # lib/services/auth.dart # lib/services/pushNotifications.dart # lib/ui/views/intro/intro_viewmodel.dart # lib/ui/views/login/login_viewmodel.dart # lib/ui/views/tabs/tabs_view.dart
@@ -55,7 +55,7 @@ extension DialogServiceExtension on DialogService { | |||
Future<bool> showActionCompletedDialog() async { | |||
final response = await showCustomDialog( | |||
barrierDismissible: true, | |||
variant: DialogType.actionCompleted, | |||
variant: DialogType.emailAppPicker, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks suspicious...
exploreFilterData: filterData, | ||
), | ||
); | ||
return navigateToFaqView(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And this
return clearStackAndShow(route); | ||
} | ||
return navigateTo(route); | ||
return navigateToTabsView(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we still want to handle clearHistory here?
@@ -3,7 +3,8 @@ import 'package:nowu/services/navigation_service.dart'; | |||
import 'package:stacked/stacked.dart'; | |||
|
|||
class PartnerInfoViewModel extends BaseViewModel { | |||
final _navigationService = locator<NavigationService>(); | |||
final _navigationService = locator<LauncherService>(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
final _navigationService = locator<LauncherService>(); | |
final _launcherService = locator<LauncherService>(); |
|
||
class PartnersViewModel extends FutureViewModel<Iterable<Organisation>> { | ||
final _causesService = locator<CausesService>(); | ||
final _routerService = locator<RouterService>(); | ||
final _routerService = locator<NavigationService>(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we rename every instance of _routerService to _navigationService?
Description
Router used in the navigation is causing app to not work correctly on iOs with blocked back swipe: Stacked-Org/stacked#1088
Fixes #254
Checklist:
Creator
Reviewer
After pull