Skip to content
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

Closed
wants to merge 11 commits into from
Closed

Feature/change router #282

wants to merge 11 commits into from

Conversation

kackogut
Copy link
Collaborator

@kackogut kackogut commented Mar 20, 2024

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

  • The target branch is main
  • I have updated the unreleased section of the change log
  • I have reviewed the 'files changed' tab on github to ensure all changes are as expected
  • I have added someone to review the pr

Reviewer

  • I have verified the above are all completed
  • I have run the code locally to ensure it fufills the requirements of the issue
  • I have reviewed the 'files changed' and commented on any sections which I think are not needed, incorrect or could be improved

After pull

  • If appropriate I have closed the issue/ moved the trello card

kackogut and others added 11 commits February 14, 2024 23:06
# 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
@kackogut kackogut marked this pull request as ready for review March 26, 2024 20:46
@kackogut kackogut requested a review from JElgar March 26, 2024 20:46
@@ -55,7 +55,7 @@ extension DialogServiceExtension on DialogService {
Future<bool> showActionCompletedDialog() async {
final response = await showCustomDialog(
barrierDismissible: true,
variant: DialogType.actionCompleted,
variant: DialogType.emailAppPicker,
Copy link
Member

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();
Copy link
Member

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();
Copy link
Member

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>();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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>();
Copy link
Member

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?

@kackogut kackogut closed this May 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Swipe to go back doesn't work on IOS
2 participants