代码优化

lib/widgets/book_list_item.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../models/data_models.dart';

lib/widgets/custom_drawer.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -11,7 +10,6 @@ import '../pages/person_list_page.dart';
 import '../pages/markdown_reader/md_reader_tab_page.dart';
 import '../pages/epub_reader/epub_library_page.dart';
 import '../pages/tag_management_page.dart';
-import '../pages/profile_page.dart';
 import '../pages/movies/movie_detail_page.dart';
 import '../pages/book/book_detail_page.dart';
 import '../pages/note/note_detail_page.dart';

lib/widgets/movie_list_item.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../models/data_models.dart';

lib/widgets/note_list_item.dart

@@ -2,9 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../providers/app_provider.dart';
 import '../models/data_models.dart';
-import 'fade_in_local_image.dart';
 
-/// 笔记列表项组件 - 极简主义设计
+/// 笔记列表项组件 - 卡片式设计，内容展示在卡片内
 class NoteListItem extends StatelessWidget {
   final Note note;
 
@@ -26,7 +25,9 @@ class _NoteListItemContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colors = Theme.of(context).colorScheme;
-    return InkWell(
+    final previewText = _getPreviewText(note);
+
+    return GestureDetector(
       onTap: () async {
         final provider = context.read<AppProvider>();
         await Navigator.pushNamed(context, '/note-detail', arguments: note);
@@ -35,123 +36,95 @@ class _NoteListItemContent extends StatelessWidget {
       onLongPress: () => _showActions(context),
       child: Container(
         margin: const EdgeInsets.only(bottom: 8),
-        padding: const EdgeInsets.fromLTRB(12, 10, 12, 10),
+        padding: const EdgeInsets.all(14),
         decoration: BoxDecoration(
           color: colors.surfaceContainerHigh,
-          borderRadius: BorderRadius.circular(8),
+          borderRadius: BorderRadius.circular(12),
         ),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisSize: MainAxisSize.min,
           children: [
-            // 日期行
-            Row(
-              children: [
-                Text(
-                  _formatDate(note.createdAt),
-                  style: TextStyle(
-                    fontSize: 11,
-                    color: colors.onSurface.withValues(alpha: 0.4),
-                  ),
-                ),
-                const SizedBox(width: 8),
-                Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 1),
-                  decoration: BoxDecoration(
-                    color: colors.surface,
-                    borderRadius: BorderRadius.circular(3),
-                  ),
-                  child: Text(
-                    'MD',
-                    style: TextStyle(
-                      fontSize: 9,
-                      fontWeight: FontWeight.w600,
-                      color: colors.onSurface.withValues(alpha: 0.4),
-                    ),
-                  ),
-                ),
-                if (note.isPinned) ...[
-                  const SizedBox(width: 6),
-                  Icon(Icons.push_pin, size: 12, color: colors.primary),
-                ],
-              ],
-            ),
-
-            const SizedBox(height: 6),
-
+            // 标题（带置顶图标）
             if (note.title.isNotEmpty) ...[
-              Text(
-                note.title,
-                style: TextStyle(
-                  fontSize: 15,
-                  fontWeight: FontWeight.w600,
-                  color: colors.onSurface,
-                  height: 1.4,
-                ),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-              ),
-              const SizedBox(height: 4),
-            ],
-
-            if (_collapseBlankLines(_cleanMarkdown(note.content).trim()).isNotEmpty)
-              Text(
-                _collapseBlankLines(_cleanMarkdown(note.content).trim()),
-                style: TextStyle(
-                  fontSize: 13,
-                  color: colors.onSurface.withValues(alpha: 0.6),
-                  height: 1.5,
-                ),
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
-              ),
-
-            // 图片缩略图（最多3张，超出显示 +N）
-            if (note.images.isNotEmpty) ...[
-              const SizedBox(height: 8),
+              const SizedBox(height: 6),
               Row(
                 children: [
-                  for (int i = 0; i < note.images.length.clamp(0, 3); i++) ...[
-                    if (i > 0) const SizedBox(width: 6),
-                    ClipRRect(
-                      borderRadius: BorderRadius.circular(6),
-                      child: Stack(
-                        children: [
-                          FadeInLocalImage(
-                            path: note.images[i],
-                            width: 56, height: 56,
-                            fit: BoxFit.cover,
-                            errorWidget: Container(width: 56, height: 56, color: colors.surfaceContainerHighest),
-                          ),
-                          // 第3张且有更多时显示 +N
-                          if (i == 2 && note.images.length > 3)
-                            Positioned.fill(
-                              child: Container(
-                                decoration: BoxDecoration(
-                                  color: Colors.black.withValues(alpha: 0.45),
-                                  borderRadius: BorderRadius.circular(6),
-                                ),
-                                alignment: Alignment.center,
-                                child: Text('+${note.images.length - 3}',
-                                    style: const TextStyle(fontSize: 13, color: Colors.white, fontWeight: FontWeight.w600)),
-                              ),
-                            ),
-                        ],
+                  if (note.isPinned)
+                    Padding(
+                      padding: const EdgeInsets.only(right: 4),
+                      child: Icon(Icons.push_pin, size: 14, color: colors.primary),
+                    ),
+                  Expanded(
+                    child: Text(
+                      note.title,
+                      style: TextStyle(
+                        fontSize: 15,
+                        fontWeight: FontWeight.w600,
+                        color: colors.onSurface,
+                        height: 1.3,
+                      ),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                  const SizedBox(width: 12),
+                  Text(
+                    _formatDate(note.createdAt),
+                    style: TextStyle(
+                      fontSize: 11,
+                      color: colors.onSurface.withValues(alpha: 0.35),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+
+            // 内容预览（无标题时才显示置顶和时间，替换原本只有置顶的逻辑）
+            if (previewText.isNotEmpty) ...[
+              const SizedBox(height: 6),
+              if (note.title.isEmpty)
+                Row(
+                  children: [
+                    if (note.isPinned)
+                      Padding(
+                        padding: const EdgeInsets.only(right: 4),
+                        child: Icon(Icons.push_pin, size: 14, color: colors.primary),
+                      ),
+                    const Spacer(),
+                    Text(
+                      _formatDate(note.createdAt),
+                      style: TextStyle(
+                        fontSize: 11,
+                        color: colors.onSurface.withValues(alpha: 0.35),
                       ),
                     ),
                   ],
-                ],
+                ),
+              if (note.title.isEmpty)
+                const SizedBox(height: 2),
+              Text(
+                previewText,
+                style: TextStyle(
+                  fontSize: 13,
+                  color: colors.onSurface.withValues(alpha: 0.5),
+                  height: 1.5,
+                ),
+                maxLines: 3,
+                overflow: TextOverflow.ellipsis,
               ),
             ],
 
+            // 标签（换行显示）
             if (note.tags.isNotEmpty) ...[
-              const SizedBox(height: 6),
+              const SizedBox(height: 8),
               Wrap(
                 spacing: 6,
                 runSpacing: 4,
                 children: note.tags.map((tag) {
                   return Container(
-                    padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 2),
+                    padding: const EdgeInsets.symmetric(
+                        horizontal: 7, vertical: 2),
                     decoration: BoxDecoration(
                       color: colors.surface,
                       borderRadius: BorderRadius.circular(4),
@@ -173,37 +146,82 @@ class _NoteListItemContent extends StatelessWidget {
     );
   }
 
+  String _getPreviewText(Note note) {
+    return _collapseBlankLines(_cleanMarkdown(note.content).trim());
+  }
+
   void _showActions(BuildContext context) {
     final colors = Theme.of(context).colorScheme;
     showModalBottomSheet(
       context: context,
       backgroundColor: colors.surface,
-      shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(16))),
+      shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.vertical(top: Radius.circular(16))),
       builder: (ctx) => Padding(
         padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
         child: Column(mainAxisSize: MainAxisSize.min, children: [
-          Container(width: 36, height: 4, decoration: BoxDecoration(color: colors.onSurface.withValues(alpha: 0.15), borderRadius: BorderRadius.circular(2))),
+          Container(
+              width: 36,
+              height: 4,
+              decoration: BoxDecoration(
+                  color: colors.onSurface.withValues(alpha: 0.15),
+                  borderRadius: BorderRadius.circular(2))),
           const SizedBox(height: 16),
           ListTile(
             contentPadding: EdgeInsets.zero,
-            leading: Container(width: 36, height: 36, decoration: BoxDecoration(color: colors.surfaceContainerHighest, borderRadius: BorderRadius.circular(10)),
-                child: Icon(note.isPinned ? Icons.push_pin_outlined : Icons.push_pin, size: 20, color: colors.onSurface.withValues(alpha: 0.6))),
-            title: Text(note.isPinned ? '取消置顶' : '置顶', style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: colors.onSurface)),
-            subtitle: Text(note.isPinned ? '取消置顶后按时间排序' : '置顶后始终显示在最前', style: TextStyle(fontSize: 11, color: colors.onSurface.withValues(alpha: 0.4))),
-            trailing: Icon(Icons.chevron_right, color: colors.onSurface.withValues(alpha: 0.25)),
+            leading: Container(
+                width: 36,
+                height: 36,
+                decoration: BoxDecoration(
+                    color: colors.surfaceContainerHighest,
+                    borderRadius: BorderRadius.circular(10)),
+                child: Icon(
+                    note.isPinned
+                        ? Icons.push_pin_outlined
+                        : Icons.push_pin,
+                    size: 20,
+                    color: colors.onSurface.withValues(alpha: 0.6))),
+            title: Text(note.isPinned ? '取消置顶' : '置顶',
+                style: TextStyle(
+                    fontSize: 13,
+                    fontWeight: FontWeight.w500,
+                    color: colors.onSurface)),
+            subtitle: Text(
+                note.isPinned ? '取消置顶后按时间排序' : '置顶后始终显示在最前',
+                style: TextStyle(
+                    fontSize: 11,
+                    color: colors.onSurface.withValues(alpha: 0.4))),
+            trailing: Icon(Icons.chevron_right,
+                color: colors.onSurface.withValues(alpha: 0.25)),
             onTap: () {
               Navigator.pop(ctx);
-              context.read<AppProvider>().toggleNotePin(note.id, !note.isPinned);
+              context
+                  .read<AppProvider>()
+                  .toggleNotePin(note.id, !note.isPinned);
             },
           ),
           Divider(height: 0.5, color: colors.outlineVariant),
           ListTile(
             contentPadding: EdgeInsets.zero,
-            leading: Container(width: 36, height: 36, decoration: BoxDecoration(color: colors.surfaceContainerHighest, borderRadius: BorderRadius.circular(10)),
-                child: Icon(Icons.delete_outline, size: 20, color: colors.error)),
-            title: Text('删除', style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: colors.error)),
-            subtitle: Text('删除后可在回收站恢复', style: TextStyle(fontSize: 11, color: colors.onSurface.withValues(alpha: 0.4))),
-            trailing: Icon(Icons.chevron_right, color: colors.onSurface.withValues(alpha: 0.25)),
+            leading: Container(
+                width: 36,
+                height: 36,
+                decoration: BoxDecoration(
+                    color: colors.surfaceContainerHighest,
+                    borderRadius: BorderRadius.circular(10)),
+                child: Icon(Icons.delete_outline,
+                    size: 20, color: colors.error)),
+            title: Text('删除',
+                style: TextStyle(
+                    fontSize: 13,
+                    fontWeight: FontWeight.w500,
+                    color: colors.error)),
+            subtitle: Text('删除后可在回收站恢复',
+                style: TextStyle(
+                    fontSize: 11,
+                    color: colors.onSurface.withValues(alpha: 0.4))),
+            trailing: Icon(Icons.chevron_right,
+                color: colors.onSurface.withValues(alpha: 0.25)),
             onTap: () {
               Navigator.pop(ctx);
               _showDeleteConfirm(context);
@@ -220,26 +238,44 @@ class _NoteListItemContent extends StatelessWidget {
     showDialog(
       context: context,
       builder: (ctx) => AlertDialog(
-        backgroundColor: colors.surface, elevation: 0,
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
-        title: Text('确认删除', style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: colors.onSurface)),
+        backgroundColor: colors.surface,
+        elevation: 0,
+        shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(12)),
+        title: Text('确认删除',
+            style: TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.w600,
+                color: colors.onSurface)),
         content: Text('确定要删除这条笔记吗？删除后可在回收站恢复。',
-            style: TextStyle(fontSize: 14, color: colors.onSurface.withValues(alpha: 0.6), height: 1.5)),
+            style: TextStyle(
+                fontSize: 14,
+                color: colors.onSurface.withValues(alpha: 0.6),
+                height: 1.5)),
         actions: [
-          TextButton(onPressed: () => Navigator.pop(ctx),
-            child: Text('取消', style: TextStyle(color: colors.onSurface.withValues(alpha: 0.6)))),
+          TextButton(
+              onPressed: () => Navigator.pop(ctx),
+              child: Text('取消',
+                  style: TextStyle(
+                      color: colors.onSurface.withValues(alpha: 0.6)))),
           ElevatedButton(
             onPressed: () async {
               await context.read<AppProvider>().removeNote(note.id);
               Navigator.pop(ctx);
             },
-            style: ElevatedButton.styleFrom(backgroundColor: colors.error, foregroundColor: colors.onError, elevation: 0,
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
-                padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8)),
+            style: ElevatedButton.styleFrom(
+                backgroundColor: colors.error,
+                foregroundColor: colors.onError,
+                elevation: 0,
+                shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(8)),
+                padding: const EdgeInsets.symmetric(
+                    horizontal: 16, vertical: 8)),
             child: const Text('删除'),
           ),
         ],
-        actionsPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+        actionsPadding:
+            const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
       ),
     );
   }