π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Use identity colors in family storage
Neeraj Gupta7c557fb267d8
diff --git a/mobile/apps/photos/lib/ui/family/family_dashboard.dart b/mobile/apps/photos/lib/ui/family/family_dashboard.dartindex 953e7810c3..4bbe334ab9 100644--- a/mobile/apps/photos/lib/ui/family/family_dashboard.dart+++ b/mobile/apps/photos/lib/ui/family/family_dashboard.dart@@ -19,17 +19,9 @@ 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,- ),+AvatarComponentColor familyMemberAvatarComponentColor(FamilyMember member) {+ return avatarComponentColorForIdentity(+ avatarIdentityKey(email: member.email, userID: member.userID),);}@@ -177,10 +169,7 @@ class FamilyDashboard extends StatelessWidget {}AvatarComponentColor _avatarColorFor(FamilyMember member) =>- familyMemberAvatarComponentColor(- member,- currentUserEmail: userDetails.email,- );+ familyMemberAvatarComponentColor(member);}class _FamilyStorageCard extends StatelessWidget {diff --git a/mobile/apps/photos/lib/ui/family/family_plan_page.dart b/mobile/apps/photos/lib/ui/family/family_plan_page.dartindex ee047d2875..145c1f1fb0 100644--- a/mobile/apps/photos/lib/ui/family/family_plan_page.dart+++ b/mobile/apps/photos/lib/ui/family/family_plan_page.dart@@ -568,10 +568,7 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {totalStorageInBytes: _userDetails.getTotalStorage(),avatarColor: avatarComponentColorValue(context,- familyMemberAvatarComponentColor(- member,- currentUserEmail: _userDetails.email,- ),+ familyMemberAvatarComponentColor(member),),),);diff --git a/mobile/apps/photos/test/ui/family/family_dashboard_test.dart b/mobile/apps/photos/test/ui/family/family_dashboard_test.dartindex a1929df918..29fc7d67a3 100644--- a/mobile/apps/photos/test/ui/family/family_dashboard_test.dart+++ b/mobile/apps/photos/test/ui/family/family_dashboard_test.dart@@ -127,22 +127,21 @@ void main() {});group('familyMemberAvatarComponentColor', () {- test('uses black for the current user and hashes other members', () {+ test('hashes every member including the current user', () {final currentUser = _member(email: '[email protected]', userID: 1);final otherMember = _member(email: '[email protected]', userID: 42);expect(- familyMemberAvatarComponentColor(- currentUser,- currentUserEmail: '[email protected]',+ familyMemberAvatarComponentColor(currentUser),+ avatarComponentColorForIdentity(+ avatarIdentityKey(+ email: currentUser.email,+ userID: currentUser.userID,+ ),),- AvatarComponentColor.black,);expect(- familyMemberAvatarComponentColor(- otherMember,- currentUserEmail: currentUser.email,- ),+ familyMemberAvatarComponentColor(otherMember),avatarComponentColorForIdentity(avatarIdentityKey(email: otherMember.email,@@ -165,16 +164,13 @@ void main() {email: '[email protected]',status: FamilyMemberStatus.invited,);- final members = [- _member(- email: '[email protected]',- userID: 1,- isAdmin: true,- status: FamilyMemberStatus.self,- ),- savedMember,- pendingMember,- ];+ final currentUser = _member(+ email: '[email protected]',+ userID: 1,+ isAdmin: true,+ status: FamilyMemberStatus.self,+ );+ final members = [currentUser, savedMember, pendingMember];FamilyMember? selectedMember;await tester.pumpWidget(@@ -191,6 +187,7 @@ void main() {members: members,isAdmin: true,contactsByUserId: {+ 1: _contact(currentUser, name: 'Current user'),42: _contact(savedMember, name: 'Saved member'),},profilePictureBytesByUserId: const {},@@ -206,8 +203,7 @@ void main() {);await tester.pumpAndSettle();- expect(find.text('[email protected]'), findsOneWidget);- expect(find.text('admin'), findsOneWidget);+ expect(find.text('Current user'), findsWidgets);expect(find.text('Saved member'), findsNWidgets(2));expect(find.text('[email protected]'), findsOneWidget);expect(@@ -236,9 +232,9 @@ void main() {);expect(avatars.map((avatar) => avatar.seed), everyElement(isNull));final currentUserAvatar = avatars.singleWhere(- (avatar) => avatar.semanticLabel == '[email protected]',+ (avatar) => avatar.semanticLabel == 'Current user',);- expect(currentUserAvatar.color, AvatarComponentColor.black);+ expect(currentUserAvatar.color, isIn(avatarComponentIdentityPalette));final savedMemberAvatar = avatars.singleWhere((avatar) => avatar.semanticLabel == 'Saved member',);