TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Close button

Browse Source
This commit is contained in:
laurenspriem
2025-06-30 13:13:50 +02:00
parent 16a2a5cc13
commit 66617ada86
3 changed files with 161 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/lib/ui/viewer/people/people_page.dart
View File

@@ -290,6 +290,11 @@ class _GalleryState extends State<_Gallery> {
},
child: PersonGallerySuggestion(
person: widget.personEntity,
onClose: () {
setState(() {
userDismissedPersonGallerySuggestion = true;
});
},
),
)
: const SizedBox.shrink(),

271
mobile/lib/ui/viewer/people/person_gallery_suggestion.dart
View File

@@ -20,9 +20,11 @@ final _logger = Logger("PersonGallerySuggestion");
class PersonGallerySuggestion extends StatefulWidget {
final PersonEntity? person;
final VoidCallback? onClose;
const PersonGallerySuggestion({
required this.person,
this.onClose,
super.key,
});
@@ -403,152 +405,175 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>
key: ValueKey('suggestion_$currentSuggestionIndex'),
onTap: _navigateToCluster,
behavior: HitTestBehavior.opaque,
child: Container(
margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
padding: const EdgeInsets.symmetric(vertical: 16),
decoration: BoxDecoration(
color: colorScheme.fillFaint,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: colorScheme.strokeFainter,
width: 1,
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
personPage
? RichText(
textAlign: TextAlign.center,
text: TextSpan(
style: textTheme.body,
children: [
TextSpan(text: S.of(context).areThey),
TextSpan(
text: relevantPerson.data.name,
style: textTheme.bodyBold,
),
TextSpan(text: S.of(context).questionmark),
],
),
)
: Text(
S.of(context).sameperson,
style: textTheme.body,
textAlign: TextAlign.center,
),
const SizedBox(height: 16),
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: _buildFaceThumbnails(),
child: Stack(
children: [
Container(
margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
padding: const EdgeInsets.symmetric(vertical: 16),
decoration: BoxDecoration(
color: colorScheme.fillFaint,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: colorScheme.strokeFainter,
width: 1,
),
),
const SizedBox(height: 24),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: GestureDetector(
onTap: isProcessing
? null
: () => _handleUserChoice(false),
child: Container(
margin: const EdgeInsets.only(left: 16, right: 6),
padding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 12,
personPage
? RichText(
textAlign: TextAlign.center,
text: TextSpan(
style: textTheme.body,
children: [
TextSpan(text: S.of(context).areThey),
TextSpan(
text: relevantPerson.data.name,
style: textTheme.bodyBold,
),
TextSpan(text: S.of(context).questionmark),
],
),
)
: Text(
S.of(context).sameperson,
style: textTheme.body,
textAlign: TextAlign.center,
),
decoration: BoxDecoration(
color: Colors.transparent,
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: colorScheme.warning700,
width: 1,
const SizedBox(height: 16),
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: _buildFaceThumbnails(),
),
const SizedBox(height: 24),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Expanded(
child: GestureDetector(
onTap: isProcessing
? null
: () => _handleUserChoice(false),
child: Container(
margin: const EdgeInsets.only(left: 16, right: 6),
padding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 12,
),
decoration: BoxDecoration(
color: Colors.transparent,
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: colorScheme.warning700,
width: 1,
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.close,
color: colorScheme.warning500,
size: 20,
),
const SizedBox(width: 8),
Text(
S.of(context).no,
style: (personPage
? textTheme.bodyBold
: textTheme.body)
.copyWith(
color: colorScheme.warning500,
),
),
],
),
),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.close,
color: colorScheme.warning500,
size: 20,
),
Expanded(
child: GestureDetector(
onTap: isProcessing
? null
: () => _handleUserChoice(true),
child: Container(
margin: const EdgeInsets.only(left: 6, right: 16),
padding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 12,
),
const SizedBox(width: 8),
Text(
S.of(context).no,
style: (personPage
? textTheme.bodyBold
: textTheme.body)
.copyWith(
color: colorScheme.warning500,
),
decoration: BoxDecoration(
color: colorScheme.primary500,
borderRadius: BorderRadius.circular(8),
),
],
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(
Icons.check,
color: textBaseDark,
size: 20,
),
const SizedBox(width: 8),
Text(
S.of(context).yes,
style: (personPage
? textTheme.bodyBold
: textTheme.body)
.copyWith(
color: textBaseDark,
),
),
],
),
),
),
),
),
],
),
Expanded(
child: GestureDetector(
if (personPage) const SizedBox(height: 12),
if (personPage)
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap:
isProcessing ? null : () => _handleUserChoice(true),
child: Container(
margin: const EdgeInsets.only(left: 6, right: 16),
isProcessing ? null : () => _saveAsAnotherPerson(),
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 12,
horizontal: 32,
),
decoration: BoxDecoration(
color: colorScheme.primary500,
borderRadius: BorderRadius.circular(8),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(
Icons.check,
color: textBaseDark,
size: 20,
),
const SizedBox(width: 8),
Text(
S.of(context).yes,
style: (personPage
? textTheme.bodyBold
: textTheme.body)
.copyWith(
color: textBaseDark,
),
),
],
child: Text(
S.of(context).saveAsAnotherPerson,
style: textTheme.mini.copyWith(
color: colorScheme.textMuted,
decoration: TextDecoration.underline,
),
),
),
),
),
],
),
if (personPage) const SizedBox(height: 12),
if (personPage)
GestureDetector(
),
if (widget.onClose != null)
Positioned(
top: 4,
right: 12,
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: isProcessing ? null : () => _saveAsAnotherPerson(),
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 12,
horizontal: 32,
),
child: Text(
S.of(context).saveAsAnotherPerson,
style: textTheme.mini.copyWith(
color: colorScheme.textMuted,
decoration: TextDecoration.underline,
),
onTap: widget.onClose,
child: Container(
padding: const EdgeInsets.all(16),
child: Icon(
Icons.close,
size: 16,
color: colorScheme.textBase,
),
),
),
],
),
),
],
),
),
),

9
mobile/lib/ui/viewer/search/result/people_section_all_page.dart
View File

@@ -460,7 +460,14 @@ class _PeopleSectionAllWidgetState extends State<PeopleSectionAllWidget> {
userDismissedPersonGallerySuggestion = true;
});
},
child: const PersonGallerySuggestion(person: null),
child: PersonGallerySuggestion(
person: null,
onClose: () {
setState(() {
userDismissedPersonGallerySuggestion = true;
});
},
),
),
)
: const SliverToBoxAdapter(child: SizedBox.shrink()),