* build: Reenable shrink resources and minify in gradle * build: (deps): bump image from 4.6.0 to 4.7.1 Bumps [image](https://github.com/brendan-duncan/image) from 4.6.0 to 4.7.1. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build: (deps): bump file_picker from 10.3.7 to 10.3.8 Bumps [file_picker](https://github.com/miguelpruivo/flutter_file_picker) from 10.3.7 to 10.3.8. - [Release notes](https://github.com/miguelpruivo/flutter_file_picker/releases) - [Changelog](https://github.com/miguelpruivo/flutter_file_picker/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelpruivo/flutter_file_picker/compare/v10.3.7...v10.3.8) --- updated-dependencies: - dependency-name: file_picker dependency-version: 10.3.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Improved search * build: Use matrix sdk vom pub.dev again * chore: Follow up better search * build: (deps): bump image from 4.7.1 to 4.7.2 Bumps [image](https://github.com/brendan-duncan/image) from 4.7.1 to 4.7.2. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Make cross signing self sign mandatory for bootstrap * chore: Update user device keys before creating bootstrap * fix: Better wait for secrets after verification bootstrap * refactor: Remove native imaging and enable web worker * refactor: Remove unused html onfocus streams * build: (deps): bump flutter_foreground_task from 9.1.0 to 9.2.0 Bumps [flutter_foreground_task](https://github.com/Dev-hwang/flutter_foreground_task) from 9.1.0 to 9.2.0. - [Changelog](https://github.com/Dev-hwang/flutter_foreground_task/blob/master/CHANGELOG.md) - [Commits](https://github.com/Dev-hwang/flutter_foreground_task/commits) --- updated-dependencies: - dependency-name: flutter_foreground_task dependency-version: 9.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Uzbek) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uz/ * chore(translations): Translated using Weblate (Russian) Currently translated at 99.8% (824 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 90.9% (750 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Galician) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * chore(translations): Translated using Weblate (Basque) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * chore(translations): Translated using Weblate (Ukrainian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * chore(translations): Translated using Weblate (Dutch) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 95.2% (788 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 96.3% (797 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * fix: Broken ruzzian plurals * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 91.2% (753 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Bengali) Currently translated at 4.5% (38 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/bn/ * chore(translations): Translated using Weblate (French) Currently translated at 82.3% (679 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/ * build: (deps): bump translations_cleaner from 0.0.5 to 0.1.0 Bumps [translations_cleaner](https://github.com/Chinmay-KB/translations_cleaner) from 0.0.5 to 0.1.0. - [Changelog](https://github.com/Chinmay-KB/translations_cleaner/blob/main/CHANGELOG.md) - [Commits](https://github.com/Chinmay-KB/translations_cleaner/commits) --- updated-dependencies: - dependency-name: translations_cleaner dependency-version: 0.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (German) Currently translated at 99.2% (821 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (827 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * build: Bump version to 2.4.0 * build: (deps): bump sqflite_common_ffi from 2.3.6 to 2.3.7+1 Bumps [sqflite_common_ffi](https://github.com/tekartik/sqflite) from 2.3.6 to 2.3.7+1. - [Commits](https://github.com/tekartik/sqflite/compare/sqflite_common_ffi_v2.3.6...sqflite_common_ffi/v2.3.7) --- updated-dependencies: - dependency-name: sqflite_common_ffi dependency-version: 2.3.7+1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Czech) Currently translated at 66.1% (547 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (Czech) Currently translated at 72.7% (602 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (German) Currently translated at 99.8% (826 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore: Add security.md file * fix: Locale unlocalized strings * build: (deps): bump matrix from 4.1.0 to 5.0.0 Bumps [matrix](https://github.com/famedly/matrix-dart-sdk) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/famedly/matrix-dart-sdk/releases) - [Changelog](https://github.com/famedly/matrix-dart-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/famedly/matrix-dart-sdk/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: matrix dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: Notifications on web correctly managed when tab not focused * chore: Add changelog for android * chore: Remove duplicated localization * fix: Sign in label * chore: Versionize fcm shared isolate * build: Remove unused packag * build: (deps): bump package_info_plus from 8.3.1 to 9.0.0 Bumps [package_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus) from 8.3.1 to 9.0.0. - [Release notes](https://github.com/fluttercommunity/plus_plugins/releases) - [Commits](https://github.com/fluttercommunity/plus_plugins/commits/package_info_plus-v9.0.0/packages/package_info_plus) --- updated-dependencies: - dependency-name: package_info_plus dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Display particle animation on login page * chore: Use fixed version of fcm shared isolate * fix: apk crash on some platforms due new flutter version * chore: Correct kotlin format * fix iOS notifications * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * add missing type annotations * update matrix version * fluffychat merge * fluffychat merge * fix notification on click actions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Christian Kußowski <c.kussowski@famedly.com> Co-authored-by: Krille-chan <christian-kussowski@posteo.de> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BeMeritus <bemerituss@gmail.com> Co-authored-by: Frank Paul Silye <frankps@gmail.com> Co-authored-by: josé m. <correoxm@disroot.org> Co-authored-by: xabirequejo <xabi.rn@gmail.com> Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com> Co-authored-by: Priit Jõerüüt <jrthwlate@users.noreply.hosted.weblate.org> Co-authored-by: Jelv <post@jelv.nl> Co-authored-by: Дмитрий Михирев <bizdelnick@gmail.com> Co-authored-by: Kimby <kimbyqs@gmail.com> Co-authored-by: Christian <christian-pauly@posteo.de> Co-authored-by: Kom nake <kominak310@svcache.com> Co-authored-by: hugues de keyzer <komputilisto@hugues.info> Co-authored-by: nautilusx <translate@disroot.org> Co-authored-by: Šebestová <ka.sebestova.cz@gmail.com>
208 lines
5.7 KiB
Dart
208 lines
5.7 KiB
Dart
import 'dart:io';
|
|
import 'dart:math';
|
|
import 'dart:typed_data';
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/config/themes.dart';
|
|
import 'package:fluffychat/utils/client_download_content_extension.dart';
|
|
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
class MxcImage extends StatefulWidget {
|
|
final Uri? uri;
|
|
final Event? event;
|
|
final double? width;
|
|
final double? height;
|
|
final BoxFit? fit;
|
|
final bool isThumbnail;
|
|
final bool animated;
|
|
final Duration retryDuration;
|
|
final Duration animationDuration;
|
|
final Curve animationCurve;
|
|
final ThumbnailMethod thumbnailMethod;
|
|
final Widget Function(BuildContext context)? placeholder;
|
|
final String? cacheKey;
|
|
final Client? client;
|
|
final BorderRadius borderRadius;
|
|
|
|
const MxcImage({
|
|
this.uri,
|
|
this.event,
|
|
this.width,
|
|
this.height,
|
|
this.fit,
|
|
this.placeholder,
|
|
this.isThumbnail = true,
|
|
this.animated = false,
|
|
this.animationDuration = FluffyThemes.animationDuration,
|
|
this.retryDuration = const Duration(seconds: 2),
|
|
this.animationCurve = FluffyThemes.animationCurve,
|
|
this.thumbnailMethod = ThumbnailMethod.scale,
|
|
this.cacheKey,
|
|
this.client,
|
|
this.borderRadius = BorderRadius.zero,
|
|
super.key,
|
|
});
|
|
|
|
@override
|
|
State<MxcImage> createState() => _MxcImageState();
|
|
}
|
|
|
|
class _MxcImageState extends State<MxcImage> {
|
|
static final Map<String, Uint8List> _imageDataCache = {};
|
|
Uint8List? _imageDataNoCache;
|
|
|
|
Uint8List? get _imageData => widget.cacheKey == null
|
|
? _imageDataNoCache
|
|
: _imageDataCache[widget.cacheKey];
|
|
|
|
set _imageData(Uint8List? data) {
|
|
if (data == null) return;
|
|
final cacheKey = widget.cacheKey;
|
|
cacheKey == null
|
|
? _imageDataNoCache = data
|
|
: _imageDataCache[cacheKey] = data;
|
|
}
|
|
|
|
// #Pangea
|
|
Object? _error;
|
|
// Pangea#
|
|
|
|
Future<void> _load() async {
|
|
if (!mounted) return;
|
|
final client =
|
|
widget.client ?? widget.event?.room.client ?? Matrix.of(context).client;
|
|
final uri = widget.uri;
|
|
final event = widget.event;
|
|
|
|
if (uri != null) {
|
|
final devicePixelRatio = MediaQuery.devicePixelRatioOf(context);
|
|
final width = widget.width;
|
|
final realWidth = width == null ? null : width * devicePixelRatio;
|
|
final height = widget.height;
|
|
final realHeight = height == null ? null : height * devicePixelRatio;
|
|
|
|
final remoteData = await client.downloadMxcCached(
|
|
uri,
|
|
width: realWidth,
|
|
height: realHeight,
|
|
thumbnailMethod: widget.thumbnailMethod,
|
|
isThumbnail: widget.isThumbnail,
|
|
animated: widget.animated,
|
|
);
|
|
if (!mounted) return;
|
|
setState(() {
|
|
_imageData = remoteData;
|
|
});
|
|
}
|
|
|
|
if (event != null) {
|
|
final data = await event.downloadAndDecryptAttachment(
|
|
getThumbnail: widget.isThumbnail,
|
|
);
|
|
if (data.detectFileType is MatrixImageFile || widget.isThumbnail) {
|
|
if (!mounted) return;
|
|
setState(() {
|
|
_imageData = data.bytes;
|
|
});
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
void _tryLoad() async {
|
|
if (_imageData != null) {
|
|
return;
|
|
}
|
|
try {
|
|
// #Pangea
|
|
setState(() => _error = null);
|
|
// Pangea#
|
|
await _load();
|
|
} on IOException catch (_) {
|
|
if (!mounted) return;
|
|
await Future.delayed(widget.retryDuration);
|
|
_tryLoad();
|
|
}
|
|
// #Pangea
|
|
catch (e) {
|
|
if (mounted) {
|
|
setState(() => _error = e);
|
|
}
|
|
}
|
|
// Pangea#
|
|
}
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
WidgetsBinding.instance.addPostFrameCallback((_) => _tryLoad());
|
|
}
|
|
|
|
// #Pangea
|
|
@override
|
|
void didUpdateWidget(covariant MxcImage oldWidget) {
|
|
super.didUpdateWidget(oldWidget);
|
|
if (oldWidget.uri != widget.uri || oldWidget.cacheKey != widget.cacheKey) {
|
|
_imageData = null;
|
|
WidgetsBinding.instance.addPostFrameCallback((_) => _tryLoad());
|
|
}
|
|
}
|
|
// Pangea#
|
|
|
|
Widget placeholder(BuildContext context) =>
|
|
widget.placeholder?.call(context) ??
|
|
Container(
|
|
width: widget.width,
|
|
height: widget.height,
|
|
alignment: Alignment.center,
|
|
child: const CircularProgressIndicator.adaptive(strokeWidth: 2),
|
|
);
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final data = _imageData;
|
|
final hasData = data != null && data.isNotEmpty;
|
|
|
|
return AnimatedSwitcher(
|
|
duration: FluffyThemes.animationDuration,
|
|
child: hasData
|
|
? ClipRRect(
|
|
borderRadius: widget.borderRadius,
|
|
child: Image.memory(
|
|
data,
|
|
width: widget.width,
|
|
height: widget.height,
|
|
fit: widget.fit,
|
|
filterQuality: widget.isThumbnail
|
|
? FilterQuality.low
|
|
: FilterQuality.medium,
|
|
errorBuilder: (context, e, s) {
|
|
Logs().d('Unable to render mxc image', e, s);
|
|
return SizedBox(
|
|
width: widget.width,
|
|
height: widget.height,
|
|
child: Material(
|
|
color: Theme.of(context).colorScheme.surfaceContainer,
|
|
child: Icon(
|
|
Icons.broken_image_outlined,
|
|
size: min(widget.height ?? 64, 64),
|
|
color: Theme.of(context).colorScheme.onSurface,
|
|
),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
)
|
|
// #Pangea
|
|
// : placeholder(context),
|
|
: _error != null
|
|
? SizedBox(width: widget.width, height: widget.height)
|
|
: placeholder(context),
|
|
// Pangea#
|
|
);
|
|
}
|
|
}
|