Skip to content

fix: settings page not closing on save #59

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.

Sign up for GitHub

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

Merged
zjcz merged 1 commit into from
Sep 9, 2025
Merged

fix: settings page not closing on save #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/app/settings/views/settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class _SettingsScreenState extends ConsumerState<SettingsScreen> {
}

if (!context.mounted) return;
Navigator.of(context).pop();
context.pop();
}
},
),
Expand Down
8 changes: 6 additions & 2 deletions lib/route_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import 'package:petjournal/app/pet/views/edit_pet_screen.dart';
import 'package:petjournal/app/pet/views/edit_pet_vaccination_screen.dart';
import 'package:petjournal/app/pet/views/edit_pet_weight_screen.dart';
import 'package:petjournal/app/pet/views/view_pet_screen.dart';
import 'package:petjournal/app/settings/controllers/settings_controller.dart';
import 'package:petjournal/app/settings/views/settings_screen.dart';
import 'package:petjournal/data/lookups/settings_lookup.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';

part 'route_config.g.dart';
Expand Down Expand Up @@ -49,7 +49,11 @@ GoRouter setupRouter(Ref ref) {
//initialExtra: initialExtra,
//observers: observers,
redirect: (context, state) {
final settings = ref.read(settingsControllerProvider).requireValue;
var settings = SettingsLookup().getSettings();
if (settings == null) {
return null;
}

final path = state.uri.path;
if (!settings.onBoardingComplete) {
if (path != RouteDefs.welcome) {
Expand Down
4 changes: 2 additions & 2 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,10 +452,10 @@ packages:
dependency: "direct main"
description:
name: go_router
sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3
sha256: eb059dfe59f08546e9787f895bd01652076f996bcbf485a8609ef990419ad227
url: "https://pub.dev"
source: hosted
version: "14.8.1"
version: "16.2.1"
graphs:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies:
cupertino_icons: ^1.0.8
drift: ^2.26.0
drift_flutter: ^0.2.4
go_router: ^14.8.1
go_router: ^16.2.1
flutter_riverpod: ^2.6.1
riverpod_annotation: ^2.6.1
material_color_utilities: ^0.11.1
Expand Down