Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mob][locker] Lazily build sharing menu items

AmanRajSinghMourya68b8ded7342b
diff --git a/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart b/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart
index 896f602be2..17d50949ce 100644
--- a/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart
+++ b/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart
@@ -154,48 +154,56 @@ class _AddEmailSheetState extends State<AddEmailSheet> {
Expanded(
child: ClipRRect(
borderRadius: BorderRadius.circular(20),
- child: Container(
+ child: ConstrainedBox(
constraints: const BoxConstraints(
maxHeight: maxVisibleHeight,
),
- child: ListView(
+ child: ListView.separated(
controller: _scrollController,
shrinkWrap: true,
padding: EdgeInsets.zero,
- children: [
- MenuGroupComponent(
- backgroundColor: colors.fillLight,
- showDividers: true,
- dividerPadding: const EdgeInsets.only(left: 48),
- items: filteredUsers
- .map(
- (user) => MenuComponent(
- title: user.resolvedDisplayName,
- leading: UserAvatarWidget.suggestion(
- user,
- type: AvatarType.mini,
- config: Configuration.instance,
- ),
- onTap: () async {
- _textFieldFocusNode.unfocus();
- _textController.text = user.email;
- _email = user.email;
- _emailIsValid = true;
- setState(() {});
- },
- onLongPress: () {
- showVerifyIdentitySheet(
- context,
- self: false,
- config: Configuration.instance,
- email: user.email,
- );
- },
- ),
- )
- .toList(),
+ itemCount: filteredUsers.length,
+ separatorBuilder: (_, _) => ColoredBox(
+ color: colors.fillLight,
+ child: const DividerComponent(
+ padding: EdgeInsets.only(left: 48),
),
- ],
+ ),
+ itemBuilder: (context, index) {
+ final user = filteredUsers[index];
+ return MenuGroupComponent(
+ backgroundColor: colors.fillLight,
+ borderRadius: MenuGroupComponent.itemBorderRadius(
+ index: index,
+ itemCount: filteredUsers.length,
+ ),
+ items: [
+ MenuComponent(
+ title: user.resolvedDisplayName,
+ leading: UserAvatarWidget.suggestion(
+ user,
+ type: AvatarType.mini,
+ config: Configuration.instance,
+ ),
+ onTap: () async {
+ _textFieldFocusNode.unfocus();
+ _textController.text = user.email;
+ _email = user.email;
+ _emailIsValid = true;
+ setState(() {});
+ },
+ onLongPress: () {
+ showVerifyIdentitySheet(
+ context,
+ self: false,
+ config: Configuration.instance,
+ email: user.email,
+ );
+ },
+ ),
+ ],
+ );
+ },
),
),
),
diff --git a/mobile/apps/locker/lib/ui/sharing/share_collection_bottom_sheet.dart b/mobile/apps/locker/lib/ui/sharing/share_collection_bottom_sheet.dart
index 389f3f6ce5..07e61636ef 100644
--- a/mobile/apps/locker/lib/ui/sharing/share_collection_bottom_sheet.dart
+++ b/mobile/apps/locker/lib/ui/sharing/share_collection_bottom_sheet.dart
@@ -113,20 +113,30 @@ class _ShareCollectionSheetState extends State<ShareCollectionSheet> {
borderRadius: BorderRadius.circular(20),
child: ConstrainedBox(
constraints: const BoxConstraints(maxHeight: maxVisibleHeight),
- child: ListView(
+ child: ListView.separated(
controller: _scrollController,
shrinkWrap: true,
padding: EdgeInsets.zero,
- children: [
- MenuGroupComponent(
+ itemCount: allUsers.length,
+ separatorBuilder: (_, _) => ColoredBox(
+ color: colors.fillLight,
+ child: const DividerComponent(
+ padding: EdgeInsets.only(left: 48),
+ ),
+ ),
+ itemBuilder: (context, index) {
+ final user = allUsers[index];
+ final role = CollectionParticipantRoleExtn.fromString(
+ user.role,
+ );
+ return MenuGroupComponent(
backgroundColor: colors.fillLight,
- showDividers: true,
- dividerPadding: const EdgeInsets.only(left: 48),
- items: allUsers.map((user) {
- final role = CollectionParticipantRoleExtn.fromString(
- user.role,
- );
- return MenuComponent(
+ borderRadius: MenuGroupComponent.itemBorderRadius(
+ index: index,
+ itemCount: allUsers.length,
+ ),
+ items: [
+ MenuComponent(
title: user.email,
leading: UserAvatarWidget(
user,
@@ -136,10 +146,10 @@ class _ShareCollectionSheetState extends State<ShareCollectionSheet> {
trailing: _isOwner
? _buildRolePopupMenu(user)
: _buildRoleIcon(role),
- );
- }).toList(),
- ),
- ],
+ ),
+ ],
+ );
+ },
),
),
),