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

refactor: Switch to loading dialog

Browse source
This commit is contained in:
Christian Pauly 2020-12-25 09:58:34 +01:00
commit 75797a62b9
36 changed files with 461 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/components/list_items/chat_list_item.dart
View file

@ -15,7 +15,7 @@ import '../../utils/date_time_extension.dart';
import '../../views/chat.dart';
import '../avatar.dart';
import '../dialogs/send_file_dialog.dart';
import '../dialogs/simple_dialogs.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart';
import '../matrix.dart';
import '../mouse_over_builder.dart';
import '../theme_switcher.dart';
@ -41,9 +41,10 @@ class ChatListItem extends StatelessWidget {
if (onTap != null) return onTap();
if (!activeChat) {
if (room.membership == Membership.invite &&
await SimpleDialogs(context)
.tryRequestWithLoadingDialog(room.join()) ==
false) {
(await showFutureLoadingDialog(
context: context, future: () => room.join()))
.error !=
null) {
return;
}
@ -77,8 +78,10 @@ class ChatListItem extends StatelessWidget {
await archiveAction(context);
break;
case ArchivedRoomAction.rejoin:
await SimpleDialogs(context)
.tryRequestWithLoadingDialog(room.join());
await showFutureLoadingDialog(
context: context,
future: () => room.join(),
);
break;
}
}
@ -111,9 +114,11 @@ class ChatListItem extends StatelessWidget {
Future<void> archiveAction(BuildContext context) async {
{
if ([Membership.leave, Membership.ban].contains(room.membership)) {
final success = await SimpleDialogs(context)
.tryRequestWithLoadingDialog(room.forget());
if (success != false) {
final success = await showFutureLoadingDialog(
context: context,
future: () => room.forget(),
);
if (success.error == null) {
if (onForget != null) onForget();
}
return success;
@ -123,7 +128,8 @@ class ChatListItem extends StatelessWidget {
title: L10n.of(context).areYouSure,
);
if (confirmed == OkCancelResult.cancel) return;
await SimpleDialogs(context).tryRequestWithLoadingDialog(room.leave());
await showFutureLoadingDialog(
context: context, future: () => room.leave());
return;
}
}

12
lib/components/list_items/public_room_list_item.dart
View file

@ -1,6 +1,6 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:famedlysdk/matrix_api.dart';
import 'package:fluffychat/components/dialogs/simple_dialogs.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
@ -15,13 +15,15 @@ class PublicRoomListItem extends StatelessWidget {
const PublicRoomListItem(this.publicRoomEntry, {Key key}) : super(key: key);
void joinAction(BuildContext context) async {
final success = await SimpleDialogs(context)
.tryRequestWithLoadingDialog(_joinRoomAndWait(context));
if (success != false) {
final success = await showFutureLoadingDialog(
context: context,
future: () => _joinRoomAndWait(context),
);
if (success.error == null) {
await Navigator.of(context).push(
AppRoute.defaultRoute(
context,
ChatView(success),
ChatView(success.result),
),
);
}