2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Regressions because of vrouter

Browse source
This commit is contained in:
Christian Pauly 2021-05-23 15:02:36 +02:00
commit de869d5157
24 changed files with 122 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/widgets/chat_settings_popup_menu.dart
View file

@ -68,6 +68,7 @@ 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,

2
lib/widgets/encryption_button.dart
View file

@ -26,6 +26,7 @@ class _EncryptionButtonState extends State<EncryptionButton> {
}
if (widget.room.joinRules == JoinRules.public) {
await showOkAlertDialog(
useRootNavigator: false,
context: context,
okLabel: L10n.of(context).ok,
message: L10n.of(context).noEncryptionForPublicRooms,
@ -33,6 +34,7 @@ class _EncryptionButtonState extends State<EncryptionButton> {
return;
}
if (await showOkCancelAlertDialog(
useRootNavigator: false,
context: context,
title: L10n.of(context).enableEncryption,
message: widget.room.client.encryptionEnabled

2
lib/widgets/list_items/chat_list_item.dart
View file

@ -93,6 +93,7 @@ class ChatListItem extends StatelessWidget {
'chat.fluffy.shared_file') {
await showDialog(
context: context,
useRootNavigator: false,
builder: (c) => SendFileDialog(
file: Matrix.of(context).shareContent['file'],
room: room,
@ -121,6 +122,7 @@ class ChatListItem extends StatelessWidget {
return success;
}
final confirmed = await showOkCancelAlertDialog(
useRootNavigator: false,
context: context,
title: L10n.of(context).areYouSure,
okLabel: L10n.of(context).yes,

3
lib/widgets/matrix.dart
View file

@ -128,6 +128,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
case AuthenticationTypes.password:
final input = cachedPassword ??
(await showTextInputDialog(
useRootNavigator: false,
context: navigatorContext,
title: L10n.of(widget.context).pleaseEnterYourPassword,
okLabel: L10n.of(widget.context).ok,
@ -182,6 +183,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
);
if (OkCancelResult.ok ==
await showOkCancelAlertDialog(
useRootNavigator: false,
message: L10n.of(widget.context).pleaseFollowInstructionsOnWeb,
context: navigatorContext,
okLabel: L10n.of(widget.context).next,
@ -293,6 +295,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
hidPopup = true;
};
if (await showOkCancelAlertDialog(
useRootNavigator: false,
context: navigatorContext,
title: L10n.of(widget.context).newVerificationRequest,
message: