refactor: Update to Dart 3.10 with . shorthands
This commit is contained in:
Christian Kußowski
parent
75a37f3f7c
commit
1ea649f01e
167 changed files with 3351 additions and 3912 deletions
|
|
@ -32,8 +32,7 @@ class ChatMembersController extends State<ChatMembersPage> {
|
|||
void setFilter([dynamic _]) async {
|
||||
final filter = filterController.text.toLowerCase().trim();
|
||||
|
||||
final members = this
|
||||
.members
|
||||
final members = this.members
|
||||
?.where((member) => member.membership == membershipFilter)
|
||||
.toList();
|
||||
|
||||
|
|
@ -45,14 +44,15 @@ class ChatMembersController extends State<ChatMembersPage> {
|
|||
return;
|
||||
}
|
||||
setState(() {
|
||||
filteredMembers = members
|
||||
?.where(
|
||||
(user) =>
|
||||
user.displayName?.toLowerCase().contains(filter) ??
|
||||
user.id.toLowerCase().contains(filter),
|
||||
)
|
||||
.toList()
|
||||
?..sort((b, a) => a.powerLevel.compareTo(b.powerLevel));
|
||||
filteredMembers =
|
||||
members
|
||||
?.where(
|
||||
(user) =>
|
||||
user.displayName?.toLowerCase().contains(filter) ??
|
||||
user.id.toLowerCase().contains(filter),
|
||||
)
|
||||
.toList()
|
||||
?..sort((b, a) => a.powerLevel.compareTo(b.powerLevel));
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -62,8 +62,7 @@ class ChatMembersController extends State<ChatMembersPage> {
|
|||
setState(() {
|
||||
error = null;
|
||||
});
|
||||
final participants = await Matrix.of(context)
|
||||
.client
|
||||
final participants = await Matrix.of(context).client
|
||||
.getRoomById(widget.roomId)
|
||||
?.requestParticipants(
|
||||
[...Membership.values]..remove(Membership.leave),
|
||||
|
|
@ -76,8 +75,11 @@ class ChatMembersController extends State<ChatMembersPage> {
|
|||
});
|
||||
setFilter();
|
||||
} catch (e, s) {
|
||||
Logs()
|
||||
.d('Unable to request participants. Try again in 3 seconds...', e, s);
|
||||
Logs().d(
|
||||
'Unable to request participants. Try again in 3 seconds...',
|
||||
e,
|
||||
s,
|
||||
);
|
||||
setState(() {
|
||||
error = e;
|
||||
});
|
||||
|
|
@ -91,14 +93,12 @@ class ChatMembersController extends State<ChatMembersPage> {
|
|||
super.initState();
|
||||
refreshMembers();
|
||||
|
||||
_updateSub = Matrix.of(context)
|
||||
.client
|
||||
.onSync
|
||||
.stream
|
||||
_updateSub = Matrix.of(context).client.onSync.stream
|
||||
.where(
|
||||
(syncUpdate) =>
|
||||
syncUpdate.rooms?.join?[widget.roomId]?.timeline?.events
|
||||
?.any((state) => state.type == EventTypes.RoomMember) ??
|
||||
syncUpdate.rooms?.join?[widget.roomId]?.timeline?.events?.any(
|
||||
(state) => state.type == EventTypes.RoomMember,
|
||||
) ??
|
||||
false,
|
||||
)
|
||||
.listen(refreshMembers);
|
||||
|
|
|
|||
|
|
@ -17,13 +17,12 @@ class ChatMembersView extends StatelessWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final room =
|
||||
Matrix.of(context).client.getRoomById(controller.widget.roomId);
|
||||
final room = Matrix.of(
|
||||
context,
|
||||
).client.getRoomById(controller.widget.roomId);
|
||||
if (room == null) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: Text(L10n.of(context).oopsSomethingWentWrong),
|
||||
),
|
||||
appBar: AppBar(title: Text(L10n.of(context).oopsSomethingWentWrong)),
|
||||
body: Center(
|
||||
child: Text(L10n.of(context).youAreNoLongerParticipatingInThisChat),
|
||||
),
|
||||
|
|
@ -32,7 +31,8 @@ class ChatMembersView extends StatelessWidget {
|
|||
|
||||
final members = controller.filteredMembers;
|
||||
|
||||
final roomCount = (room.summary.mJoinedMemberCount ?? 0) +
|
||||
final roomCount =
|
||||
(room.summary.mJoinedMemberCount ?? 0) +
|
||||
(room.summary.mInvitedMemberCount ?? 0);
|
||||
|
||||
final error = controller.error;
|
||||
|
|
@ -41,16 +41,12 @@ class ChatMembersView extends StatelessWidget {
|
|||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
leading: const Center(child: BackButton()),
|
||||
title: Text(
|
||||
L10n.of(context).countParticipants(roomCount),
|
||||
),
|
||||
title: Text(L10n.of(context).countParticipants(roomCount)),
|
||||
actions: [
|
||||
if (room.canInvite)
|
||||
IconButton(
|
||||
onPressed: () => context.go('/rooms/${room.id}/invite'),
|
||||
icon: const Icon(
|
||||
Icons.person_add_outlined,
|
||||
),
|
||||
icon: const Icon(Icons.person_add_outlined),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
@ -62,7 +58,7 @@ class ChatMembersView extends StatelessWidget {
|
|||
child: Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
mainAxisSize: .min,
|
||||
children: [
|
||||
const Icon(Icons.error_outline),
|
||||
Text(error.toLocalizedString(context)),
|
||||
|
|
@ -77,120 +73,117 @@ class ChatMembersView extends StatelessWidget {
|
|||
),
|
||||
)
|
||||
: members == null
|
||||
? const Center(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(16.0),
|
||||
child: CircularProgressIndicator.adaptive(),
|
||||
),
|
||||
)
|
||||
: ListView.builder(
|
||||
shrinkWrap: true,
|
||||
itemCount: members.length + 1,
|
||||
itemBuilder: (context, i) {
|
||||
if (i == 0) {
|
||||
final availableFilters = Membership.values
|
||||
.where(
|
||||
(membership) =>
|
||||
controller.members?.any(
|
||||
(member) => member.membership == membership,
|
||||
) ??
|
||||
false,
|
||||
)
|
||||
.toList();
|
||||
availableFilters
|
||||
.sort((a, b) => a == Membership.join ? -1 : 1);
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: TextField(
|
||||
controller: controller.filterController,
|
||||
onChanged: controller.setFilter,
|
||||
decoration: InputDecoration(
|
||||
filled: true,
|
||||
fillColor:
|
||||
theme.colorScheme.secondaryContainer,
|
||||
border: OutlineInputBorder(
|
||||
borderSide: BorderSide.none,
|
||||
borderRadius: BorderRadius.circular(99),
|
||||
),
|
||||
hintStyle: TextStyle(
|
||||
color: theme.colorScheme.onPrimaryContainer,
|
||||
fontWeight: FontWeight.normal,
|
||||
),
|
||||
prefixIcon: const Icon(Icons.search_outlined),
|
||||
hintText: L10n.of(context).search,
|
||||
? const Center(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.all(16.0),
|
||||
child: CircularProgressIndicator.adaptive(),
|
||||
),
|
||||
)
|
||||
: ListView.builder(
|
||||
shrinkWrap: true,
|
||||
itemCount: members.length + 1,
|
||||
itemBuilder: (context, i) {
|
||||
if (i == 0) {
|
||||
final availableFilters = Membership.values
|
||||
.where(
|
||||
(membership) =>
|
||||
controller.members?.any(
|
||||
(member) => member.membership == membership,
|
||||
) ??
|
||||
false,
|
||||
)
|
||||
.toList();
|
||||
availableFilters.sort(
|
||||
(a, b) => a == Membership.join ? -1 : 1,
|
||||
);
|
||||
return Column(
|
||||
mainAxisSize: .min,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: TextField(
|
||||
controller: controller.filterController,
|
||||
onChanged: controller.setFilter,
|
||||
decoration: InputDecoration(
|
||||
filled: true,
|
||||
fillColor: theme.colorScheme.secondaryContainer,
|
||||
border: OutlineInputBorder(
|
||||
borderSide: BorderSide.none,
|
||||
borderRadius: BorderRadius.circular(99),
|
||||
),
|
||||
hintStyle: TextStyle(
|
||||
color: theme.colorScheme.onPrimaryContainer,
|
||||
fontWeight: FontWeight.normal,
|
||||
),
|
||||
prefixIcon: const Icon(Icons.search_outlined),
|
||||
hintText: L10n.of(context).search,
|
||||
),
|
||||
),
|
||||
),
|
||||
if (availableFilters.length > 1)
|
||||
SizedBox(
|
||||
height: 64,
|
||||
child: ListView.builder(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 12.0,
|
||||
vertical: 12.0,
|
||||
),
|
||||
scrollDirection: Axis.horizontal,
|
||||
itemCount: availableFilters.length,
|
||||
itemBuilder: (context, i) => Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 4.0,
|
||||
),
|
||||
child: FilterChip(
|
||||
label: Text(switch (availableFilters[i]) {
|
||||
Membership.ban => L10n.of(context).banned,
|
||||
Membership.invite =>
|
||||
L10n.of(context).countInvited(
|
||||
room.summary.mInvitedMemberCount ??
|
||||
controller.members
|
||||
?.where(
|
||||
(member) =>
|
||||
member.membership ==
|
||||
Membership.invite,
|
||||
)
|
||||
.length ??
|
||||
0,
|
||||
),
|
||||
Membership.join =>
|
||||
L10n.of(context).countParticipants(
|
||||
room.summary.mJoinedMemberCount ??
|
||||
controller.members
|
||||
?.where(
|
||||
(member) =>
|
||||
member.membership ==
|
||||
Membership.join,
|
||||
)
|
||||
.length ??
|
||||
0,
|
||||
),
|
||||
Membership.knock => L10n.of(
|
||||
context,
|
||||
).knocking,
|
||||
Membership.leave => L10n.of(
|
||||
context,
|
||||
).leftTheChat,
|
||||
}),
|
||||
selected:
|
||||
controller.membershipFilter ==
|
||||
availableFilters[i],
|
||||
onSelected: (_) => controller
|
||||
.setMembershipFilter(availableFilters[i]),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (availableFilters.length > 1)
|
||||
SizedBox(
|
||||
height: 64,
|
||||
child: ListView.builder(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 12.0,
|
||||
vertical: 12.0,
|
||||
),
|
||||
scrollDirection: Axis.horizontal,
|
||||
itemCount: availableFilters.length,
|
||||
itemBuilder: (context, i) => Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 4.0,
|
||||
),
|
||||
child: FilterChip(
|
||||
label: Text(
|
||||
switch (availableFilters[i]) {
|
||||
Membership.ban =>
|
||||
L10n.of(context).banned,
|
||||
Membership.invite =>
|
||||
L10n.of(context).countInvited(
|
||||
room.summary
|
||||
.mInvitedMemberCount ??
|
||||
controller.members
|
||||
?.where(
|
||||
(member) =>
|
||||
member.membership ==
|
||||
Membership.invite,
|
||||
)
|
||||
.length ??
|
||||
0,
|
||||
),
|
||||
Membership.join =>
|
||||
L10n.of(context).countParticipants(
|
||||
room.summary.mJoinedMemberCount ??
|
||||
controller.members
|
||||
?.where(
|
||||
(member) =>
|
||||
member.membership ==
|
||||
Membership.join,
|
||||
)
|
||||
.length ??
|
||||
0,
|
||||
),
|
||||
Membership.knock =>
|
||||
L10n.of(context).knocking,
|
||||
Membership.leave =>
|
||||
L10n.of(context).leftTheChat,
|
||||
},
|
||||
),
|
||||
selected: controller.membershipFilter ==
|
||||
availableFilters[i],
|
||||
onSelected: (_) =>
|
||||
controller.setMembershipFilter(
|
||||
availableFilters[i],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
i--;
|
||||
return ParticipantListItem(members[i]);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
i--;
|
||||
return ParticipantListItem(members[i]);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue