Skip to content

add invites tab #119

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

Open
CherretGit wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add invites tab #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion assets/l10n/intl_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3780,5 +3780,10 @@
}
}
},
"owner": "Owner"
"owner": "Owner",
"invites": "Invites",
"@invites": {
"type": "String",
"placeholders": {}
}
}
7 changes: 6 additions & 1 deletion assets/l10n/intl_ru.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3852,5 +3852,10 @@
"engine": {"type": "String"}
}
},
"owner": "Владелец"
"owner": "Владелец",
"invites": "Приглашения",
"@invites": {
"type": "String",
"placeholders": {}
}
}
15 changes: 12 additions & 3 deletions lib/pages/chat_list/chat_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ enum PopupMenuAction {
archive,
}

enum ActiveFilter { allChats, messages, groups, unread, spaces, people }
enum ActiveFilter { allChats, messages, groups, unread, invites, spaces, people }

extension LocalizedActiveFilter on ActiveFilter {
String toLocalizedString(BuildContext context) {
Expand All @@ -57,6 +57,8 @@ extension LocalizedActiveFilter on ActiveFilter {
return L10n.of(context).unread;
case ActiveFilter.groups:
return L10n.of(context).groups;
case ActiveFilter.invites:
return L10n.of(context).invites;
case ActiveFilter.spaces:
return L10n.of(context).spaces;
case ActiveFilter.people:
Expand All @@ -75,6 +77,8 @@ extension LocalizedActiveFilter on ActiveFilter {
: Icons.mark_unread_chat_alt;
case .groups:
return outline ? Icons.people_outline : Icons.people;
case .invites:
return outline ? Icons.mail_outline : Icons.mail;
case .spaces:
return outline ? Icons.grid_view_outlined : Icons.grid_view_rounded;
case .people:
Expand Down Expand Up @@ -166,6 +170,7 @@ class ChatListController extends State<ChatList>
case .allChats:
return (room) =>
!room.isSpace &&
!room.membership.isInvite &&
(AppSettings.showSpaceRoomsInGlobalList.value ||
room.spaceParents
.where((space) => spacesIds.contains(space.roomId))
Expand All @@ -174,6 +179,7 @@ class ChatListController extends State<ChatList>
return (room) =>
!room.isSpace &&
room.isDirectChat &&
!room.membership.isInvite &&
(AppSettings.showSpaceRoomsInGlobalList.value ||
room.spaceParents
.where((space) => spacesIds.contains(space.roomId))
Expand All @@ -182,14 +188,17 @@ class ChatListController extends State<ChatList>
return (room) =>
!room.isSpace &&
!room.isDirectChat &&
!room.membership.isInvite &&
(AppSettings.showSpaceRoomsInGlobalList.value ||
room.spaceParents
.where((space) => spacesIds.contains(space.roomId))
.isEmpty);
case .invites:
return (room) => room.membership.isInvite;
case .unread:
return (room) => room.isUnreadOrInvited;
return (room) => !room.membership.isInvite && room.isUnreadOrInvited;
case .spaces:
return (room) => room.isSpace;
return (room) => !room.membership.isInvite && room.isSpace;
case .people:
return (room) => false;
}
Expand Down
10 changes: 6 additions & 4 deletions lib/pages/chat_list/chat_list_bottom_navbar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,19 @@ class _ChatListBottomNavbarState extends State<ChatListBottomNavbar> {
ActiveFilter.allChats,
if (AppSettings.separateChatTypes.value) ActiveFilter.groups,
ActiveFilter.unread,
ActiveFilter.invites,
if (spaceDelegateCandidates.isNotEmpty &&
!_c.widget.displayNavigationRail)
ActiveFilter.spaces,
if (AppSettings.enablePeopleTab.value) ActiveFilter.people,
];

final filterLambdas = {
ActiveFilter.allChats: (Room room) => true,
ActiveFilter.messages: (Room room) => room.isDirectChat,
ActiveFilter.groups: (Room room) => !room.isDirectChat,
ActiveFilter.unread: (Room room) => room.isUnread,
ActiveFilter.allChats: (Room room) => !room.membership.isInvite,
ActiveFilter.messages: (Room room) => !room.membership.isInvite && room.isDirectChat,
ActiveFilter.groups: (Room room) => !room.membership.isInvite && !room.isDirectChat,
ActiveFilter.unread: (Room room) => !room.membership.isInvite && room.isUnread,
ActiveFilter.invites: (Room room) => room.membership.isInvite,
ActiveFilter.spaces: (Room room) => false,
ActiveFilter.people: (Room room) => false,
};
Expand Down
10 changes: 6 additions & 4 deletions lib/pages/chat_list/chat_list_legacy_bottom_navbar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,19 @@ class _ChatListLegacyBottomNavbarState
ActiveFilter.allChats,
if (AppSettings.separateChatTypes.value) ActiveFilter.groups,
ActiveFilter.unread,
ActiveFilter.invites,
if (spaceDelegateCandidates.isNotEmpty &&
!_c.widget.displayNavigationRail)
ActiveFilter.spaces,
if (AppSettings.enablePeopleTab.value) ActiveFilter.people,
];

final filterLambdas = {
ActiveFilter.allChats: (Room room) => true,
ActiveFilter.messages: (Room room) => room.isDirectChat,
ActiveFilter.groups: (Room room) => !room.isDirectChat,
ActiveFilter.unread: (Room room) => room.isUnread,
ActiveFilter.allChats: (Room room) => !room.membership.isInvite,
ActiveFilter.messages: (Room room) => !room.membership.isInvite && room.isDirectChat,
ActiveFilter.groups: (Room room) => !room.membership.isInvite && !room.isDirectChat,
ActiveFilter.unread: (Room room) => !room.membership.isInvite && room.isUnread,
ActiveFilter.invites: (Room room) => room.membership.isInvite,
ActiveFilter.spaces: (Room room) => false,
ActiveFilter.people: (Room room) => false,
};
Expand Down