Revert "refactor: Dialog BuildContext"

This reverts commit 315a43c1a4.
This commit is contained in:
Krille 2024-01-25 09:13:08 +01:00
commit 3fa9c65a2b
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
24 changed files with 68 additions and 30 deletions

View file

@ -106,12 +106,12 @@ class ChatSettingsPopupMenuState extends State<ChatSettingsPopupMenu> {
switch (choice) {
case 'leave':
final confirmed = await showOkCancelAlertDialog(
useRootNavigator: false,
context: context,
title: L10n.of(context)!.areYouSure,
okLabel: L10n.of(context)!.ok,
cancelLabel: L10n.of(context)!.cancel,
message: L10n.of(context)!.archiveRoomDescription,
isDestructiveAction: true,
);
if (confirmed == OkCancelResult.ok) {
final success = await showFutureLoadingDialog(

View file

@ -52,10 +52,16 @@ class FluffyChatApp extends StatelessWidget {
builder: (context, child) => AppLockWidget(
pincode: pincode,
clients: clients,
child: Matrix(
clients: clients,
store: store,
child: testWidget ?? child,
// Need a navigator above the Matrix widget for
// displaying dialogs
child: Navigator(
onGenerateRoute: (_) => MaterialPageRoute(
builder: (_) => Matrix(
clients: clients,
store: store,
child: testWidget ?? child,
),
),
),
),
),

View file

@ -71,8 +71,6 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
BackgroundPush? backgroundPush;
late BuildContext navigatorContext;
Client get client {
if (widget.clients.isEmpty) {
widget.clients.add(getLoginClient());
@ -313,8 +311,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
};
request.onUpdate = null;
hidPopup = true;
await KeyVerificationDialog(request: request).show(navigatorContext);
await KeyVerificationDialog(request: request).show(context);
});
onLoginStateChanged[name] ??= c.onLoginStateChanged.stream.listen((state) {
final loggedInWithMultipleClients = widget.clients.length > 1;
@ -325,7 +322,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
_cancelSubs(c.clientName);
widget.clients.remove(c);
ClientManager.removeClientNameFromStore(c.clientName, store);
ScaffoldMessenger.of(navigatorContext).showSnackBar(
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(L10n.of(context)!.oneClientLoggedOut),
),
@ -385,7 +382,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
onFcmError: (errorMsg, {Uri? link}) async {
final result = await showOkCancelAlertDialog(
barrierDismissible: true,
context: navigatorContext,
context: context,
title: L10n.of(context)!.pushNotificationsNotAvailable,
message: errorMsg,
fullyCapitalizedForMaterial: false,