ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: wait for bot options to be saved before closing conversation bot dialog (#1868)

Browse source
This commit is contained in:
ggurdin 2025-02-20 13:58:48 -05:00 • committed by GitHub
parent 19abec6422
commit 820e79593c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/pangea/chat_settings/widgets/conversation_bot/conversation_bot_settings.dart
View file

@ -18,6 +18,7 @@ import 'package:fluffychat/pangea/common/widgets/full_width_dialog.dart';
import 'package:fluffychat/pangea/events/constants/pangea_event_types.dart';
import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
import 'package:fluffychat/pangea/learning_settings/enums/language_level_type_enum.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart';
import 'package:fluffychat/widgets/matrix.dart';
class ConversationBotSettings extends StatefulWidget {
@ -54,18 +55,6 @@ class ConversationBotSettingsState extends State<ConversationBotSettings> {
}
}
Future<void> showBotOptionsDialog() async {
final BotOptionsModel? newBotOptions = await showDialog<BotOptionsModel?>(
context: context,
builder: (BuildContext context) =>
ConversationBotSettingsDialog(room: widget.room),
);
if (newBotOptions != null) {
setBotOptions(newBotOptions);
}
}
@override
Widget build(BuildContext context) {
return AnimatedContainer(
@ -91,7 +80,13 @@ class ConversationBotSettingsState extends State<ConversationBotSettings> {
expression: BotExpression.idle,
),
),
onTap: showBotOptionsDialog,
onTap: () => showDialog<BotOptionsModel?>(
context: context,
builder: (BuildContext context) => ConversationBotSettingsDialog(
room: widget.room,
onSubmit: setBotOptions,
),
),
),
],
),
@ -101,10 +96,12 @@ class ConversationBotSettingsState extends State<ConversationBotSettings> {
class ConversationBotSettingsDialog extends StatefulWidget {
final Room room;
final Function(BotOptionsModel) onSubmit;
const ConversationBotSettingsDialog({
super.key,
required this.room,
required this.onSubmit,
});
@override
@ -272,7 +269,10 @@ class ConversationBotSettingsDialogState
botOptions.targetLanguage ??= MatrixState
.pangeaController.languageController.userL2?.langCode;
Navigator.of(context).pop(botOptions);
await showFutureLoadingDialog(
context: context,
future: () async => widget.onSubmit(botOptions),
);
final bool isBotRoomMember = await widget.room.botIsInRoom;
if (addBot && !isBotRoomMember) {
@ -280,6 +280,8 @@ class ConversationBotSettingsDialogState
} else if (!addBot && isBotRoomMember) {
await widget.room.kick(BotName.byEnvironment);
}
Navigator.of(context).pop(botOptions);
},
child: hasPermission
? Text(L10n.of(context).confirm)