GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-25 23:12:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/send-file' into 'main'

Browse Source 
chore: Display error message on file

See merge request famedly/fluffychat!797
This commit is contained in:
Krille Fear 2022-04-01 09:59:19 +00:00
commit 2f1dc8dc15
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/chat/events/message.dart
View File

@ -290,8 +290,6 @@ class Message extends StatelessWidget {
)), )),
), ),
row, row,
if (event.fileSendingStatus != null)
Text(event.fileSendingStatus!.name),
if (event.hasAggregatedEvents(timeline, RelationshipTypes.reaction)) if (event.hasAggregatedEvents(timeline, RelationshipTypes.reaction))
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(

27
lib/pages/chat/send_file_dialog.dart
View File

@ -23,7 +23,6 @@ class SendFileDialog extends StatefulWidget {
class _SendFileDialogState extends State<SendFileDialog> { class _SendFileDialogState extends State<SendFileDialog> {
bool origImage = false; bool origImage = false;
bool _isSending = false;
/// Images smaller than 20kb don't need compression. /// Images smaller than 20kb don't need compression.
static const int minSizeToCompress = 20 * 1024; static const int minSizeToCompress = 20 * 1024;
@ -32,14 +31,27 @@ class _SendFileDialogState extends State<SendFileDialog> {
var file = widget.file; var file = widget.file;
MatrixImageFile? thumbnail; MatrixImageFile? thumbnail;
if (file is MatrixVideoFile && file.bytes.length > minSizeToCompress) { if (file is MatrixVideoFile && file.bytes.length > minSizeToCompress) {
await showFutureLoadingDialog(
context: context,
future: () async {
file = await file.resizeVideo(); file = await file.resizeVideo();
thumbnail = await file.getVideoThumbnail(); thumbnail = await file.getVideoThumbnail();
});
} }
widget.room.sendFileEvent( final scaffoldMessenger = ScaffoldMessenger.of(context);
widget.room
.sendFileEvent(
file, file,
thumbnail: thumbnail, thumbnail: thumbnail,
shrinkImageMaxDimension: origImage ? null : 1600, shrinkImageMaxDimension: origImage ? null : 1600,
)
.catchError((e) {
scaffoldMessenger.showSnackBar(
SnackBar(content: Text(e.toLocalizedString())),
); );
});
Navigator.of(context, rootNavigator: false).pop();
return; return;
} }
@ -91,16 +103,7 @@ class _SendFileDialogState extends State<SendFileDialog> {
child: Text(L10n.of(context)!.cancel), child: Text(L10n.of(context)!.cancel),
), ),
TextButton( TextButton(
onPressed: _isSending onPressed: _send,
? null
: () async {
setState(() {
_isSending = true;
});
await showFutureLoadingDialog(
context: context, future: () => _send());
Navigator.of(context, rootNavigator: false).pop();
},
child: Text(L10n.of(context)!.send), child: Text(L10n.of(context)!.send),
), ),
], ],