SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2025-01-27 11:16:45 +00:00
Code Issues Projects Releases Wiki Activity

fix(router): PopUpDialogs couldn't find the context.

Browse source
This commit is contained in:
Inex Code 2023-03-21 20:44:52 +03:00 committed by Gitea
parent ee9b8a4e31
commit 3366585d76
4 changed files with 42 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/logic/get_it/navigation.dart
View file

@ -7,10 +7,14 @@ class NavigationService {
GlobalKey<ScaffoldMessengerState>();
final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
NavigatorState? get navigator => navigatorKey.currentState;
void showPopUpDialog(final AlertDialog dialog) {
final BuildContext context = navigatorKey.currentState!.overlay!.context;
final BuildContext? context = navigatorKey.currentContext;
if (context == null) {
showSnackBar(
'Could not show dialog. This should not happen, please report this.');
return;
}
showDialog(
context: context,

5
lib/main.dart
View file

@ -63,12 +63,10 @@ class SelfprivacyApp extends StatelessWidget {
final ThemeData lightThemeData;
final ThemeData darkThemeData;
final _appRouter = RootRouter();
final _appRouter = RootRouter(getIt.get<NavigationService>().navigatorKey);
@override
Widget build(final BuildContext context) => Localization(
child: AnnotatedRegion<SystemUiOverlayStyle>(
value: SystemUiOverlayStyle.light, // Manually changing appbar color
child: BlocAndProviderConfig(
child: BlocBuilder<AppSettingsCubit, AppSettingsState>(
builder: (
@ -104,6 +102,5 @@ class SelfprivacyApp extends StatelessWidget {
),
),
),
),
);
}

4
lib/ui/pages/users/user_details.dart
View file

@ -231,9 +231,7 @@ class _SshKeysCard extends StatelessWidget {
publicKey: key,
),
);
Navigator.of(context)
..pop()
..pop();
context.popRoute();
},
),
],

2
lib/ui/router/router.dart
View file

@ -99,7 +99,7 @@ Widget fadeThroughTransition(
],
)
class RootRouter extends _$RootRouter {
RootRouter();
RootRouter(GlobalKey<NavigatorState> super.navigatorKey);
}
// Function to map route names to route titles