Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
41f0e4e5d4 |
@@ -10,6 +10,7 @@ import 'package:sharedinbox/core/models/email.dart';
|
|||||||
import 'package:sharedinbox/core/models/undo_action.dart';
|
import 'package:sharedinbox/core/models/undo_action.dart';
|
||||||
import 'package:sharedinbox/core/repositories/email_repository.dart';
|
import 'package:sharedinbox/core/repositories/email_repository.dart';
|
||||||
import 'package:sharedinbox/di.dart';
|
import 'package:sharedinbox/di.dart';
|
||||||
|
import 'package:sharedinbox/ui/widgets/email_tile.dart';
|
||||||
import 'package:sharedinbox/ui/widgets/folder_drawer.dart';
|
import 'package:sharedinbox/ui/widgets/folder_drawer.dart';
|
||||||
import 'package:sharedinbox/ui/widgets/snooze_picker.dart';
|
import 'package:sharedinbox/ui/widgets/snooze_picker.dart';
|
||||||
|
|
||||||
@@ -711,10 +712,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
|
|||||||
itemBuilder: (ctx, i) {
|
itemBuilder: (ctx, i) {
|
||||||
final e = emails[i];
|
final e = emails[i];
|
||||||
final isSelected = _selectedSearchIds.contains(e.id);
|
final isSelected = _selectedSearchIds.contains(e.id);
|
||||||
final sender = e.from.isNotEmpty
|
return EmailTile(
|
||||||
? (e.from.first.name ?? e.from.first.email)
|
email: e,
|
||||||
: '(unknown)';
|
selected: isSelected,
|
||||||
return ListTile(
|
|
||||||
leading: SizedBox(
|
leading: SizedBox(
|
||||||
width: 40,
|
width: 40,
|
||||||
child: _selecting
|
child: _selecting
|
||||||
@@ -722,25 +722,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
|
|||||||
value: isSelected,
|
value: isSelected,
|
||||||
onChanged: (_) => _toggleSearchSelection(e.id),
|
onChanged: (_) => _toggleSearchSelection(e.id),
|
||||||
)
|
)
|
||||||
: Icon(
|
: null,
|
||||||
e.isSeen ? Icons.mail_outline : Icons.mail,
|
|
||||||
color: e.isSeen ? null : Theme.of(ctx).colorScheme.primary,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
title: Text(
|
|
||||||
sender,
|
|
||||||
style:
|
|
||||||
e.isSeen ? null : const TextStyle(fontWeight: FontWeight.bold),
|
|
||||||
),
|
|
||||||
subtitle: Text(
|
|
||||||
e.subject ?? '(no subject)',
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
),
|
|
||||||
selected: isSelected,
|
|
||||||
trailing: Text(
|
|
||||||
e.sentAt != null ? _dateFmt.format(e.sentAt!) : '',
|
|
||||||
style: Theme.of(ctx).textTheme.bodySmall,
|
|
||||||
),
|
),
|
||||||
onTap: _selecting
|
onTap: _selecting
|
||||||
? () => _toggleSearchSelection(e.id)
|
? () => _toggleSearchSelection(e.id)
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import 'package:sharedinbox/core/models/email.dart';
|
|||||||
import 'package:sharedinbox/core/models/mailbox.dart';
|
import 'package:sharedinbox/core/models/mailbox.dart';
|
||||||
import 'package:sharedinbox/core/utils/logger.dart';
|
import 'package:sharedinbox/core/utils/logger.dart';
|
||||||
import 'package:sharedinbox/di.dart';
|
import 'package:sharedinbox/di.dart';
|
||||||
|
import 'package:sharedinbox/ui/widgets/email_tile.dart';
|
||||||
|
|
||||||
class SearchScreen extends ConsumerStatefulWidget {
|
class SearchScreen extends ConsumerStatefulWidget {
|
||||||
const SearchScreen({super.key, this.accountId});
|
const SearchScreen({super.key, this.accountId});
|
||||||
@@ -155,7 +156,15 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
|
|||||||
if (r.emails.isNotEmpty) ...[
|
if (r.emails.isNotEmpty) ...[
|
||||||
const _SectionHeader('Messages'),
|
const _SectionHeader('Messages'),
|
||||||
for (final e in r.emails)
|
for (final e in r.emails)
|
||||||
_EmailTile(email: e, accountId: e.accountId),
|
EmailTile(
|
||||||
|
email: e,
|
||||||
|
showLocation: true,
|
||||||
|
onTap: () => context.push(
|
||||||
|
'/accounts/${e.accountId}/mailboxes'
|
||||||
|
'/${Uri.encodeComponent(e.mailboxPath)}'
|
||||||
|
'/emails/${Uri.encodeComponent(e.id)}',
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
@@ -246,42 +255,3 @@ class _AddressTile extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _EmailTile extends StatelessWidget {
|
|
||||||
const _EmailTile({required this.email, required this.accountId});
|
|
||||||
final Email email;
|
|
||||||
final String accountId;
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final sender = email.from.isNotEmpty
|
|
||||||
? (email.from.first.name ?? email.from.first.email)
|
|
||||||
: '(unknown)';
|
|
||||||
return ListTile(
|
|
||||||
leading: Icon(
|
|
||||||
email.isSeen ? Icons.mail_outline : Icons.mail,
|
|
||||||
color: email.isSeen ? null : Theme.of(context).colorScheme.primary,
|
|
||||||
),
|
|
||||||
title: Text(sender),
|
|
||||||
subtitle: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Text(
|
|
||||||
email.subject ?? '(no subject)',
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
),
|
|
||||||
Text(
|
|
||||||
'$accountId • ${email.mailboxPath}',
|
|
||||||
style: Theme.of(context).textTheme.bodySmall,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
onTap: () => context.push(
|
|
||||||
'/accounts/$accountId/mailboxes'
|
|
||||||
'/${Uri.encodeComponent(email.mailboxPath)}'
|
|
||||||
'/emails/${Uri.encodeComponent(email.id)}',
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:intl/intl.dart';
|
||||||
|
|
||||||
|
import 'package:sharedinbox/core/models/email.dart';
|
||||||
|
|
||||||
|
final _dateFmt = DateFormat('MMM d');
|
||||||
|
|
||||||
|
/// A flat list tile for an individual [email].
|
||||||
|
///
|
||||||
|
/// Used in search-result lists and the per-mailbox search overlay.
|
||||||
|
/// Pass a custom [leading] widget to support selection-mode checkboxes.
|
||||||
|
class EmailTile extends StatelessWidget {
|
||||||
|
const EmailTile({
|
||||||
|
super.key,
|
||||||
|
required this.email,
|
||||||
|
required this.onTap,
|
||||||
|
this.leading,
|
||||||
|
this.selected = false,
|
||||||
|
this.onLongPress,
|
||||||
|
this.showLocation = false,
|
||||||
|
});
|
||||||
|
|
||||||
|
final Email email;
|
||||||
|
final VoidCallback onTap;
|
||||||
|
final Widget? leading;
|
||||||
|
final bool selected;
|
||||||
|
final VoidCallback? onLongPress;
|
||||||
|
|
||||||
|
/// When true, appends `accountId • mailboxPath` as a second subtitle line.
|
||||||
|
final bool showLocation;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final sender = email.from.isNotEmpty
|
||||||
|
? (email.from.first.name ?? email.from.first.email)
|
||||||
|
: '(unknown)';
|
||||||
|
final date = email.sentAt != null ? _dateFmt.format(email.sentAt!) : '';
|
||||||
|
|
||||||
|
return ListTile(
|
||||||
|
leading: leading ??
|
||||||
|
Icon(
|
||||||
|
email.isSeen ? Icons.mail_outline : Icons.mail,
|
||||||
|
color: email.isSeen ? null : Theme.of(context).colorScheme.primary,
|
||||||
|
),
|
||||||
|
title: Text(
|
||||||
|
sender,
|
||||||
|
style:
|
||||||
|
email.isSeen ? null : const TextStyle(fontWeight: FontWeight.bold),
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
subtitle: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
email.subject ?? '(no subject)',
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
if (showLocation)
|
||||||
|
Text(
|
||||||
|
'${email.accountId} • ${email.mailboxPath}',
|
||||||
|
style: Theme.of(context).textTheme.bodySmall,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
trailing: date.isEmpty
|
||||||
|
? null
|
||||||
|
: Text(date, style: Theme.of(context).textTheme.bodySmall),
|
||||||
|
selected: selected,
|
||||||
|
onTap: onTap,
|
||||||
|
onLongPress: onLongPress,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user