Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TW-2165: Improve tag suggestion with members in room #2200

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+129 −18
Open

TW-2165: Improve tag suggestion with members in room #2200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ff9bc3
TW-2165: Improve tag suggestion with members in room
nqhhdev Dec 23, 2024
66c1d47
TW-2165: Add ADR for this tick
nqhhdev Dec 29, 2024
a8a607b
fixup! TW-2165: Add ADR for this tick
nqhhdev Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion lib/pages/chat/chat.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,19 @@ class ChatController extends State<Chat>
}
}

Future<void> _requestParticipants() async {
if (room == null) return;
try {
await room!.requestParticipants(
at: room!.prev_batch,
notMembership: Membership.leave,
);
} catch (e) {
Logs()
.e('Chat::_requestParticipants(): Failed to request participants', e);
}
}

bool isUnpinEvent(Event event) =>
room?.pinnedEventIds
.firstWhereOrNull((eventId) => eventId == event.eventId) !=
Expand Down Expand Up @@ -1995,13 +2008,14 @@ class ChatController extends State<Chat>
_tryLoadTimeline();
sendController.addListener(updateInputTextNotifier);
super.initState();
SchedulerBinding.instance.addPostFrameCallback((_) {
SchedulerBinding.instance.addPostFrameCallback((_) async {
if (room == null) {
return context.go("/error");
}
_handleReceivedShareFiles();
_listenRoomUpdateEvent();
initCachedPresence();
await _requestParticipants();
});
}

Expand Down
9 changes: 4 additions & 5 deletions lib/pages/chat_details/chat_details_page_view/chat_details_members_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,30 @@ import 'package:matrix/matrix.dart';
class ChatDetailsMembersPage extends StatelessWidget {
static const int addMemberItemCount = 1;

final ValueNotifier<List<User>?> membersNotifier;
final ValueNotifier<List<User>?> displayMembersNotifier;
final int actualMembersCount;
final VoidCallback openDialogInvite;
final VoidCallback requestMoreMembersAction;
final VoidCallback? onUpdatedMembers;
final bool canRequestMoreMembers;
final bool isMobileAndTablet;

const ChatDetailsMembersPage({
super.key,
required this.membersNotifier,
required this.displayMembersNotifier,
required this.actualMembersCount,
required this.openDialogInvite,
required this.requestMoreMembersAction,
required this.canRequestMoreMembers,
required this.isMobileAndTablet,
this.onUpdatedMembers,
});

@override
Widget build(BuildContext context) {
return ValueListenableBuilder(
valueListenable: membersNotifier,
valueListenable: displayMembersNotifier,
builder: (context, members, child) {
members ??= [];
final canRequestMoreMembers = members.length < actualMembersCount;
return Column(
children: [
Expanded(
Expand Down
47 changes: 38 additions & 9 deletions lib/presentation/mixins/chat_details_tab_mixin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import 'package:fluffychat/presentation/mixins/handle_video_download_mixin.dart'
import 'package:fluffychat/presentation/mixins/play_video_action_mixin.dart';
import 'package:fluffychat/presentation/model/chat_details/chat_details_page_model.dart';
import 'package:fluffychat/presentation/same_type_events_builder/same_type_events_controller.dart';
import 'package:fluffychat/utils/dialog/twake_dialog.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/utils/responsive/responsive_utils.dart';
Expand All @@ -36,6 +35,9 @@ mixin ChatDetailsTabMixin<T extends StatefulWidget>

final ValueNotifier<List<User>?> _membersNotifier = ValueNotifier(null);

final ValueNotifier<List<User>?> _displayMembersNotifier =
ValueNotifier(null);

late final List<ChatDetailsPage> tabList;

Room? get room;
Expand All @@ -59,6 +61,8 @@ mixin ChatDetailsTabMixin<T extends StatefulWidget>
static const _mediaFetchLimit = 20;
static const _linksFetchLimit = 20;
static const _filesFetchLimit = 20;
static const _maxMembers = 30;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not get this idea? what is it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wrote ADR for this ticket, pls check it more details related to _maxMembers variable

int _currentMembersCount = _maxMembers;

static const _memberPageKey = PageStorageKey('members');
static const _mediaPageKey = PageStorageKey('media');
Expand Down Expand Up @@ -109,11 +113,36 @@ mixin ChatDetailsTabMixin<T extends StatefulWidget>
}

void _requestMoreMembersAction() async {
final participants = await TwakeDialog.showFutureLoadingDialogFullScreen(
future: () => room!.requestParticipants(),
);
if (participants.error == null) {
_membersNotifier.value = participants.result;
final currentMembersCount = _displayMembersNotifier.value?.length ?? 0;
_currentMembersCount += _maxMembers;

final members = _membersNotifier.value;
if (members != null && currentMembersCount < members.length) {
final endIndex = _currentMembersCount > members.length
? members.length
: _currentMembersCount;
final newMembers = members.sublist(currentMembersCount, endIndex);
_displayMembersNotifier.value = [
...?_displayMembersNotifier.value,
...newMembers,
];
} else {
_displayMembersNotifier.value = [
...?_displayMembersNotifier.value,
...?members,
];
}
}

void _initDisplayMembers() {
final members = _membersNotifier.value;
if (members != null && members.isNotEmpty) {
final endIndex = _currentMembersCount > members.length
? members.length
: _currentMembersCount;
_displayMembersNotifier.value = members.sublist(0, endIndex);
} else {
_displayMembersNotifier.value = [];
}
}

Expand Down Expand Up @@ -188,6 +217,7 @@ mixin ChatDetailsTabMixin<T extends StatefulWidget>
void _initMembers() {
if (chatType == ChatDetailsScreenEnum.group) {
_membersNotifier.value ??= room?.getParticipants();
_initDisplayMembers();
}
}

Expand Down Expand Up @@ -236,10 +266,8 @@ mixin ChatDetailsTabMixin<T extends StatefulWidget>
page: page,
child: ChatDetailsMembersPage(
key: _memberPageKey,
membersNotifier: _membersNotifier,
displayMembersNotifier: _displayMembersNotifier,
actualMembersCount: actualMembersCount,
canRequestMoreMembers:
(_membersNotifier.value?.length ?? 0) < actualMembersCount,
requestMoreMembersAction: _requestMoreMembersAction,
openDialogInvite: _openDialogInvite,
isMobileAndTablet: isMobileAndTablet,
Expand Down Expand Up @@ -308,6 +336,7 @@ mixin ChatDetailsTabMixin<T extends StatefulWidget>
void dispose() {
_disposeControllers();
_membersNotifier.dispose();
_displayMembersNotifier.dispose();
_onRoomEventChangedSubscription?.cancel();
nestedScrollViewState.currentState?.innerController.dispose();
super.dispose();
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
matrix:
git:
url: [email protected]:linagora/matrix-dart-sdk.git
ref: twake-supported-0.22.6
ref: TW-2165-support-store-members-in-local-database

receive_sharing_intent:
git:
Expand Down
Loading