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

refactor: Update FutureLoadingDialog

Browse source
This commit is contained in:
krille-chan 2023-10-28 17:32:37 +02:00
commit f028b12185
No known key found for this signature in database
5 changed files with 19 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/pages/chat/events/message_reactions.dart
View file

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:collection/collection.dart' show IterableExtension;
@ -6,7 +5,6 @@ import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:fluffychat/widgets/mxc_image.dart';
@ -191,19 +189,12 @@ class _AdaptableReactorsDialog extends StatelessWidget {
this.reactionEntry,
});
Future<bool?> show(BuildContext context) => PlatformInfos.isCupertinoStyle
? showCupertinoDialog(
context: context,
builder: (context) => this,
barrierDismissible: true,
useRootNavigator: false,
)
: showDialog(
context: context,
builder: (context) => this,
barrierDismissible: true,
useRootNavigator: false,
);
Future<bool?> show(BuildContext context) => showAdaptiveDialog(
context: context,
builder: (context) => this,
barrierDismissible: true,
useRootNavigator: false,
);
@override
Widget build(BuildContext context) {
@ -228,14 +219,9 @@ class _AdaptableReactorsDialog extends StatelessWidget {
final title = Center(child: Text(reactionEntry!.key!));
return PlatformInfos.isCupertinoStyle
? CupertinoAlertDialog(
title: title,
content: body,
)
: AlertDialog(
title: title,
content: body,
);
return AlertDialog.adaptive(
title: title,
content: body,
);
}
}

20
lib/pages/key_verification/key_verification_dialog.dart
View file

@ -1,7 +1,6 @@
import 'dart:convert';
import 'dart:ui';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -14,7 +13,7 @@ import 'package:matrix/matrix.dart';
import 'package:fluffychat/widgets/avatar.dart';
class KeyVerificationDialog extends StatefulWidget {
Future<void> show(BuildContext context) => showDialog(
Future<void> show(BuildContext context) => showAdaptiveDialog(
context: context,
builder: (context) => this,
barrierDismissible: false,
@ -342,23 +341,8 @@ class KeyVerificationPageState extends State<KeyVerificationDialog> {
);
break;
}
if ({TargetPlatform.iOS, TargetPlatform.macOS}
.contains(Theme.of(context).platform)) {
return CupertinoAlertDialog(
title: title,
content: SizedBox(
height: 256,
width: 256,
child: ListView(
padding: const EdgeInsets.only(top: 16),
children: [body],
),
),
actions: buttons,
);
}
return AlertDialog(
return AlertDialog.adaptive(
title: title,
content: SizedBox(
height: 256,

3
lib/utils/matrix_sdk_extensions/event_extension.dart
View file

@ -3,6 +3,7 @@ import 'dart:developer';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:async/async.dart' as async;
import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:matrix/matrix.dart';
@ -10,7 +11,7 @@ import 'package:fluffychat/utils/size_string.dart';
import 'matrix_file_extension.dart';
extension LocalizedBody on Event {
Future<LoadingDialogResult<MatrixFile?>> _getFile(BuildContext context) =>
Future<async.Result<MatrixFile?>> _getFile(BuildContext context) =>
showFutureLoadingDialog(
context: context,
future: downloadAndDecryptAttachment,