Skip to content

armgit / ente

Public Imported from GitHub
0

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

Show family member names on storage limit page

Neeraj Gupta6eaa8a59003b
diff --git a/mobile/apps/photos/lib/ui/family/edit_storage_limit_page.dart b/mobile/apps/photos/lib/ui/family/edit_storage_limit_page.dart
index 0b6da47002..9ddeb91156 100644
--- a/mobile/apps/photos/lib/ui/family/edit_storage_limit_page.dart
+++ b/mobile/apps/photos/lib/ui/family/edit_storage_limit_page.dart
@@ -13,12 +13,14 @@ import 'package:photos/utils/dialog_util.dart';
class EditStorageLimitPage extends StatefulWidget {
const EditStorageLimitPage({
required this.member,
+ required this.displayName,
required this.totalStorageInBytes,
required this.avatarColor,
super.key,
});
final FamilyMember member;
+ final String displayName;
final int totalStorageInBytes;
final Color avatarColor;
@@ -97,7 +99,7 @@ class _EditStorageLimitPageState extends State<EditStorageLimitPage> {
radius: 20,
backgroundColor: widget.avatarColor,
child: Text(
- widget.member.email.substring(0, 1).toUpperCase(),
+ widget.displayName.substring(0, 1).toUpperCase(),
style: textTheme.bodyBold.copyWith(
color: Colors.white,
),
@@ -108,7 +110,7 @@ class _EditStorageLimitPageState extends State<EditStorageLimitPage> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Text(widget.member.email, style: textTheme.body),
+ Text(widget.displayName, style: textTheme.body),
const SizedBox(height: 2),
Text(
l10n.usingStorage(
diff --git a/mobile/apps/photos/lib/ui/family/family_dashboard.dart b/mobile/apps/photos/lib/ui/family/family_dashboard.dart
index 7cad46d0e9..e7ff591dab 100644
--- a/mobile/apps/photos/lib/ui/family/family_dashboard.dart
+++ b/mobile/apps/photos/lib/ui/family/family_dashboard.dart
@@ -82,7 +82,7 @@ class FamilyDashboard extends StatelessWidget {
final Map<int, Uint8List?> profilePictureBytesByUserId;
final Map<int, String> linkedPersonIdsByUserId;
final Map<int, String> linkedPersonNamesByUserId;
- final ValueChanged<FamilyMember> onMemberTap;
+ final void Function(FamilyMember member, String displayName) onMemberTap;
final VoidCallback onAddMember;
final int remainingSlots;
@@ -118,7 +118,7 @@ class FamilyDashboard extends StatelessWidget {
linkedPersonId: linkedPersonIdsByUserId[member.userID],
hasSavedContact: contactsByUserId[member.userID] != null,
avatarColor: _avatarColorFor(member),
- onTap: () => onMemberTap(member),
+ onTap: () => onMemberTap(member, _displayNameFor(member)),
),
if (index < visibleMembers.length - 1)
const SizedBox(height: Spacing.sm),
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 639bc84148..6b70ad1965 100644
--- a/mobile/apps/photos/lib/ui/family/family_plan_page.dart
+++ b/mobile/apps/photos/lib/ui/family/family_plan_page.dart
@@ -479,7 +479,10 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
}
}
- Future<void> _showMemberActions(FamilyMember member) async {
+ Future<void> _showMemberActions(
+ FamilyMember member,
+ String displayName,
+ ) async {
final isCurrentUser =
member.email.trim().toLowerCase() ==
_userDetails.email.trim().toLowerCase();
@@ -497,14 +500,11 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
return;
}
- final displayName = savedContact?.data?.name.trim();
final l10n = AppLocalizations.of(context);
await showBottomSheetComponent<void>(
context: context,
builder: (sheetContext) => BottomSheetComponent(
- title: displayName == null || displayName.isEmpty
- ? member.email
- : displayName,
+ title: displayName,
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
@@ -512,6 +512,7 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
_buildMemberActionItem(
sheetContext,
member: member,
+ displayName: displayName,
action: actions[index],
l10n: l10n,
),
@@ -527,6 +528,7 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
Widget _buildMemberActionItem(
BuildContext sheetContext, {
required FamilyMember member,
+ required String displayName,
required FamilyMemberAction action,
required AppLocalizations l10n,
}) {
@@ -575,6 +577,7 @@ class _FamilyPlanPageState extends State<FamilyPlanPage> {
context,
EditStorageLimitPage(
member: member,
+ displayName: displayName,
totalStorageInBytes: _userDetails.getTotalStorage(),
avatarColor: avatarComponentColorValue(
context,
diff --git a/mobile/apps/photos/test/ui/family/edit_storage_limit_page_test.dart b/mobile/apps/photos/test/ui/family/edit_storage_limit_page_test.dart
new file mode 100644
index 0000000000..ab756b109d
--- /dev/null
+++ b/mobile/apps/photos/test/ui/family/edit_storage_limit_page_test.dart
@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:photos/ente_theme_data.dart';
+import 'package:photos/generated/l10n.dart';
+import 'package:photos/models/user_details.dart';
+import 'package:photos/ui/family/edit_storage_limit_page.dart';
+
+void main() {
+ testWidgets('shows the family listing display name', (tester) async {
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: lightThemeData,
+ localizationsDelegates: AppLocalizations.localizationsDelegates,
+ supportedLocales: AppLocalizations.supportedLocales,
+ home: EditStorageLimitPage(
+ member: FamilyMember(
+ 1024 * 1024 * 1024,
+ 'family-member',
+ 42,
+ false,
+ FamilyMemberStatus.accepted,
+ null,
+ ),
+ displayName: 'Linked person',
+ totalStorageInBytes: 10 * 1024 * 1024 * 1024,
+ avatarColor: Colors.green,
+ ),
+ ),
+ );
+
+ expect(find.text('Linked person'), findsOneWidget);
+ expect(find.text('[email protected]'), findsNothing);
+ expect(find.text('L'), findsOneWidget);
+ });
+}
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 a4db7c9056..be5f800bb7 100644
--- a/mobile/apps/photos/test/ui/family/family_dashboard_test.dart
+++ b/mobile/apps/photos/test/ui/family/family_dashboard_test.dart
@@ -196,7 +196,7 @@ void main() {
1: 'Person current user',
42: 'Person saved member',
},
- onMemberTap: (member) => selectedMember = member,
+ onMemberTap: (member, _) => selectedMember = member,
onAddMember: () {},
remainingSlots: 2,
),
@@ -268,12 +268,9 @@ void main() {
testWidgets('uses a linked Person name and face without a saved contact', (
tester,
) async {
- final member = _member(
- email: '[email protected]',
- userID: 42,
- status: FamilyMemberStatus.self,
- );
+ final member = _member(email: '[email protected]', userID: 42);
final members = [member];
+ String? selectedDisplayName;
await tester.pumpWidget(
MaterialApp(
@@ -289,7 +286,9 @@ void main() {
profilePictureBytesByUserId: const {},
linkedPersonIdsByUserId: const {42: 'person-42'},
linkedPersonNamesByUserId: const {42: 'Current person'},
- onMemberTap: (_) {},
+ onMemberTap: (_, displayName) {
+ selectedDisplayName = displayName;
+ },
onAddMember: () {},
remainingSlots: 0,
),
@@ -303,6 +302,9 @@ void main() {
find.byType(PersonFaceWidget),
);
expect(personAvatar.personId, 'person-42');
+
+ await tester.tap(find.byType(MenuComponent));
+ expect(selectedDisplayName, 'Current person');
});
testWidgets('sorts other members by their displayed name or email', (
@@ -337,7 +339,7 @@ void main() {
profilePictureBytesByUserId: const {},
linkedPersonIdsByUserId: const {},
linkedPersonNamesByUserId: const {4: 'Aaron'},
- onMemberTap: (_) {},
+ onMemberTap: (_, _) {},
onAddMember: () {},
remainingSlots: 0,
),