Skip to content

armgit / ente

Public Imported from GitHub
0

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

Keep family member details consistent

Neeraj Gupta071f118817d2
diff --git a/mobile/apps/photos/lib/ui/family/family_dashboard.dart b/mobile/apps/photos/lib/ui/family/family_dashboard.dart
index 614a4fa322..51c380cf14 100644
--- a/mobile/apps/photos/lib/ui/family/family_dashboard.dart
+++ b/mobile/apps/photos/lib/ui/family/family_dashboard.dart
@@ -19,6 +19,20 @@ enum FamilyMemberAction {
revokeInvite,
}
+AvatarComponentColor familyMemberAvatarComponentColor(
+ FamilyMember member, {
+ required String currentUserEmail,
+}) {
+ return avatarComponentColorForAvatarIdentity(
+ AvatarIdentity.account(
+ label: member.email,
+ email: member.email,
+ userID: member.userID,
+ currentUserEmail: currentUserEmail,
+ ),
+ );
+}
+
List<FamilyMemberAction> familyMemberActions({
required bool isAdmin,
required bool isCurrentUser,
@@ -90,6 +104,7 @@ class FamilyDashboard extends StatelessWidget {
userDetails: userDetails,
members: activeMembers,
labelFor: _storageLabelFor,
+ avatarColorFor: _avatarColorFor,
),
const SizedBox(height: Spacing.xl),
Text(l10n.members, style: TextStyles.h2),
@@ -103,6 +118,7 @@ class FamilyDashboard extends StatelessWidget {
profilePictureBytes: profilePictureBytesByUserId[member.userID],
linkedPersonId: linkedPersonIdsByUserId[member.userID],
hasSavedContact: contactsByUserId[member.userID] != null,
+ avatarColor: _avatarColorFor(member),
onTap: () => onMemberTap(member),
),
if (index < members.length - 1) const SizedBox(height: Spacing.sm),
@@ -137,6 +153,12 @@ class FamilyDashboard extends StatelessWidget {
final savedName = contactsByUserId[member.userID]?.data?.name.trim();
return savedName == null || savedName.isEmpty ? null : savedName;
}
+
+ AvatarComponentColor _avatarColorFor(FamilyMember member) =>
+ familyMemberAvatarComponentColor(
+ member,
+ currentUserEmail: userDetails.email,
+ );
}
class _FamilyStorageCard extends StatelessWidget {
@@ -144,11 +166,13 @@ class _FamilyStorageCard extends StatelessWidget {
required this.userDetails,
required this.members,
required this.labelFor,
+ required this.avatarColorFor,
});
final UserDetails userDetails;
final List<FamilyMember> members;
final String Function(FamilyMember member) labelFor;
+ final AvatarComponentColor Function(FamilyMember member) avatarColorFor;
@override
Widget build(BuildContext context) {
@@ -157,6 +181,8 @@ class _FamilyStorageCard extends StatelessWidget {
final totalStorage = userDetails.getTotalStorage();
final totalUsed =
userDetails.familyData?.getTotalUsage() ?? userDetails.usage;
+ Color memberColor(FamilyMember member) =>
+ avatarComponentColorValue(context, avatarColorFor(member));
return DecoratedBox(
decoration: BoxDecoration(
@@ -184,7 +210,11 @@ class _FamilyStorageCard extends StatelessWidget {
],
),
const SizedBox(height: Spacing.md),
- _StorageBar(members: members, totalStorage: totalStorage),
+ _StorageBar(
+ members: members,
+ totalStorage: totalStorage,
+ colorFor: memberColor,
+ ),
const SizedBox(height: Spacing.sm),
Wrap(
spacing: 10,
@@ -192,7 +222,7 @@ class _FamilyStorageCard extends StatelessWidget {
children: [
for (final member in members)
_StorageLegend(
- color: _memberColor(context, member),
+ color: memberColor(member),
label: labelFor(member),
),
],
@@ -205,10 +235,15 @@ class _FamilyStorageCard extends StatelessWidget {
}
class _StorageBar extends StatelessWidget {
- const _StorageBar({required this.members, required this.totalStorage});
+ const _StorageBar({
+ required this.members,
+ required this.totalStorage,
+ required this.colorFor,
+ });
final List<FamilyMember> members;
final int totalStorage;
+ final Color Function(FamilyMember member) colorFor;
@override
Widget build(BuildContext context) {
@@ -235,7 +270,7 @@ class _StorageBar extends StatelessWidget {
width: visibleWidth,
height: 5,
decoration: BoxDecoration(
- color: _memberColor(context, member),
+ color: colorFor(member),
borderRadius: BorderRadius.circular(16),
),
),
@@ -296,6 +331,7 @@ class _FamilyMemberRow extends StatelessWidget {
required this.profilePictureBytes,
required this.linkedPersonId,
required this.hasSavedContact,
+ required this.avatarColor,
required this.onTap,
});
@@ -306,6 +342,7 @@ class _FamilyMemberRow extends StatelessWidget {
final Uint8List? profilePictureBytes;
final String? linkedPersonId;
final bool hasSavedContact;
+ final AvatarComponentColor avatarColor;
final VoidCallback onTap;
@override
@@ -333,6 +370,7 @@ class _FamilyMemberRow extends StatelessWidget {
displayName: displayName,
profilePictureBytes: profilePictureBytes,
linkedPersonId: linkedPersonId,
+ avatarColor: avatarColor,
),
trailing: isInteractive
? const Icon(Icons.chevron_right_rounded, size: IconSizes.medium)
@@ -347,12 +385,14 @@ class _MemberAvatar extends StatelessWidget {
required this.displayName,
required this.profilePictureBytes,
required this.linkedPersonId,
+ required this.avatarColor,
});
final FamilyMember member;
final String displayName;
final Uint8List? profilePictureBytes;
final String? linkedPersonId;
+ final AvatarComponentColor avatarColor;
@override
Widget build(BuildContext context) {
@@ -381,7 +421,7 @@ class _MemberAvatar extends StatelessWidget {
)
: AvatarComponent(
initials: _initials(displayName),
- color: _memberAvatarColor(member),
+ color: avatarColor,
size: AvatarComponentSize.large,
semanticLabel: displayName,
);
@@ -397,10 +437,15 @@ class _MemberAvatar extends StatelessWidget {
Positioned(
right: -4,
bottom: -4,
- child: HugeIcon(
- icon: HugeIcons.strokeRoundedCrown02,
- color: context.componentColors.primary,
- size: IconSizes.small,
+ child: Semantics(
+ label: AppLocalizations.of(context).admin,
+ child: ExcludeSemantics(
+ child: HugeIcon(
+ icon: HugeIcons.strokeRoundedCrown02,
+ color: context.componentColors.primary,
+ size: IconSizes.small,
+ ),
+ ),
),
),
],
@@ -408,16 +453,6 @@ class _MemberAvatar extends StatelessWidget {
}
}
-Color _memberColor(BuildContext context, FamilyMember member) {
- return avatarComponentColorValue(context, _memberAvatarColor(member));
-}
-
-AvatarComponentColor _memberAvatarColor(FamilyMember member) {
- return avatarComponentColorForIdentity(
- avatarIdentityKey(email: member.email, userID: member.userID),
- );
-}
-
String _initials(String value) {
final words = value
.trim()
diff --git a/mobile/apps/photos/lib/ui/family/family_plan_page.dart b/mobile/apps/photos/lib/ui/family/family_plan_page.dart
index 9ab40ee110..db57c24635 100644
--- a/mobile/apps/photos/lib/ui/family/family_plan_page.dart
+++ b/mobile/apps/photos/lib/ui/family/family_plan_page.dart
@@ -9,6 +9,7 @@ import 'package:ente_pure_utils/ente_pure_utils.dart';
import 'package:flutter/material.dart';
import 'package:hugeicons/hugeicons.dart';
import 'package:photos/core/event_bus.dart';
+import 'package:photos/events/contacts_changed_event.dart';
import 'package:photos/events/people_changed_event.dart';
import 'package:photos/gateways/billing/models/billing_plan.dart';
import 'package:photos/gateways/billing/models/subscription.dart';
@@ -57,6 +58,8 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
final Map<int, Uint8List?> _profilePictureBytesByUserId = {};
String? _startingPrice;
bool _isRefreshing = false;
+ int _memberContactsLoadGeneration = 0;
+ StreamSubscription<ContactsChangedEvent>? _contactsChangedSubscription;
StreamSubscription<PeopleChangedEvent>? _peopleChangedSubscription;
bool get _isFreeUser =>
@@ -93,6 +96,9 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
unawaited(_refreshUserDetails());
}
unawaited(_loadMemberContacts());
+ _contactsChangedSubscription = Bus.instance
+ .on<ContactsChangedEvent>()
+ .listen(_onContactsChanged);
_peopleChangedSubscription = Bus.instance.on<PeopleChangedEvent>().listen((
_,
) {
@@ -107,10 +113,21 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
@override
void dispose() {
+ _contactsChangedSubscription?.cancel();
_peopleChangedSubscription?.cancel();
super.dispose();
}
+ void _onContactsChanged(ContactsChangedEvent event) {
+ if (!mounted || !_showsDashboard) {
+ return;
+ }
+ if (!_familyMemberUserIDs().any(event.matchesContactUserId)) {
+ return;
+ }
+ unawaited(_loadMemberContacts());
+ }
+
@override
Widget build(BuildContext context) {
final content = _showsAdminDashboard
@@ -124,6 +141,7 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
return FamilyPageScaffold(
title: _showsDashboard ? AppLocalizations.of(context).family : null,
actions: _showsDashboard ? [_buildDashboardOverflow(context)] : const [],
+ scrollable: _showsDashboard,
child: content,
);
}
@@ -548,7 +566,13 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
EditStorageLimitPage(
member: member,
totalStorageInBytes: _userDetails.getTotalStorage(),
- avatarColor: context.componentColors.primary,
+ avatarColor: avatarComponentColorValue(
+ context,
+ familyMemberAvatarComponentColor(
+ member,
+ currentUserEmail: _userDetails.email,
+ ),
+ ),
),
);
if (!mounted) {
@@ -631,14 +655,10 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
}
Future<void> _loadMemberContacts() async {
- final userIDs =
- _userDetails.familyData?.members
- ?.map((member) => member.userID)
- .whereType<int>()
- .toSet() ??
- const <int>{};
+ final generation = ++_memberContactsLoadGeneration;
+ final userIDs = _familyMemberUserIDs();
final resolvedContacts = await Future.wait(userIDs.map(_loadMemberContact));
- if (!mounted) {
+ if (!mounted || generation != _memberContactsLoadGeneration) {
return;
}
setState(() {
@@ -654,6 +674,13 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
});
}
+ Set<int> _familyMemberUserIDs() =>
+ _userDetails.familyData?.members
+ ?.map((member) => member.userID)
+ .whereType<int>()
+ .toSet() ??
+ const <int>{};
+
Future<_ResolvedMemberContact> _loadMemberContact(int userID) async {
final contact = await PhotosContactsService.instance.getContact(
contactUserId: userID,
diff --git a/mobile/apps/photos/test/ui/family/family_dashboard_test.dart b/mobile/apps/photos/test/ui/family/family_dashboard_test.dart
index 50a9125c35..f9b0020244 100644
--- a/mobile/apps/photos/test/ui/family/family_dashboard_test.dart
+++ b/mobile/apps/photos/test/ui/family/family_dashboard_test.dart
@@ -126,11 +126,39 @@ void main() {
);
});
+ group('familyMemberAvatarComponentColor', () {
+ test('uses black for the current user and hashes other members', () {
+ final currentUser = _member(email: '[email protected]', userID: 1);
+ final otherMember = _member(email: '[email protected]', userID: 42);
+
+ expect(
+ familyMemberAvatarComponentColor(
+ currentUser,
+ currentUserEmail: '[email protected]',
+ ),
+ AvatarComponentColor.black,
+ );
+ expect(
+ familyMemberAvatarComponentColor(
+ otherMember,
+ currentUserEmail: currentUser.email,
+ ),
+ avatarComponentColorForIdentity(
+ avatarIdentityKey(
+ email: otherMember.email,
+ userID: otherMember.userID,
+ ),
+ ),
+ );
+ });
+ });
+
testWidgets(
'renders saved contacts and no shared-album content at 375 pixels',
(tester) async {
await tester.binding.setSurfaceSize(const Size(375, 812));
addTearDown(() => tester.binding.setSurfaceSize(null));
+ final semantics = tester.ensureSemantics();
final savedMember = _member(email: '[email protected]', userID: 42);
final pendingMember = _member(
@@ -214,10 +242,15 @@ void main() {
AvatarComponentColor.purple,
AvatarComponentColor.blue,
AvatarComponentColor.cyan,
+ AvatarComponentColor.black,
]),
),
);
expect(avatars.map((avatar) => avatar.seed), everyElement(isNull));
+ final currentUserAvatar = avatars.singleWhere(
+ (avatar) => avatar.semanticLabel == '[email protected]',
+ );
+ expect(currentUserAvatar.color, AvatarComponentColor.black);
final savedMemberAvatar = avatars.singleWhere(
(avatar) => avatar.semanticLabel == 'Saved member',
);
@@ -236,6 +269,8 @@ void main() {
(icon) => identical(icon.icon, HugeIcons.strokeRoundedCrown02),
);
expect(crown.icon, HugeIcons.strokeRoundedCrown02);
+ expect(find.bySemanticsLabel(RegExp(r'Admin')), findsOneWidget);
+ semantics.dispose();
await tester.tap(find.byType(MenuComponent).at(1));
expect(selectedMember, same(savedMember));