* 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>
230 lines
6.6 KiB
Dart
230 lines
6.6 KiB
Dart
import 'package:flutter/material.dart';
|
|
|
|
import 'package:collection/collection.dart' show IterableExtension;
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/config/app_config.dart';
|
|
import 'package:fluffychat/widgets/avatar.dart';
|
|
import 'package:fluffychat/widgets/future_loading_dialog.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
import 'package:fluffychat/widgets/mxc_image.dart';
|
|
|
|
class MessageReactions extends StatelessWidget {
|
|
final Event event;
|
|
final Timeline timeline;
|
|
|
|
const MessageReactions(this.event, this.timeline, {super.key});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final allReactionEvents = event.aggregatedEvents(
|
|
timeline,
|
|
RelationshipTypes.reaction,
|
|
);
|
|
final reactionMap = <String, _ReactionEntry>{};
|
|
final client = Matrix.of(context).client;
|
|
|
|
for (final e in allReactionEvents) {
|
|
final key = e.content
|
|
.tryGetMap<String, dynamic>('m.relates_to')
|
|
?.tryGet<String>('key');
|
|
if (key != null) {
|
|
if (!reactionMap.containsKey(key)) {
|
|
reactionMap[key] = _ReactionEntry(
|
|
key: key,
|
|
count: 0,
|
|
reacted: false,
|
|
reactors: [],
|
|
);
|
|
}
|
|
reactionMap[key]!.count++;
|
|
reactionMap[key]!.reactors!.add(e.senderFromMemoryOrFallback);
|
|
reactionMap[key]!.reacted |= e.senderId == e.room.client.userID;
|
|
}
|
|
}
|
|
|
|
final reactionList = reactionMap.values.toList();
|
|
reactionList.sort((a, b) => b.count - a.count > 0 ? 1 : -1);
|
|
final ownMessage = event.senderId == event.room.client.userID;
|
|
return Wrap(
|
|
spacing: 4.0,
|
|
runSpacing: 4.0,
|
|
alignment: ownMessage ? WrapAlignment.end : WrapAlignment.start,
|
|
children: [
|
|
...reactionList.map(
|
|
(r) => _Reaction(
|
|
reactionKey: r.key,
|
|
count: r.count,
|
|
reacted: r.reacted,
|
|
onTap: () {
|
|
if (r.reacted) {
|
|
final evt = allReactionEvents.firstWhereOrNull(
|
|
(e) =>
|
|
e.senderId == e.room.client.userID &&
|
|
e.content.tryGetMap('m.relates_to')?['key'] == r.key,
|
|
);
|
|
if (evt != null) {
|
|
showFutureLoadingDialog(
|
|
context: context,
|
|
future: () => evt.redactEvent(),
|
|
);
|
|
}
|
|
} else {
|
|
event.room.sendReaction(event.eventId, r.key);
|
|
}
|
|
},
|
|
onLongPress: () async => await _AdaptableReactorsDialog(
|
|
client: client,
|
|
reactionEntry: r,
|
|
).show(context),
|
|
),
|
|
),
|
|
if (allReactionEvents.any((e) => e.status.isSending))
|
|
const SizedBox(
|
|
width: 24,
|
|
height: 24,
|
|
child: Padding(
|
|
padding: EdgeInsets.all(4.0),
|
|
child: CircularProgressIndicator.adaptive(strokeWidth: 1),
|
|
),
|
|
),
|
|
],
|
|
);
|
|
}
|
|
}
|
|
|
|
class _Reaction extends StatelessWidget {
|
|
final String reactionKey;
|
|
final int count;
|
|
final bool? reacted;
|
|
final void Function()? onTap;
|
|
final void Function()? onLongPress;
|
|
|
|
const _Reaction({
|
|
required this.reactionKey,
|
|
required this.count,
|
|
required this.reacted,
|
|
required this.onTap,
|
|
required this.onLongPress,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final theme = Theme.of(context);
|
|
|
|
Widget content;
|
|
if (reactionKey.startsWith('mxc://')) {
|
|
content = Row(
|
|
mainAxisSize: .min,
|
|
children: <Widget>[
|
|
MxcImage(
|
|
uri: Uri.parse(reactionKey),
|
|
width: 20,
|
|
height: 20,
|
|
animated: false,
|
|
isThumbnail: false,
|
|
),
|
|
if (count > 1) ...[
|
|
const SizedBox(width: 4),
|
|
Text(
|
|
count.toString(),
|
|
textAlign: TextAlign.center,
|
|
style: TextStyle(
|
|
color: theme.colorScheme.onSurface,
|
|
fontSize: DefaultTextStyle.of(context).style.fontSize,
|
|
),
|
|
),
|
|
],
|
|
],
|
|
);
|
|
} else {
|
|
var renderKey = Characters(reactionKey);
|
|
if (renderKey.length > 10) {
|
|
renderKey = renderKey.getRange(0, 9) + Characters('…');
|
|
}
|
|
content = Text(
|
|
renderKey.toString() + (count > 1 ? ' $count' : ''),
|
|
style: TextStyle(
|
|
color: theme.colorScheme.onSurface,
|
|
fontSize: DefaultTextStyle.of(context).style.fontSize,
|
|
),
|
|
);
|
|
}
|
|
return InkWell(
|
|
onTap: () => onTap != null ? onTap!() : null,
|
|
onLongPress: () => onLongPress != null ? onLongPress!() : null,
|
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
|
|
child: Container(
|
|
decoration: BoxDecoration(
|
|
color: reacted == true
|
|
? theme.colorScheme.primaryContainer
|
|
: theme.colorScheme.surfaceContainerHigh,
|
|
border: Border.all(
|
|
color: reacted == true
|
|
? theme.colorScheme.primary
|
|
: theme.colorScheme.surfaceContainerHigh,
|
|
width: 1,
|
|
),
|
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
|
|
),
|
|
padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
|
|
child: content,
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _ReactionEntry {
|
|
String key;
|
|
int count;
|
|
bool reacted;
|
|
List<User>? reactors;
|
|
|
|
_ReactionEntry({
|
|
required this.key,
|
|
required this.count,
|
|
required this.reacted,
|
|
this.reactors,
|
|
});
|
|
}
|
|
|
|
class _AdaptableReactorsDialog extends StatelessWidget {
|
|
final Client? client;
|
|
final _ReactionEntry? reactionEntry;
|
|
|
|
const _AdaptableReactorsDialog({this.client, this.reactionEntry});
|
|
|
|
Future<bool?> show(BuildContext context) => showAdaptiveDialog(
|
|
context: context,
|
|
builder: (context) => this,
|
|
barrierDismissible: true,
|
|
useRootNavigator: false,
|
|
);
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final body = SingleChildScrollView(
|
|
child: Wrap(
|
|
spacing: 8.0,
|
|
runSpacing: 4.0,
|
|
alignment: WrapAlignment.center,
|
|
children: <Widget>[
|
|
for (final reactor in reactionEntry!.reactors!)
|
|
Chip(
|
|
avatar: Avatar(
|
|
mxContent: reactor.avatarUrl,
|
|
name: reactor.displayName,
|
|
client: client,
|
|
presenceUserId: reactor.stateKey,
|
|
),
|
|
label: Text(reactor.displayName!),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
|
|
final title = Center(child: Text(reactionEntry!.key));
|
|
|
|
return AlertDialog.adaptive(title: title, content: body);
|
|
}
|
|
}
|