Merge branch 'krille-chan:main' into main

This commit is contained in:
Shubham 2024-05-25 18:51:06 +05:30 committed by GitHub
commit 23a0ec1fb3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 9 deletions

View file

@ -236,7 +236,9 @@ class Message extends StatelessWidget {
if (!nextEventSameSender)
Padding(
padding: const EdgeInsets.only(
left: 8.0, bottom: 4),
left: 8.0,
bottom: 4,
),
child: ownMessage || event.room.isDirectChat
? const SizedBox(height: 12)
: FutureBuilder<User?>(
@ -315,8 +317,10 @@ class Message extends StatelessWidget {
FutureBuilder<Event?>(
future: event
.getReplyEvent(timeline),
builder: (BuildContext context,
snapshot) {
builder: (
BuildContext context,
snapshot,
) {
final replyEvent = snapshot
.hasData
? snapshot.data!

View file

@ -9,7 +9,6 @@ import 'package:pasteboard/pasteboard.dart';
import 'package:slugify/slugify.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/mxc_image.dart';
import '../../widgets/avatar.dart';
@ -465,8 +464,11 @@ class InputBar extends StatelessWidget {
mimeType: content.mimeType,
bytes: data,
name: content.uri.split('/').last,
).detectFileType;
room.sendFileEvent(file, shrinkImageMaxDimension: 1600);
);
room.sendFileEvent(
file,
shrinkImageMaxDimension: 1600,
);
},
),
minLines: minLines,

View file

@ -1210,10 +1210,10 @@ packages:
dependency: "direct main"
description:
name: matrix
sha256: "8aa55b91cc436082a80d478810197867e95316141f339cfbaf61b6ea722d6bed"
sha256: b96f16ec227138a61d148f2812c4d558b2930edbb6cd05d03b3a41c4fffd2f47
url: "https://pub.dev"
source: hosted
version: "0.29.4"
version: "0.29.7"
meta:
dependency: transitive
description:

View file

@ -64,7 +64,7 @@ dependencies:
keyboard_shortcuts: ^0.1.4
latlong2: ^0.9.1
linkify: ^5.0.0
matrix: ^0.29.4
matrix: ^0.29.7
native_imaging: ^0.1.1
package_info_plus: ^6.0.0
pasteboard: ^0.2.0