Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Refactor participant roster handling and sorting logic

AmanRajSinghMouryaca23f518a014
diff --git a/mobile/apps/photos/lib/ui/sharing/album_participants_page.dart b/mobile/apps/photos/lib/ui/sharing/album_participants_page.dart
index 3af5023137..01c6b7294c 100644
--- a/mobile/apps/photos/lib/ui/sharing/album_participants_page.dart
+++ b/mobile/apps/photos/lib/ui/sharing/album_participants_page.dart
@@ -31,7 +31,6 @@ class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
late final int currentUserID;
late Collection _collection;
final GlobalKey _sendLinkButtonKey = GlobalKey();
- final ScrollController _rosterScrollController = ScrollController();
@override
void initState() {
@@ -41,12 +40,6 @@ class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
_refreshCollection();
}
- @override
- void dispose() {
- _rosterScrollController.dispose();
- super.dispose();
- }
-
Future<void> _refreshCollection() async {
try {
final latest = await collectionsService.fetchCollectionByID(
@@ -107,15 +100,7 @@ class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
if (owner.id == currentUserID && owner.email.isEmpty) {
owner.email = Configuration.instance.getEmail()!;
}
- final sortedSharees = List<User>.from(_collection.sharees)
- ..sort((a, b) {
- final rankComparison = sharingRoleRank(
- _collection.getRole(a.id),
- ).compareTo(sharingRoleRank(_collection.getRole(b.id)));
- return rankComparison != 0
- ? rankComparison
- : a.email.toLowerCase().compareTo(b.email.toLowerCase());
- });
+ final sortedSharees = sortedCollectionSharees(_collection);
final participantRows = <Widget>[
ParticipantRow(
user: owner,
@@ -140,10 +125,7 @@ class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
];
final children = <Widget>[
ShareSectionTitle(context.strings.sharedWith),
- ScrollableParticipantRoster(
- rows: participantRows,
- scrollController: _rosterScrollController,
- ),
+ ScrollableParticipantRoster(rows: participantRows),
if (isAdmin && _collection.type != CollectionType.uncategorized) ...[
const SizedBox(height: Spacing.sm),
ButtonComponent(
diff --git a/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart b/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart
index 76fc88c3b6..657c5f7f4e 100644
--- a/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart
+++ b/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart
@@ -30,12 +30,10 @@ class ShareCollectionPage extends StatefulWidget {
class _ShareCollectionPageState extends State<ShareCollectionPage> {
late Collection _collection;
- late List<User> _sharees;
final CollectionActions collectionActions = CollectionActions(
CollectionsService.instance,
);
final GlobalKey sendLinkButtonKey = GlobalKey();
- final ScrollController _rosterScrollController = ScrollController();
bool _redirectedToParticipants = false;
@override
@@ -44,12 +42,6 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
_collection = widget.collection;
}
- @override
- void dispose() {
- _rosterScrollController.dispose();
- super.dispose();
- }
-
Future<void> _refreshCollection() async {
try {
final latest = await CollectionsService.instance.fetchCollectionByID(
@@ -92,21 +84,12 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
}
}
- _sharees = _collection.sharees;
final bool hasUrl = _collection.hasLink;
final bool isOwner = _collection.owner.id == userID;
if (isOwner && _collection.owner.email.isEmpty) {
_collection.owner.email = Configuration.instance.getEmail() ?? "";
}
- final sortedSharees = List<User>.from(_sharees)
- ..sort((a, b) {
- final rankComparison = sharingRoleRank(
- _collection.getRole(a.id),
- ).compareTo(sharingRoleRank(_collection.getRole(b.id)));
- return rankComparison != 0
- ? rankComparison
- : a.email.toLowerCase().compareTo(b.email.toLowerCase());
- });
+ final sortedSharees = sortedCollectionSharees(_collection);
final children = <Widget>[ShareSectionTitle(context.strings.sharedWith)];
if (isOwner) {
@@ -226,9 +209,6 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
onCollectionChanged: () => setState(() {}),
),
];
- return ScrollableParticipantRoster(
- rows: rows,
- scrollController: _rosterScrollController,
- );
+ return ScrollableParticipantRoster(rows: rows);
}
}
diff --git a/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart b/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart
index d0191a2155..7c04c9b59c 100644
--- a/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart
+++ b/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart
@@ -11,30 +11,40 @@ import "package:photos/ui/sharing/share_components.dart";
import "package:photos/ui/sharing/user_avator_widget.dart";
import "package:photos/ui/sharing/widgets/sharing_role.dart";
-class ScrollableParticipantRoster extends StatelessWidget {
- const ScrollableParticipantRoster({
- super.key,
- required this.rows,
- required this.scrollController,
- });
+class ScrollableParticipantRoster extends StatefulWidget {
+ const ScrollableParticipantRoster({super.key, required this.rows});
final List<Widget> rows;
- final ScrollController scrollController;
+
+ @override
+ State<ScrollableParticipantRoster> createState() =>
+ _ScrollableParticipantRosterState();
+}
+
+class _ScrollableParticipantRosterState
+ extends State<ScrollableParticipantRoster> {
+ final _scrollController = ScrollController();
+
+ @override
+ void dispose() {
+ _scrollController.dispose();
+ super.dispose();
+ }
@override
Widget build(BuildContext context) {
const maxVisibleRows = 3;
- final visibleRows = math.min(rows.length, maxVisibleRows);
+ final visibleRows = math.min(widget.rows.length, maxVisibleRows);
final viewportHeight = _groupHeight(context, visibleRows);
- final showScrollbar = rows.length > maxVisibleRows;
+ final showScrollbar = widget.rows.length > maxVisibleRows;
final roster = ClipRRect(
key: const ValueKey("participant-roster-clip"),
borderRadius: BorderRadius.circular(Radii.button),
child: SingleChildScrollView(
key: const ValueKey("participant-roster-scroll"),
- controller: scrollController,
+ controller: _scrollController,
primary: false,
- child: ShareMenuGroup(items: rows),
+ child: ShareMenuGroup(items: widget.rows),
),
);
return SizedBox(
@@ -42,7 +52,7 @@ class ScrollableParticipantRoster extends StatelessWidget {
child: showScrollbar
? RawScrollbar(
key: const ValueKey("participant-roster-scrollbar"),
- controller: scrollController,
+ controller: _scrollController,
thumbVisibility: true,
trackVisibility: true,
interactive: true,
diff --git a/mobile/apps/photos/lib/ui/sharing/widgets/sharing_role.dart b/mobile/apps/photos/lib/ui/sharing/widgets/sharing_role.dart
index 5c5ba0f698..d3fe1a7761 100644
--- a/mobile/apps/photos/lib/ui/sharing/widgets/sharing_role.dart
+++ b/mobile/apps/photos/lib/ui/sharing/widgets/sharing_role.dart
@@ -1,4 +1,5 @@
import "package:hugeicons/hugeicons.dart";
+import "package:photos/models/api/collection/user.dart";
import "package:photos/models/collection/collection.dart";
List<List<dynamic>> sharingRoleIcon(CollectionParticipantRole role) {
@@ -19,3 +20,16 @@ int sharingRoleRank(CollectionParticipantRole role) {
CollectionParticipantRole.viewer || CollectionParticipantRole.unknown => 2,
};
}
+
+List<User> sortedCollectionSharees(Collection collection) {
+ final sharees = List<User>.from(collection.sharees);
+ sharees.sort((a, b) {
+ final rankComparison = sharingRoleRank(
+ collection.getRole(a.id),
+ ).compareTo(sharingRoleRank(collection.getRole(b.id)));
+ return rankComparison != 0
+ ? rankComparison
+ : a.email.toLowerCase().compareTo(b.email.toLowerCase());
+ });
+ return sharees;
+}