Matrix/fluffychat
Matrix/fluffychat
1
0
Fork 0
mirror of https://github.com/krille-chan/fluffychat synced 2024-10-05 15:52:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: Follow up image rendering

Browse source
This commit is contained in:
krille-chan 2024-03-24 10:56:44 +01:00
parent 449357b501
commit 45e1122648
No known key found for this signature in database
5 changed files with 48 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pages/chat/chat.dart
View file

@ -152,7 +152,8 @@ class ChatController extends State<ChatPageWithRoom>
return MatrixFile(
bytes: await xfile.readAsBytes(),
name: xfile.name,
);
mimeType: xfile.mimeType,
).detectFileType;
},
),
);

31
lib/pages/chat/events/message_content.dart
View file

@ -111,26 +111,29 @@ class MessageContent extends StatelessWidget {
if (event.redacted) continue textmessage;
const maxSize = 256.0;
final w = event.content
.tryGetMap<String, Object?>('info')
?.tryGet<int>('w') ??
maxSize;
.tryGetMap<String, Object?>('info')
?.tryGet<int>('w');
final h = event.content
.tryGetMap<String, Object?>('info')
?.tryGet<int>('h') ??
maxSize;
double width, height;
if (w > h) {
width = maxSize;
height = max(32, maxSize * (h / w));
} else {
height = maxSize;
width = max(32, maxSize * (w / h));
.tryGetMap<String, Object?>('info')
?.tryGet<int>('h');
var width = maxSize;
var height = maxSize;
var fit = BoxFit.cover;
if (w != null && h != null) {
fit = BoxFit.contain;
if (w > h) {
width = maxSize;
height = max(32, maxSize * (h / w));
} else {
height = maxSize;
width = max(32, maxSize * (w / h));
}
}
return ImageBubble(
event,
width: width,
height: height,
fit: BoxFit.contain,
fit: fit,
borderRadius: borderRadius,
);
case CuteEventContent.eventType:

3
lib/pages/chat/input_bar.dart
View file

@ -9,6 +9,7 @@ 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';
@ -464,7 +465,7 @@ class InputBar extends StatelessWidget {
mimeType: content.mimeType,
bytes: data,
name: content.uri.split('/').last,
);
).detectFileType;
room.sendFileEvent(file, shrinkImageMaxDimension: 1600);
},
),

4
lib/widgets/blur_hash.dart
View file

@ -34,6 +34,7 @@ class _BlurHashState extends State<BlurHash> {
}
Future<Uint8List?> _computeBlurhashData() async {
if (_data != null) return _data!;
final ratio = widget.width / widget.height;
var width = 32;
var height = 32;
@ -57,13 +58,14 @@ class _BlurHashState extends State<BlurHash> {
Widget build(BuildContext context) {
return FutureBuilder<Uint8List?>(
future: _computeBlurhashData(),
initialData: _data,
builder: (context, snapshot) {
final data = snapshot.data;
if (data == null) {
return Container(
width: widget.width,
height: widget.height,
color: Theme.of(context).colorScheme.surface,
color: Theme.of(context).colorScheme.onInverseSurface,
);
}
return Image.memory(

56
lib/widgets/mxc_image.dart
View file

@ -130,11 +130,8 @@ class _MxcImageState extends State<MxcImage> {
}
}
bool _hasDataFromBeginning = false;
void _tryLoad(_) async {
if (_imageData != null) {
_hasDataFromBeginning = true;
return;
}
try {
@ -163,35 +160,30 @@ class _MxcImageState extends State<MxcImage> {
final data = _imageData;
final hasData = data != null && data.isNotEmpty;
return Stack(
children: [
if (!_hasDataFromBeginning) placeholder(context),
AnimatedOpacity(
opacity: hasData ? 1 : 0,
duration: FluffyThemes.animationDuration,
curve: FluffyThemes.animationCurve,
child: hasData
? Image.memory(
data,
width: widget.width,
height: widget.height,
fit: widget.fit,
filterQuality: widget.isThumbnail
? FilterQuality.low
: FilterQuality.medium,
errorBuilder: (context, __, ___) {
_isCached = false;
_imageData = null;
WidgetsBinding.instance.addPostFrameCallback(_tryLoad);
return placeholder(context);
},
)
: SizedBox(
width: widget.width,
height: widget.height,
),
),
],
return AnimatedCrossFade(
crossFadeState:
hasData ? CrossFadeState.showSecond : CrossFadeState.showFirst,
duration: FluffyThemes.animationDuration,
firstChild: placeholder(context),
secondChild: hasData
? Image.memory(
data,
width: widget.width,
height: widget.height,
fit: widget.fit,
filterQuality:
widget.isThumbnail ? FilterQuality.low : FilterQuality.medium,
errorBuilder: (context, __, ___) {
_isCached = false;
_imageData = null;
WidgetsBinding.instance.addPostFrameCallback(_tryLoad);
return placeholder(context);
},
)
: SizedBox(
width: widget.width,
height: widget.height,
),
);
}
}