ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into fix-jagged-avatar-edges

Browse source
This commit is contained in:
Krille-chan 2025-05-03 07:34:50 +02:00 • committed by GitHub
commit 6aaa2bc2db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/file_description.dart'; import 'package:fluffychat/utils/file_description.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
import 'package:fluffychat/utils/url_launcher.dart'; import 'package:fluffychat/utils/url_launcher.dart';
import 'package:flutter/material.dart';
import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:matrix/matrix.dart';
class MessageDownloadContent extends StatelessWidget { class MessageDownloadContent extends StatelessWidget {
final Event event; final Event event;

8
lib/pages/chat_list/client_chooser_button.dart
View file

@ -56,18 +56,16 @@ class ClientChooserButton extends StatelessWidget {
], ],
), ),
), ),
// Currently disabled because of: PopupMenuItem(
// https://github.com/matrix-org/matrix-react-sdk/pull/12286
/*PopupMenuItem(
value: SettingsAction.archive, value: SettingsAction.archive,
child: Row( child: Row(
children: [ children: [
const Icon(Icons.archive_outlined), const Icon(Icons.archive_outlined),
const SizedBox(width: 18), const SizedBox(width: 18),
Text(L10n.of(context)!.archive), Text(L10n.of(context).archive),
], ],
), ),
),*/ ),
PopupMenuItem( PopupMenuItem(
value: SettingsAction.settings, value: SettingsAction.settings,
child: Row( child: Row(

6
lib/pages/chat_members/chat_members.dart
View file

@ -34,11 +34,7 @@ class ChatMembersController extends State<ChatMembersPage> {
final members = this final members = this
.members .members
?.where( ?.where((member) => member.membership == membershipFilter)
(member) =>
membershipFilter == Membership.join ||
member.membership == membershipFilter,
)
.toList(); .toList();
if (filter.isEmpty) { if (filter.isEmpty) {

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

@ -1,10 +1,9 @@
import 'package:fluffychat/utils/localized_exception_extension.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart'; import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/localized_exception_extension.dart';
import '../../widgets/layouts/max_width_body.dart'; import '../../widgets/layouts/max_width_body.dart';
import '../../widgets/matrix.dart'; import '../../widgets/matrix.dart';
import '../chat_details/participant_list_item.dart'; import '../chat_details/participant_list_item.dart';
@ -145,8 +144,15 @@ 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 => Membership.join => L10n.of(context)
L10n.of(context).all, .countParticipants(room.summary
.mJoinedMemberCount ??
controller.members
?.where((member) =>
member.membership ==
Membership.join)
.length ??
0),
Membership.knock => Membership.knock =>
L10n.of(context).knocking, L10n.of(context).knocking,
Membership.leave => Membership.leave =>