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

design: Big redesign of three column mode to advanced two column mode

Browse source
This commit is contained in:
krille-chan 2023-08-12 11:52:20 +02:00
commit 9e13bd8dfd
No known key found for this signature in database
24 changed files with 938 additions and 765 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/pages/invitation_selection/invitation_selection.dart
View file

@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/pages/invitation_selection/invitation_selection_view.dart';
@ -14,7 +13,11 @@ import 'package:fluffychat/widgets/matrix.dart';
import '../../utils/localized_exception_extension.dart';
class InvitationSelection extends StatefulWidget {
const InvitationSelection({Key? key}) : super(key: key);
final String roomId;
const InvitationSelection({
Key? key,
required this.roomId,
}) : super(key: key);
@override
InvitationSelectionController createState() =>
@ -28,7 +31,7 @@ class InvitationSelectionController extends State<InvitationSelection> {
List<Profile> foundProfiles = [];
Timer? coolDown;
String? get roomId => GoRouterState.of(context).pathParameters['roomid'];
String? get roomId => widget.roomId;
Future<List<User>> getContacts(BuildContext context) async {
final client = Matrix.of(context).client;
@ -37,12 +40,10 @@ class InvitationSelectionController extends State<InvitationSelection> {
participants.removeWhere(
(u) => ![Membership.join, Membership.invite].contains(u.membership),
);
final participantsIds = participants.map((p) => p.stateKey).toList();
final contacts = client.rooms
.where((r) => r.isDirectChat)
.map((r) => r.unsafeGetUserFromMemoryOrFallback(r.directChatMatrixID!))
.toList()
..removeWhere((u) => participantsIds.contains(u.stateKey));
.toList();
contacts.sort(
(a, b) => a.calcDisplayname().toLowerCase().compareTo(
b.calcDisplayname().toLowerCase(),
@ -51,17 +52,19 @@ class InvitationSelectionController extends State<InvitationSelection> {
return contacts;
}
void inviteAction(BuildContext context, String id) async {
void inviteAction(BuildContext context, String id, String displayname) async {
final room = Matrix.of(context).client.getRoomById(roomId!)!;
if (OkCancelResult.ok !=
await showOkCancelAlertDialog(
context: context,
title: L10n.of(context)!.inviteContactToGroup(
title: L10n.of(context)!.inviteContact,
message: L10n.of(context)!.inviteContactToGroupQuestion(
displayname,
room.getLocalizedDisplayname(
MatrixLocals(L10n.of(context)!),
),
),
okLabel: L10n.of(context)!.yes,
okLabel: L10n.of(context)!.invite,
cancelLabel: L10n.of(context)!.cancel,
)) {
return;
@ -118,19 +121,6 @@ class InvitationSelectionController extends State<InvitationSelection> {
],
);
}
final participants = Matrix.of(context)
.client
.getRoomById(roomId!)!
.getParticipants()
.where(
(user) =>
[Membership.join, Membership.invite].contains(user.membership),
)
.toList();
foundProfiles.removeWhere(
(profile) =>
participants.indexWhere((u) => u.id == profile.userId) != -1,
);
});
}

231
lib/pages/invitation_selection/invitation_selection_view.dart
View file

@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart';
@ -20,104 +19,152 @@ class InvitationSelectionView extends StatelessWidget {
final groupName = room.name.isEmpty ? L10n.of(context)!.group : room.name;
return Scaffold(
appBar: AppBar(
leading: GoRouterState.of(context).uri.path.startsWith('/spaces/')
? null
: IconButton(
icon: const Icon(Icons.close_outlined),
onPressed: () =>
context.go(['', 'rooms', controller.roomId!].join('/')),
),
leading: const Center(child: BackButton()),
titleSpacing: 0,
title: SizedBox(
height: 44,
child: Padding(
padding: const EdgeInsets.only(right: 12.0),
child: TextField(
textInputAction: TextInputAction.search,
decoration: InputDecoration(
hintText: L10n.of(context)!.inviteContactToGroup(groupName),
suffixIcon: controller.loading
? const Padding(
padding: EdgeInsets.symmetric(
vertical: 10.0,
horizontal: 12,
),
child: SizedBox.square(
dimension: 24,
child: CircularProgressIndicator.adaptive(
strokeWidth: 2,
title: Text(L10n.of(context)!.inviteContact),
),
body: MaxWidthBody(
child: Column(
children: [
Padding(
padding: const EdgeInsets.all(16.0),
child: TextField(
textInputAction: TextInputAction.search,
decoration: InputDecoration(
hintText: L10n.of(context)!.inviteContactToGroup(groupName),
prefixIcon: controller.loading
? const Padding(
padding: EdgeInsets.symmetric(
vertical: 10.0,
horizontal: 12,
),
child: SizedBox.square(
dimension: 24,
child: CircularProgressIndicator.adaptive(
strokeWidth: 2,
),
),
)
: const Icon(Icons.search_outlined),
),
onChanged: controller.searchUserWithCoolDown,
),
),
StreamBuilder<Object>(
stream: room.onUpdate.stream,
builder: (context, snapshot) {
final participants =
room.getParticipants().map((user) => user.id).toSet();
return controller.foundProfiles.isNotEmpty
? ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: controller.foundProfiles.length,
itemBuilder: (BuildContext context, int i) =>
_InviteContactListTile(
avatarUrl: controller.foundProfiles[i].avatarUrl,
displayname: controller
.foundProfiles[i].displayName ??
controller.foundProfiles[i].userId.localpart ??
L10n.of(context)!.user,
userId: controller.foundProfiles[i].userId,
isMember: participants
.contains(controller.foundProfiles[i].userId),
onTap: () => controller.inviteAction(
context,
controller.foundProfiles[i].userId,
controller.foundProfiles[i].displayName ??
controller.foundProfiles[i].userId.localpart ??
L10n.of(context)!.user,
),
),
)
: const Icon(Icons.search_outlined),
),
onChanged: controller.searchUserWithCoolDown,
: FutureBuilder<List<User>>(
future: controller.getContacts(context),
builder: (BuildContext context, snapshot) {
if (!snapshot.hasData) {
return const Center(
child: CircularProgressIndicator.adaptive(
strokeWidth: 2,
),
);
}
final contacts = snapshot.data!;
return ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: contacts.length,
itemBuilder: (BuildContext context, int i) =>
_InviteContactListTile(
avatarUrl: contacts[i].avatarUrl,
displayname: contacts[i].displayName ??
contacts[i].id.localpart ??
L10n.of(context)!.user,
userId: contacts[i].id,
isMember: participants.contains(contacts[i].id),
onTap: () => controller.inviteAction(
context,
contacts[i].id,
contacts[i].displayName ??
contacts[i].id.localpart ??
L10n.of(context)!.user,
),
),
);
},
);
},
),
),
],
),
),
body: MaxWidthBody(
withScrolling: true,
child: controller.foundProfiles.isNotEmpty
? ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: controller.foundProfiles.length,
itemBuilder: (BuildContext context, int i) => ListTile(
leading: Avatar(
mxContent: controller.foundProfiles[i].avatarUrl,
name: controller.foundProfiles[i].displayName ??
controller.foundProfiles[i].userId,
),
title: Text(
controller.foundProfiles[i].displayName ??
controller.foundProfiles[i].userId.localpart!,
),
subtitle: Text(controller.foundProfiles[i].userId),
onTap: () => controller.inviteAction(
context,
controller.foundProfiles[i].userId,
),
),
)
: FutureBuilder<List<User>>(
future: controller.getContacts(context),
builder: (BuildContext context, snapshot) {
if (!snapshot.hasData) {
return const Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2),
);
}
final contacts = snapshot.data!;
return ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: contacts.length,
itemBuilder: (BuildContext context, int i) => ListTile(
leading: Avatar(
mxContent: contacts[i].avatarUrl,
name: contacts[i].calcDisplayname(),
),
title: Text(
contacts[i].calcDisplayname(),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
subtitle: Text(
contacts[i].id,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Theme.of(context).colorScheme.secondary,
),
),
onTap: () =>
controller.inviteAction(context, contacts[i].id),
),
);
},
),
),
);
}
}
class _InviteContactListTile extends StatelessWidget {
final String userId;
final String displayname;
final Uri? avatarUrl;
final bool isMember;
final void Function() onTap;
const _InviteContactListTile({
Key? key,
required this.userId,
required this.displayname,
required this.avatarUrl,
required this.isMember,
required this.onTap,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return Opacity(
opacity: isMember ? 0.5 : 1,
child: ListTile(
leading: Avatar(
mxContent: avatarUrl,
name: displayname,
),
title: Text(
displayname,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
subtitle: Text(
userId,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Theme.of(context).colorScheme.secondary,
),
),
onTap: isMember ? null : onTap,
trailing: isMember
? Text(L10n.of(context)!.participant)
: const Icon(Icons.person_add_outlined),
),
);
}
}