refactor(A2): extract shared EmailTile widget from search result lists

Introduce lib/ui/widgets/email_tile.dart with an EmailTile widget that
renders a flat email list tile (mail icon, sender, subject, optional
date and location line).

Replace the private _EmailTile class in search_screen.dart and the
inlined ListTile in email_list_screen._buildEmailList() with the shared
widget. Both screens now import EmailTile instead of duplicating the
same sender/subject/icon/date layout.

The widget accepts an optional leading override (for checkbox support
in selection mode) and a showLocation flag (for the global search screen
that appends accountId•mailboxPath under the subject).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

lib/ui/screens/email_list_screen.dart

@@ -10,6 +10,7 @@ import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
 import 'package:sharedinbox/core/repositories/email_repository.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/snooze_picker.dart';
 
@@ -711,10 +712,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
       itemBuilder: (ctx, i) {
         final e = emails[i];
         final isSelected = _selectedSearchIds.contains(e.id);
-        final sender = e.from.isNotEmpty
-            ? (e.from.first.name ?? e.from.first.email)
-            : '(unknown)';
-        return ListTile(
+        return EmailTile(
+          email: e,
+          selected: isSelected,
           leading: SizedBox(
             width: 40,
             child: _selecting
@@ -722,25 +722,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                     value: isSelected,
                     onChanged: (_) => _toggleSearchSelection(e.id),
                   )
-                : Icon(
-                    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,
+                : null,
           ),
           onTap: _selecting
               ? () => _toggleSearchSelection(e.id)

lib/ui/screens/search_screen.dart

@@ -8,6 +8,7 @@ import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/mailbox.dart';
 import 'package:sharedinbox/core/utils/logger.dart';
 import 'package:sharedinbox/di.dart';
+import 'package:sharedinbox/ui/widgets/email_tile.dart';
 
 class SearchScreen extends ConsumerStatefulWidget {
   const SearchScreen({super.key, this.accountId});
@@ -155,7 +156,15 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
         if (r.emails.isNotEmpty) ...[
           const _SectionHeader('Messages'),
           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)}',
-      ),
-    );
-  }
-}

lib/ui/widgets/email_tile.dart

@@ -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,
+    );
+  }
+}

test/unit/migration_test.dart

@@ -4,11 +4,22 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:sharedinbox/data/db/database.dart';
 import 'package:sqlite3/sqlite3.dart' as sqlite;
 
+/// Reads all column names for [tableName] from [db].
+Future<List<String>> _tableColumns(AppDatabase db, String tableName) async {
+  final rows = await db.customSelect('PRAGMA table_info($tableName)').get();
+  return rows.map((r) => r.read<String>('name')).toList();
+}
+
 void main() {
   group('Migration', () {
-    test('upgrade from v1 to latest', () async {
-      // 1. Create a V1 database using raw sqlite3.
-      final dbFile = File('test_migration.db');
+    test('schemaVersion matches expected value', () async {
+      final db = AppDatabase(NativeDatabase.memory());
+      expect(db.schemaVersion, 24);
+      await db.close();
+    });
+
+    test('upgrade from v1 to latest checks all added columns', () async {
+      final dbFile = File('test_migration_v1.db');
       if (dbFile.existsSync()) dbFile.deleteSync();
 
       final rawDb = sqlite.sqlite3.open(dbFile.path);
@@ -67,41 +78,187 @@ void main() {
       rawDb.execute('PRAGMA user_version = 1;');
       rawDb.close();
 
-      // 2. Open it with AppDatabase (v22).
       final db = AppDatabase(NativeDatabase(dbFile));
 
-      // Trigger migration by performing a simple query.
+      // Trigger migration by performing a query.
       final accs = await db.select(db.accounts).get();
       expect(accs, hasLength(1));
       expect(accs.first.displayName, 'Alice');
-      expect(accs.first.accountType, 'imap'); // default value
+      expect(accs.first.accountType, 'imap');
 
-      // 3. Verify that all columns exist.
-      // If migration failed, it would have thrown an exception during opening or query.
-      final tableInfo =
-          await db.customSelect('PRAGMA table_info(emails)').get();
-      final columns = tableInfo.map((r) => r.read<String>('name')).toList();
-
-      expect(columns, contains('thread_id'));
-      expect(columns, contains('snoozed_until'));
-      expect(columns, contains('snoozed_from_mailbox_path'));
-
-      final accountsInfo =
-          await db.customSelect('PRAGMA table_info(accounts)').get();
-      final accountColumns =
-          accountsInfo.map((r) => r.read<String>('name')).toList();
-      expect(accountColumns, contains('account_type'));
-      expect(accountColumns, contains('username'));
+      // v2–v3: accounts columns.
+      final accountColumns = await _tableColumns(db, 'accounts');
+      expect(
+        accountColumns,
+        containsAll(['account_type', 'jmap_url', 'username']),
+      );
       expect(accountColumns, contains('manage_sieve_host'));
 
+      // v14: threading columns.
+      final emailColumns = await _tableColumns(db, 'emails');
+      expect(
+        emailColumns,
+        containsAll(['thread_id', 'message_id', 'in_reply_to', 'references']),
+      );
+
+      // v22: snooze columns.
+      expect(
+        emailColumns,
+        containsAll(['snoozed_until', 'snoozed_from_mailbox_path']),
+      );
+
+      // v23: list-unsubscribe header column.
+      expect(emailColumns, contains('list_unsubscribe_header'));
+
+      // v8: mailboxes role column.
+      final mailboxColumns = await _tableColumns(db, 'mailboxes');
+      expect(mailboxColumns, contains('role'));
+
+      // v9: email_bodies cached_at column.
+      final bodyColumns = await _tableColumns(db, 'email_bodies');
+      expect(bodyColumns, contains('cached_at'));
+      expect(bodyColumns, contains('headers_json'));
+
+      // v4: drafts table with v24 imap_server_id column.
+      final draftColumns = await _tableColumns(db, 'drafts');
+      expect(draftColumns, contains('imap_server_id'));
+
+      // v5, v6, v7, v12, v17, v19, v21: new tables.
+      final allTables = await db
+          .customSelect("SELECT name FROM sqlite_master WHERE type='table'")
+          .get();
+      final tableNames = allTables.map((r) => r.read<String>('name')).toList();
+      expect(
+        tableNames,
+        containsAll([
+          'sync_states', // v5
+          'pending_changes', // v6
+          'sync_logs', // v7
+          'sync_log_mailboxes', // v12
+          'threads', // v17
+          'sync_health', // v19
+          'undo_actions', // v21
+        ]),
+      );
+
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
 
-    test('fresh install (v22) works', () async {
-      final db = AppDatabase(NativeDatabase.memory());
-      // Just ensure we can create everything and query.
+    test(
+        'upgrade from v22 to latest adds list_unsubscribe_header and imap_server_id',
+        () async {
+      final dbFile = File('test_migration_v22.db');
+      if (dbFile.existsSync()) dbFile.deleteSync();
+
+      // Build a v22 database schema directly with raw SQL.
+      final rawDb = sqlite.sqlite3.open(dbFile.path);
+      rawDb.execute('''
+        CREATE TABLE accounts (
+          id TEXT NOT NULL PRIMARY KEY,
+          display_name TEXT NOT NULL,
+          email TEXT NOT NULL,
+          imap_host TEXT NOT NULL,
+          imap_port INTEGER NOT NULL DEFAULT 993,
+          imap_ssl INTEGER NOT NULL DEFAULT 1 CHECK ("imap_ssl" IN (0, 1)),
+          smtp_host TEXT NOT NULL DEFAULT '',
+          smtp_port INTEGER NOT NULL DEFAULT 465,
+          smtp_ssl INTEGER NOT NULL DEFAULT 1 CHECK ("smtp_ssl" IN (0, 1)),
+          account_type TEXT NOT NULL DEFAULT 'imap',
+          jmap_url TEXT NULL,
+          username TEXT NULL,
+          manage_sieve_host TEXT NULL,
+          manage_sieve_port INTEGER NULL,
+          manage_sieve_ssl INTEGER NULL,
+          manage_sieve_available INTEGER NOT NULL DEFAULT 0 CHECK ("manage_sieve_available" IN (0, 1)),
+          verbose INTEGER NOT NULL DEFAULT 0 CHECK ("verbose" IN (0, 1))
+        );
+      ''');
+      rawDb.execute('''
+        CREATE TABLE drafts (
+          id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+          account_id TEXT NULL,
+          reply_to_email_id TEXT NULL,
+          to_text TEXT NOT NULL DEFAULT '',
+          cc_text TEXT NOT NULL DEFAULT '',
+          subject_text TEXT NOT NULL DEFAULT '',
+          body_text TEXT NOT NULL DEFAULT '',
+          updated_at INTEGER NOT NULL
+        );
+      ''');
+      rawDb.execute('''
+        CREATE TABLE emails (
+          id TEXT NOT NULL PRIMARY KEY,
+          account_id TEXT NOT NULL,
+          mailbox_path TEXT NOT NULL,
+          uid INTEGER NOT NULL,
+          subject TEXT NULL,
+          sent_at INTEGER NULL,
+          received_at INTEGER NOT NULL,
+          from_json TEXT NOT NULL DEFAULT '[]',
+          to_addresses TEXT NOT NULL DEFAULT '[]',
+          cc_json TEXT NOT NULL DEFAULT '[]',
+          preview TEXT NULL,
+          is_seen INTEGER NOT NULL DEFAULT 0 CHECK ("is_seen" IN (0, 1)),
+          is_flagged INTEGER NOT NULL DEFAULT 0 CHECK ("is_flagged" IN (0, 1)),
+          has_attachment INTEGER NOT NULL DEFAULT 0 CHECK ("has_attachment" IN (0, 1)),
+          thread_id TEXT NULL,
+          message_id TEXT NULL,
+          in_reply_to TEXT NULL,
+          "references" TEXT NULL,
+          snoozed_until INTEGER NULL,
+          snoozed_from_mailbox_path TEXT NULL
+        );
+      ''');
+      rawDb.execute('PRAGMA user_version = 22;');
+      rawDb.close();
+
+      final db = AppDatabase(NativeDatabase(dbFile));
+      // Trigger migration.
       await db.select(db.accounts).get();
+
+      final emailColumns = await _tableColumns(db, 'emails');
+      expect(emailColumns, contains('list_unsubscribe_header'));
+
+      final draftColumns = await _tableColumns(db, 'drafts');
+      expect(draftColumns, contains('imap_server_id'));
+
+      await db.close();
+      if (dbFile.existsSync()) dbFile.deleteSync();
+    });
+
+    test('fresh install creates all tables at schemaVersion 24', () async {
+      final db = AppDatabase(NativeDatabase.memory());
+      await db.select(db.accounts).get();
+
+      final allTables = await db
+          .customSelect("SELECT name FROM sqlite_master WHERE type='table'")
+          .get();
+      final tableNames = allTables.map((r) => r.read<String>('name')).toSet();
+      expect(
+        tableNames,
+        containsAll([
+          'accounts',
+          'mailboxes',
+          'emails',
+          'email_bodies',
+          'drafts',
+          'sync_states',
+          'pending_changes',
+          'sync_logs',
+          'sync_log_mailboxes',
+          'threads',
+          'sync_health',
+          'undo_actions',
+        ]),
+      );
+
+      final emailColumns = await _tableColumns(db, 'emails');
+      expect(emailColumns, contains('list_unsubscribe_header'));
+
+      final draftColumns = await _tableColumns(db, 'drafts');
+      expect(draftColumns, contains('imap_server_id'));
+
       await db.close();
     });
   });