2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Display thread messages like replies as a thread fallback

Browse source 
Signed-off-by: Krille <c.kussowski@famedly.com>
This commit is contained in:
Krille 2025-05-05 09:30:56 +02:00
commit 89fb866cde
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
3 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pages/chat/events/message.dart
View file

@ -342,8 +342,12 @@ class Message extends StatelessWidget {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
if (event.relationshipType == if ({
RelationshipTypes.reply) RelationshipTypes.reply,
RelationshipTypes.thread,
}.contains(
event.relationshipType,
))
FutureBuilder<Event?>( FutureBuilder<Event?>(
future: event future: event
.getReplyEvent(timeline), .getReplyEvent(timeline),

17
lib/pages/chat_members/chat_members_view.dart
View file

@ -144,15 +144,18 @@ class ChatMembersView extends StatelessWidget {
L10n.of(context).banned, L10n.of(context).banned,
Membership.invite => Membership.invite =>
L10n.of(context).invited, L10n.of(context).invited,
Membership.join => L10n.of(context) Membership.join =>
.countParticipants(room.summary L10n.of(context).countParticipants(
.mJoinedMemberCount ?? room.summary.mJoinedMemberCount ??
controller.members controller.members
?.where((member) => ?.where(
member.membership == (member) =>
Membership.join) member.membership ==
Membership.join,
)
.length ?? .length ??
0), 0,
),
Membership.knock => Membership.knock =>
L10n.of(context).knocking, L10n.of(context).knocking,
Membership.leave => Membership.leave =>

14
lib/utils/push_helper.dart
View file

@ -1,19 +1,21 @@
import 'dart:ui'; import 'dart:ui';
import 'package:collection/collection.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/client_download_content_extension.dart';
import 'package:fluffychat/utils/client_manager.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:collection/collection.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:flutter_shortcuts_new/flutter_shortcuts_new.dart'; import 'package:flutter_shortcuts_new/flutter_shortcuts_new.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/client_download_content_extension.dart';
import 'package:fluffychat/utils/client_manager.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/utils/platform_infos.dart';
Future<void> pushHelper( Future<void> pushHelper(
PushNotification notification, { PushNotification notification, {
Client? client, Client? client,