High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat(mobile): person age on photo properties (#16728)
Yaros6c5f99c47aa4
diff --git a/mobile/assets/i18n/en-US.json b/mobile/assets/i18n/en-US.jsonindex 3854c0c517..bd2397ce3b 100644--- a/mobile/assets/i18n/en-US.json+++ b/mobile/assets/i18n/en-US.json@@ -264,6 +264,7 @@"exif_bottom_sheet_location_add": "Add a location","exif_bottom_sheet_people": "PEOPLE","exif_bottom_sheet_person_add_person": "Add name",+ "exif_bottom_sheet_person_age": "Age {}","experimental_settings_new_asset_list_subtitle": "Work in progress","experimental_settings_new_asset_list_title": "Enable experimental photo grid","experimental_settings_subtitle": "Use at your own risk!",diff --git a/mobile/lib/models/search/search_curated_content.model.dart b/mobile/lib/models/search/search_curated_content.model.dartindex af660bad9d..a3d74941b3 100644--- a/mobile/lib/models/search/search_curated_content.model.dart+++ b/mobile/lib/models/search/search_curated_content.model.dart@@ -8,20 +8,26 @@ class SearchCuratedContent {/// The label to show associated with this curated objectfinal String label;+ /// The subtitle to show below the label+ final String? subtitle;+/// The id to lookup the asset from the serverfinal String id;SearchCuratedContent({required this.label,required this.id,+ this.subtitle,});SearchCuratedContent copyWith({String? label,+ String? subtitle,String? id,}) {return SearchCuratedContent(label: label ?? this.label,+ subtitle: subtitle ?? this.subtitle,id: id ?? this.id,);}@@ -29,6 +35,7 @@ class SearchCuratedContent {Map<String, dynamic> toMap() {return <String, dynamic>{'label': label,+ 'subtitle': subtitle,'id': id,};}@@ -36,6 +43,7 @@ class SearchCuratedContent {factory SearchCuratedContent.fromMap(Map<String, dynamic> map) {return SearchCuratedContent(label: map['label'] as String,+ subtitle: map['subtitle'] as String?,id: map['id'] as String,);}@@ -46,13 +54,14 @@ class SearchCuratedContent {SearchCuratedContent.fromMap(json.decode(source) as Map<String, dynamic>);@override- String toString() => 'CuratedContent(label: $label, id: $id)';+ String toString() =>+ 'CuratedContent(label: $label, subtitle: $subtitle, id: $id)';@overridebool operator ==(covariant SearchCuratedContent other) {if (identical(this, other)) return true;- return other.label == label && other.id == id;+ return other.label == label && other.subtitle == subtitle && other.id == id;}@overridediff --git a/mobile/lib/widgets/asset_viewer/detail_panel/people_info.dart b/mobile/lib/widgets/asset_viewer/detail_panel/people_info.dartindex f917f03b37..2e868682f8 100644--- a/mobile/lib/widgets/asset_viewer/detail_panel/people_info.dart+++ b/mobile/lib/widgets/asset_viewer/detail_panel/people_info.dart@@ -44,7 +44,19 @@ class PeopleInfo extends ConsumerWidget {}final curatedPeople = people- ?.map((p) => SearchCuratedContent(id: p.id, label: p.name))+ ?.map(+ (p) => SearchCuratedContent(+ id: p.id,+ label: p.name,+ subtitle: p.birthDate != null+ ? "exif_bottom_sheet_person_age".tr(+ args: [+ _calculateAge(p.birthDate!).toString(),+ ],+ )+ : null,+ ),+ ).toList() ??[];@@ -99,4 +111,17 @@ class PeopleInfo extends ConsumerWidget {),);}++ int _calculateAge(DateTime birthDate) {+ DateTime today = DateTime.now();+ int age = today.year - birthDate.year;++ // Check if the birthday has occurred this year+ if (today.month < birthDate.month ||+ (today.month == birthDate.month && today.day < birthDate.day)) {+ age--;+ }++ return age;+ }}diff --git a/mobile/lib/widgets/search/curated_people_row.dart b/mobile/lib/widgets/search/curated_people_row.dartindex 2ec57d6a1a..eece328392 100644--- a/mobile/lib/widgets/search/curated_people_row.dart+++ b/mobile/lib/widgets/search/curated_people_row.dart@@ -86,12 +86,22 @@ class CuratedPeopleRow extends StatelessWidget {).tr(),);}- return Text(- person.label,- textAlign: TextAlign.center,- overflow: TextOverflow.ellipsis,- style: context.textTheme.labelLarge,- maxLines: 2,+ return Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ Text(+ person.label,+ textAlign: TextAlign.center,+ overflow: TextOverflow.ellipsis,+ style: context.textTheme.labelLarge,+ maxLines: 2,+ ),+ if (person.subtitle != null)+ Text(+ person.subtitle!,+ textAlign: TextAlign.center,+ ),+ ],);}}