顶部tab栏优化

README.md

@@ -88,8 +88,8 @@ lib/
 
 ## 数据存储
 
-- **数据库**：`/mooknote/mooknote.db`
+- **数据存储位置**：`/mooknote/mooknote.db`
-- **图片**：`/mooknote/images/<类别>/<条目ID>/<文件名>`
+- **图片存储位置**：`/mooknote/images/<类别>/<条目ID>/<文件名>`
   - 类别：`movie` / `book` / `note`
 
 ## 环境要求

lib/pages/tag_management_page.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../providers/app_provider.dart';
@@ -19,6 +20,8 @@ class _TagManagementPageState extends State<TagManagementPage> {
   static const _typeIcons = [Icons.movie_outlined, Icons.menu_book_outlined, Icons.note_outlined];
 
   final Map<String, List<Map<String, dynamic>>> _tagCache = {};
+  Map<String, int> _usageCounts = {};
+  String? _newlyAddedTagId;
 
   @override
   void initState() {
@@ -26,6 +29,35 @@ class _TagManagementPageState extends State<TagManagementPage> {
     _loadTags(_tabTypes[0]);
   }
 
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _updateUsageCounts();
+  }
+
+  void _updateUsageCounts() {
+    final provider = context.read<AppProvider>();
+    final counts = <String, int>{};
+
+    for (final m in provider.movies.where((m) => !m.isDeleted)) {
+      for (final g in m.genres) {
+        counts[g] = (counts[g] ?? 0) + 1;
+      }
+    }
+    for (final b in provider.books.where((b) => !b.isDeleted)) {
+      for (final g in b.genres) {
+        counts[g] = (counts[g] ?? 0) + 1;
+      }
+    }
+    for (final n in provider.notes.where((n) => !n.isDeleted)) {
+      for (final t in n.tags) {
+        counts[t] = (counts[t] ?? 0) + 1;
+      }
+    }
+
+    _usageCounts = counts;
+  }
+
   Future<void> _loadTags(String type) async {
     final provider = context.read<AppProvider>();
     final tags = await provider.getTags(type);
@@ -40,44 +72,26 @@ class _TagManagementPageState extends State<TagManagementPage> {
       if (mounted) {
         ToastUtil.show(context, count > 0 ? '已同步 $count 个新标签' : '标签已是最新');
         await _loadTags(_currentType);
+        _updateUsageCounts();
       }
     } finally {
       if (mounted) setState(() => _isSyncing = false);
     }
   }
 
+  void _onTabChanged(int index) {
+    setState(() => _currentIndex = index);
+    _loadTags(_tabTypes[index]);
+  }
+
   String get _currentType => _tabTypes[_currentIndex];
 
-  Map<String, int> _getTagUsageCounts(String type) {
+  int get _activeTagCount {
-    final provider = context.read<AppProvider>();
+    return (_tagCache[_currentType] ?? []).where((t) => (_usageCounts[t['name']] ?? 0) > 0).length;
-    final counts = <String, int>{};
-
-    switch (type) {
-      case 'movie_genre':
-        for (final m in provider.movies.where((m) => !m.isDeleted)) {
-          for (final g in m.genres) {
-            counts[g] = (counts[g] ?? 0) + 1;
-          }
-        }
-        break;
-      case 'book_genre':
-        for (final b in provider.books) {
-          for (final g in b.genres) {
-            counts[g] = (counts[g] ?? 0) + 1;
-          }
-        }
-        break;
-      case 'note_tag':
-        for (final n in provider.notes.where((n) => !n.isDeleted)) {
-          for (final t in n.tags) {
-            counts[t] = (counts[t] ?? 0) + 1;
-          }
-        }
-        break;
-    }
-    return counts;
   }
 
+  // ─── build ─────────────────────────────────────────────────────────────
+
   @override
   Widget build(BuildContext context) {
     final colors = Theme.of(context).colorScheme;
@@ -85,6 +99,16 @@ class _TagManagementPageState extends State<TagManagementPage> {
       backgroundColor: colors.surfaceContainerHigh,
       appBar: AppBar(
         title: const Text('标签管理'),
+        bottom: PreferredSize(
+          preferredSize: const Size.fromHeight(20),
+          child: Padding(
+            padding: const EdgeInsets.only(bottom: 10),
+            child: Text(
+              '共 ${(_tagCache[_currentType] ?? []).length} 个标签 · 已使用 $_activeTagCount 个',
+              style: TextStyle(fontSize: 12, color: colors.onSurface.withValues(alpha: 0.3)),
+            ),
+          ),
+        ),
         actions: [
           _isSyncing
               ? Padding(
@@ -104,7 +128,14 @@ class _TagManagementPageState extends State<TagManagementPage> {
           const SizedBox(height: 12),
           _buildTabSelector(),
           const SizedBox(height: 16),
-          Expanded(child: _buildTagList(_currentType)),
+          Expanded(
+            child: AnimatedSwitcher(
+              duration: const Duration(milliseconds: 200),
+              switchInCurve: Curves.easeOut,
+              switchOutCurve: Curves.easeIn,
+              child: _buildTagList(_currentType),
+            ),
+          ),
         ],
       ),
       floatingActionButton: GestureDetector(
@@ -132,6 +163,8 @@ class _TagManagementPageState extends State<TagManagementPage> {
     );
   }
 
+  // ─── Tab 选择器 ─────────────────────────────────────────────────────────
+
   Widget _buildTabSelector() {
     final colors = Theme.of(context).colorScheme;
     return Container(
@@ -149,8 +182,8 @@ class _TagManagementPageState extends State<TagManagementPage> {
             child: Stack(
               children: [
                 AnimatedPositioned(
-                  duration: const Duration(milliseconds: 600),
+                  duration: const Duration(milliseconds: 200),
-                  curve: Curves.elasticOut,
+                  curve: Curves.easeInOut,
                   left: _currentIndex * tabWidth,
                   top: 0, bottom: 0, width: tabWidth,
                   child: Padding(
@@ -173,16 +206,18 @@ class _TagManagementPageState extends State<TagManagementPage> {
                     return Expanded(
                       child: GestureDetector(
                         behavior: HitTestBehavior.opaque,
-                        onTap: () {
+                        onTap: () => _onTabChanged(i),
-                          setState(() => _currentIndex = i);
+                        child: AnimatedOpacity(
-                          _loadTags(_tabTypes[i]);
+                          opacity: selected ? 1.0 : 0.4,
-                        },
+                          duration: const Duration(milliseconds: 200),
-                        child: Container(
+                          curve: Curves.easeInOut,
-                          height: double.infinity,
+                          child: Container(
-                          alignment: Alignment.center,
+                            height: double.infinity,
-                          child: Text(_typeLabels[i],
+                            alignment: Alignment.center,
-                              style: TextStyle(fontSize: 13, fontWeight: selected ? FontWeight.w600 : FontWeight.w500,
+                            child: Text(_typeLabels[i],
-                                  color: selected ? colors.onSurface : colors.onSurface.withValues(alpha: 0.4))),
+                                style: TextStyle(fontSize: 13, fontWeight: selected ? FontWeight.w600 : FontWeight.w500,
+                                    color: colors.onSurface)),
+                          ),
                         ),
                       ),
                     );
@@ -196,10 +231,10 @@ class _TagManagementPageState extends State<TagManagementPage> {
     );
   }
 
+  // ─── 标签列表 ──────────────────────────────────────────────────────────
+
   Widget _buildTagList(String type) {
-    final colors = Theme.of(context).colorScheme;
     final tags = _tagCache[type] ?? [];
-    final usageCounts = _getTagUsageCounts(type);
 
     if (tags.isEmpty) {
       return _buildEmptyState(type);
@@ -207,83 +242,72 @@ class _TagManagementPageState extends State<TagManagementPage> {
 
     final sorted = List<Map<String, dynamic>>.from(tags)
       ..sort((a, b) {
-        final ca = usageCounts[a['name']] ?? 0;
+        final ca = _usageCounts[a['name']] ?? 0;
-        final cb = usageCounts[b['name']] ?? 0;
+        final cb = _usageCounts[b['name']] ?? 0;
         return cb.compareTo(ca);
       });
 
     return Padding(
+      key: ValueKey(type),
       padding: const EdgeInsets.symmetric(horizontal: 20),
-      child: Column(
+      child: SingleChildScrollView(
-        crossAxisAlignment: CrossAxisAlignment.start,
+        padding: const EdgeInsets.only(bottom: 80),
+        child: Wrap(
+          spacing: 10,
+          runSpacing: 10,
+          children: sorted.map((tag) => _buildTagChip(tag)).toList(),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTagChip(Map<String, dynamic> tag) {
+    final colors = Theme.of(context).colorScheme;
+    final name = tag['name'] as String;
+    final count = _usageCounts[name] ?? 0;
+    final tagId = tag['id'] as String;
+    final isNew = tagId == _newlyAddedTagId;
+
+    return GestureDetector(
+      key: ValueKey(tagId),
+      onTap: () => _showTagMenu(tag),
+      onLongPress: () => _showTagMenu(tag),
+      child: isNew
+          ? _NewTagHighlight(
+              child: _tagChipContent(name, count, colors),
+            )
+          : _tagChipContent(name, count, colors),
+    );
+  }
+
+  Widget _tagChipContent(String name, int count, ColorScheme colors) {
+    return Container(
+      padding: const EdgeInsets.only(left: 14, right: 10, top: 8, bottom: 8),
+      decoration: BoxDecoration(
+        color: colors.surface,
+        borderRadius: BorderRadius.circular(20),
+        boxShadow: [
+          BoxShadow(color: Colors.black.withValues(alpha: 0.03), blurRadius: 4, offset: const Offset(0, 2)),
+        ],
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
         children: [
-          Padding(
+          Text(name, style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: colors.onSurface)),
-            padding: const EdgeInsets.only(bottom: 12),
+          if (count > 0) ...[
-            child: Row(
+            const SizedBox(width: 6),
-              children: [
+            Container(
-                Text('共 ${tags.length} 个标签', style: TextStyle(fontSize: 12, color: colors.onSurface.withValues(alpha: 0.3))),
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-                const Spacer(),
+              decoration: BoxDecoration(color: colors.outlineVariant, borderRadius: BorderRadius.circular(8)),
-                Text('已使用 ${usageCounts.length} 个', style: TextStyle(fontSize: 12, color: colors.onSurface.withValues(alpha: 0.2))),
+              child: Text('$count', style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, color: colors.onSurface.withValues(alpha: 0.4))),
-              ],
             ),
-          ),
+          ],
-          Expanded(
-            child: SingleChildScrollView(
-              padding: const EdgeInsets.only(bottom: 80),
-              child: Wrap(
-                spacing: 10,
-                runSpacing: 10,
-                children: sorted.map((tag) => _buildTagChip(tag, usageCounts)).toList(),
-              ),
-            ),
-          ),
         ],
       ),
     );
   }
 
-  Widget _buildTagChip(Map<String, dynamic> tag, Map<String, int> usageCounts) {
+  // ─── 新标签高亮动画 ─────────────────────────────────────────────────────
-    final colors = Theme.of(context).colorScheme;
-    final name = tag['name'] as String;
-    final count = usageCounts[name] ?? 0;
-
-    return GestureDetector(
-      onLongPress: () => _showRenameDialog(tag),
-      child: Container(
-        padding: const EdgeInsets.only(left: 14, right: 6, top: 8, bottom: 8),
-        decoration: BoxDecoration(
-          color: colors.surface,
-          borderRadius: BorderRadius.circular(20),
-          boxShadow: [
-            BoxShadow(color: Colors.black.withValues(alpha: 0.03), blurRadius: 4, offset: const Offset(0, 2)),
-          ],
-        ),
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Text(name, style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: colors.onSurface)),
-            if (count > 0) ...[
-              const SizedBox(width: 6),
-              Container(
-                padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-                decoration: BoxDecoration(color: colors.outlineVariant, borderRadius: BorderRadius.circular(8)),
-                child: Text('$count', style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, color: colors.onSurface.withValues(alpha: 0.4))),
-              ),
-            ],
-            const SizedBox(width: 4),
-            GestureDetector(
-              onTap: () => _showDeleteDialog(tag),
-              child: Container(
-                width: 22, height: 22,
-                decoration: BoxDecoration(color: colors.outlineVariant, borderRadius: BorderRadius.circular(11)),
-                child: Icon(Icons.close, size: 12, color: colors.onSurface.withValues(alpha: 0.4)),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
 
   Widget _buildEmptyState(String type) {
     final colors = Theme.of(context).colorScheme;
@@ -293,6 +317,7 @@ class _TagManagementPageState extends State<TagManagementPage> {
     final hints = ['同步或手动添加影视类型', '同步或手动添加书籍类型', '同步或手动添加笔记标签'];
 
     return Center(
+      key: ValueKey('empty_$type'),
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
@@ -311,6 +336,73 @@ class _TagManagementPageState extends State<TagManagementPage> {
     );
   }
 
+  // ─── 标签操作菜单 ───────────────────────────────────────────────────────
+
+  void _showTagMenu(Map<String, dynamic> tag) {
+    final colors = Theme.of(context).colorScheme;
+    final name = tag['name'] as String;
+
+    showModalBottomSheet(
+      context: context,
+      backgroundColor: colors.surface,
+      shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(20))),
+      builder: (ctx) {
+        return SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.fromLTRB(20, 8, 20, 24),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Center(child: Container(
+                  width: 40, height: 4, margin: const EdgeInsets.only(bottom: 20),
+                  decoration: BoxDecoration(color: colors.onSurface.withValues(alpha: 0.15), borderRadius: BorderRadius.circular(2)),
+                )),
+                Container(
+                  width: double.infinity,
+                  padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
+                  decoration: BoxDecoration(color: colors.surfaceContainerHighest, borderRadius: BorderRadius.circular(12)),
+                  child: Text(name, style: TextStyle(fontSize: 15, fontWeight: FontWeight.w600, color: colors.onSurface)),
+                ),
+                const SizedBox(height: 16),
+                _menuAction(Icons.edit_outlined, '重命名', colors, () {
+                  Navigator.pop(ctx);
+                  _showRenameDialog(tag);
+                }),
+                _menuAction(Icons.delete_outline, '删除', colors, () {
+                  Navigator.pop(ctx);
+                  _showDeleteDialog(tag);
+                }, isDestructive: true),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _menuAction(IconData icon, String title, ColorScheme colors, VoidCallback onTap, {bool isDestructive = false}) {
+    return InkWell(
+      onTap: onTap,
+      borderRadius: BorderRadius.circular(12),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 4),
+        child: Row(
+          children: [
+            Icon(icon, size: 20, color: isDestructive ? const Color(0xFFE53935) : colors.onSurface.withValues(alpha: 0.7)),
+            const SizedBox(width: 14),
+            Text(title, style: TextStyle(
+              fontSize: 15,
+              fontWeight: FontWeight.w500,
+              color: isDestructive ? const Color(0xFFE53935) : colors.onSurface,
+            )),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // ─── 添加标签 ──────────────────────────────────────────────────────────
+
   void _showAddDialog() {
     final colors = Theme.of(context).colorScheme;
     final controller = TextEditingController();
@@ -360,18 +452,25 @@ class _TagManagementPageState extends State<TagManagementPage> {
   Future<void> _doAddTag(BuildContext ctx, String name, String type) async {
     if (name.isEmpty) return;
     try {
-      await context.read<AppProvider>().addTag(name, type);
+      final provider = context.read<AppProvider>();
+      final newId = await provider.addTag(name, type);
+      if (!mounted) return;
+      if (ctx.mounted) {
+        Navigator.pop(ctx);
+        ToastUtil.show(context, '添加成功');
+      }
+      setState(() => _newlyAddedTagId = newId);
+      Timer(const Duration(milliseconds: 1500), () {
+        if (mounted) setState(() => _newlyAddedTagId = null);
+      });
+      await _loadTags(type);
     } catch (e) {
       if (ctx.mounted) ToastUtil.show(ctx, '添加失败：该标签已存在');
-      return;
     }
-    if (ctx.mounted) {
-      Navigator.pop(ctx);
-      ToastUtil.show(context, '添加成功');
-    }
-    await _loadTags(type);
   }
 
+  // ─── 重命名 ────────────────────────────────────────────────────────────
+
   void _showRenameDialog(Map<String, dynamic> tag) {
     final colors = Theme.of(context).colorScheme;
     final controller = TextEditingController(text: tag['name'] as String);
@@ -432,13 +531,15 @@ class _TagManagementPageState extends State<TagManagementPage> {
     if (success) await _loadTags(type);
   }
 
+  // ─── 删除标签（简化版：默认仅删除标签，高级选项可展开） ─────────────────────
+
   void _showDeleteDialog(Map<String, dynamic> tag) {
-    final colors = Theme.of(context).colorScheme;
     final tagId = tag['id'] as String;
     final type = tag['type'] as String;
     final name = tag['name'] as String;
-    String? selectedAction = 'remove';
+    String? selectedAction = 'deleteOnly';
-    final replacementController = TextEditingController();
+    String? selectedReplacement;
+    bool showAdvanced = false;
 
     final otherTags = (_tagCache[type] ?? [])
         .where((t) => t['id'] != tagId)
@@ -448,112 +549,144 @@ class _TagManagementPageState extends State<TagManagementPage> {
     showDialog(
       context: context,
       builder: (ctx) => StatefulBuilder(
-        builder: (ctx, setDialogState) => AlertDialog(
+        builder: (ctx, setDialogState) {
-          backgroundColor: colors.surface,
+          final bc = Theme.of(ctx).colorScheme;
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+          return AlertDialog(
-          title: Row(
+            backgroundColor: bc.surface,
-            children: [
+            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-              Container(
+            title: Row(
-                padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+              children: [
-                decoration: BoxDecoration(color: colors.surfaceContainerHighest, borderRadius: BorderRadius.circular(12)),
+                Container(
-                child: Text(name, style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: colors.onSurface.withValues(alpha: 0.6))),
+                  padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-              ),
+                  decoration: BoxDecoration(color: bc.surfaceContainerHighest, borderRadius: BorderRadius.circular(12)),
-              const SizedBox(width: 10),
+                  child: Text(name, style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: bc.onSurface.withValues(alpha: 0.6))),
-              Text('删除标签', style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: colors.onSurface)),
-            ],
-          ),
-          titlePadding: const EdgeInsets.fromLTRB(24, 24, 24, 0),
-          content: SizedBox(
-            width: double.maxFinite,
-            child: ConstrainedBox(
-              constraints: BoxConstraints(maxHeight: MediaQuery.of(ctx).size.height * 0.45),
-              child: SingleChildScrollView(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    const SizedBox(height: 4),
-                    Text('删除后对已有条目的影响：', style: TextStyle(fontSize: 13, color: colors.onSurface.withValues(alpha: 0.4))),
-                    const SizedBox(height: 12),
-                    _buildDeleteOption(value: 'remove', groupValue: selectedAction, onChanged: (v) => setDialogState(() => selectedAction = v), title: '从所有条目中移除该标签', subtitle: '标签将从影视/书籍/笔记中清除'),
-                    const SizedBox(height: 4),
-                    _buildDeleteOption(value: 'deleteOnly', groupValue: selectedAction, onChanged: (v) => setDialogState(() => selectedAction = v), title: '仅删除标签', subtitle: '保留已有条目上的标签名'),
-                    const SizedBox(height: 4),
-                    _buildDeleteOption(value: 'replace', groupValue: selectedAction, onChanged: (v) => setDialogState(() => selectedAction = v), title: '替换为其他标签'),
-                    if (selectedAction == 'replace')
-                      Padding(
-                        padding: const EdgeInsets.only(left: 40, top: 10),
-                        child: otherTags.isNotEmpty
-                            ? Wrap(
-                                spacing: 8, runSpacing: 8,
-                                children: otherTags.map((t) {
-                                  final isSelected = replacementController.text == t;
-                                  return GestureDetector(
-                                    onTap: () {
-                                      replacementController.text = isSelected ? '' : t;
-                                      setDialogState(() {});
-                                    },
-                                    child: Container(
-                                      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 7),
-                                      decoration: BoxDecoration(
-                                        color: isSelected ? colors.primary : colors.surfaceContainerHighest,
-                                        borderRadius: BorderRadius.circular(16),
-                                        border: Border.all(color: isSelected ? colors.primary : colors.outlineVariant, width: 0.5),
-                                      ),
-                                      child: Text(t, style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: isSelected ? colors.onPrimary : colors.onSurface.withValues(alpha: 0.7))),
-                                    ),
-                                  );
-                                }).toList(),
-                              )
-                            : Container(
-                                padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
-                                decoration: BoxDecoration(color: colors.surfaceContainerHigh, borderRadius: BorderRadius.circular(12)),
-                                child: Text('无其他标签可替换', style: TextStyle(fontSize: 13, color: colors.onSurface.withValues(alpha: 0.35))),
-                              ),
-                      ),
-                  ],
                 ),
-              ),
+                const SizedBox(width: 10),
+                Text('删除标签', style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: bc.onSurface)),
+              ],
             ),
-          ),
+            titlePadding: const EdgeInsets.fromLTRB(24, 24, 24, 0),
-          contentPadding: const EdgeInsets.fromLTRB(24, 16, 24, 0),
+            content: SizedBox(
-          actions: [
+              width: double.maxFinite,
-            TextButton(onPressed: () => Navigator.pop(ctx), child: Text('取消', style: TextStyle(color: colors.onSurface.withValues(alpha: 0.4)))),
+              child: ConstrainedBox(
-            Container(
+                constraints: BoxConstraints(maxHeight: MediaQuery.of(ctx).size.height * 0.45),
-              decoration: BoxDecoration(color: const Color(0xFFE53935), borderRadius: BorderRadius.circular(20)),
+                child: SingleChildScrollView(
-              child: Material(
+                  child: Column(
-                color: Colors.transparent,
+                    mainAxisSize: MainAxisSize.min,
-                child: InkWell(
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                  onTap: () {
+                    children: [
-                    String? replacement;
+                      const SizedBox(height: 4),
-                    if (selectedAction == 'replace') {
+                      // 默认选项
-                      replacement = replacementController.text.trim().isNotEmpty ? replacementController.text.trim() : null;
+                      _buildDeleteOption(
-                      if (replacement == null) return;
+                        value: 'deleteOnly',
-                    }
+                        groupValue: selectedAction,
-                    Navigator.pop(ctx, {'action': selectedAction, 'replacement': replacement});
+                        onChanged: (v) => setDialogState(() { selectedAction = v; selectedReplacement = null; }),
-                  },
+                        title: '仅删除标签',
-                  borderRadius: BorderRadius.circular(20),
+                        subtitle: '保留已有条目上的标签名，不影响数据',
-                  child: const Padding(
+                        colors: bc,
-                    padding: EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+                      ),
-                    child: Text('删除', style: TextStyle(fontSize: 14, color: Colors.white, fontWeight: FontWeight.w500)),
+                      const SizedBox(height: 8),
+                      // 展开/收起高级选项
+                      GestureDetector(
+                        onTap: () => setDialogState(() => showAdvanced = !showAdvanced),
+                        child: Row(
+                          children: [
+                            Text('更多选项', style: TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: bc.primary)),
+                            Icon(showAdvanced ? Icons.expand_less : Icons.expand_more, size: 16, color: bc.primary),
+                          ],
+                        ),
+                      ),
+                      if (showAdvanced) ...[
+                        const SizedBox(height: 10),
+                        _buildDeleteOption(
+                          value: 'remove',
+                          groupValue: selectedAction,
+                          onChanged: (v) => setDialogState(() { selectedAction = v; selectedReplacement = null; }),
+                          title: '从所有条目中移除',
+                          subtitle: '彻底清除该标签在所有条目中的记录',
+                          colors: bc,
+                        ),
+                        const SizedBox(height: 4),
+                        _buildDeleteOption(
+                          value: 'replace',
+                          groupValue: selectedAction,
+                          onChanged: (v) => setDialogState(() { selectedAction = v; selectedReplacement = null; }),
+                          title: '替换为其他标签',
+                          subtitle: '选择一个已有标签替代',
+                          colors: bc,
+                        ),
+                        if (selectedAction == 'replace')
+                          Padding(
+                            padding: const EdgeInsets.only(left: 40, top: 10),
+                            child: otherTags.isNotEmpty
+                                ? Wrap(
+                                    spacing: 8, runSpacing: 8,
+                                    children: otherTags.map((t) {
+                                      final isSelected = selectedReplacement == t;
+                                      return GestureDetector(
+                                        onTap: () => setDialogState(() => selectedReplacement = isSelected ? null : t),
+                                        child: Container(
+                                          padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 7),
+                                          decoration: BoxDecoration(
+                                            color: isSelected ? bc.primary : bc.surfaceContainerHighest,
+                                            borderRadius: BorderRadius.circular(16),
+                                            border: Border.all(color: isSelected ? bc.primary : bc.outlineVariant, width: 0.5),
+                                          ),
+                                          child: Text(t, style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500, color: isSelected ? bc.onPrimary : bc.onSurface.withValues(alpha: 0.7))),
+                                        ),
+                                      );
+                                    }).toList(),
+                                  )
+                                : Container(
+                                    padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
+                                    decoration: BoxDecoration(color: bc.surfaceContainerHigh, borderRadius: BorderRadius.circular(12)),
+                                    child: Text('无其他标签可替换', style: TextStyle(fontSize: 13, color: bc.onSurface.withValues(alpha: 0.35))),
+                                  ),
+                          ),
+                      ],
+                    ],
                   ),
                 ),
               ),
             ),
-          ],
+            contentPadding: const EdgeInsets.fromLTRB(24, 16, 24, 0),
-          actionsPadding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+            actions: [
-        ),
+              TextButton(onPressed: () => Navigator.pop(ctx), child: Text('取消', style: TextStyle(color: bc.onSurface.withValues(alpha: 0.4)))),
+              Container(
+                decoration: BoxDecoration(color: const Color(0xFFE53935), borderRadius: BorderRadius.circular(20)),
+                child: Material(
+                  color: Colors.transparent,
+                  child: InkWell(
+                    onTap: () {
+                      if (selectedAction == 'replace' && (selectedReplacement == null || selectedReplacement!.isEmpty)) return;
+                      Navigator.pop(ctx, {'action': selectedAction, 'replacement': selectedReplacement});
+                    },
+                    borderRadius: BorderRadius.circular(20),
+                    child: const Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+                      child: Text('删除', style: TextStyle(fontSize: 14, color: Colors.white, fontWeight: FontWeight.w500)),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+            actionsPadding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+          );
+        },
       ),
     ).then((result) async {
       if (result == null) return;
       final action = result['action'] as String;
       final replacement = result['replacement'] as String?;
+      if (!mounted) return;
+      final provider = context.read<AppProvider>();
       if (action == 'deleteOnly') {
-        await context.read<AppProvider>().deleteTagOnly(tagId, type);
+        await provider.deleteTagOnly(tagId, type);
       } else {
-        await context.read<AppProvider>().deleteTag(tagId, type, replacementName: replacement);
+        await provider.deleteTag(tagId, type, replacementName: replacement);
       }
-      if (mounted) ToastUtil.show(context, '删除成功');
+      if (!mounted) return;
+      ToastUtil.show(context, '删除成功');
       await _loadTags(type);
     });
   }
@@ -564,8 +697,8 @@ class _TagManagementPageState extends State<TagManagementPage> {
     required ValueChanged<String?> onChanged,
     required String title,
     String? subtitle,
+    required ColorScheme colors,
   }) {
-    final colors = Theme.of(context).colorScheme;
     final selected = value == groupValue;
     return GestureDetector(
       onTap: () => onChanged(value),
@@ -598,3 +731,55 @@ class _TagManagementPageState extends State<TagManagementPage> {
     );
   }
 }
+
+// ─── 新标签高亮动画 Widget ─────────────────────────────────────────────────
+
+class _NewTagHighlight extends StatefulWidget {
+  final Widget child;
+  const _NewTagHighlight({required this.child});
+
+  @override
+  State<_NewTagHighlight> createState() => _NewTagHighlightState();
+}
+
+class _NewTagHighlightState extends State<_NewTagHighlight> with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(vsync: this, duration: const Duration(milliseconds: 1500));
+    _controller.forward();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = Theme.of(context).colorScheme;
+    return AnimatedBuilder(
+      animation: _controller,
+      builder: (context, child) {
+        final opacity = _controller.value < 0.3
+            ? (_controller.value / 0.3).clamp(0.0, 1.0)
+            : (1.0 - (_controller.value - 0.3) / 0.7).clamp(0.0, 1.0);
+        final scale = 1.0 + 0.06 * (1.0 - _controller.value);
+        return Transform.scale(
+          scale: scale,
+          child: Container(
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(20),
+              color: colors.primary.withValues(alpha: 0.12 * opacity),
+              border: Border.all(color: colors.primary.withValues(alpha: 0.3 * opacity), width: 1),
+            ),
+            child: widget.child,
+          ),
+        );
+      },
+    );
+  }
+}

lib/widgets/book_status_bar.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../providers/app_provider.dart';
 
-/// 阅读状态选择栏 - 交叉渐变动画
+/// 阅读状态选择栏 - 平滑过渡动画
 class BookStatusBar extends StatelessWidget {
   const BookStatusBar({super.key});
 
@@ -11,6 +11,7 @@ class BookStatusBar extends StatelessWidget {
     final colors = Theme.of(context).colorScheme;
     return Consumer<AppProvider>(
       builder: (context, provider, child) {
+        final currentIndex = provider.bookStatusIndex;
         return Container(
           padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
           decoration: BoxDecoration(
@@ -23,13 +24,45 @@ class BookStatusBar extends StatelessWidget {
               color: colors.surfaceContainerHighest,
               borderRadius: BorderRadius.circular(24),
             ),
-            child: SizedBox(
+            child: LayoutBuilder(
-              height: 40,
+              builder: (context, constraints) {
-              child: Row(children: [
+                final tabWidth = constraints.maxWidth / 3;
-                _buildTab(colors, '已读', Icons.check_circle_outline, provider.bookStatusIndex == 0, () => provider.setBookStatusIndex(0)),
+                return SizedBox(
-                _buildTab(colors, '在读', Icons.menu_book_outlined, provider.bookStatusIndex == 1, () => provider.setBookStatusIndex(1)),
+                  height: 40,
-                _buildTab(colors, '想读', Icons.bookmark_outlined, provider.bookStatusIndex == 2, () => provider.setBookStatusIndex(2)),
+                  child: Stack(
-              ]),
+                    children: [
+                      AnimatedPositioned(
+                        duration: const Duration(milliseconds: 200),
+                        curve: Curves.easeInOut,
+                        left: currentIndex * tabWidth,
+                        top: 0, bottom: 0, width: tabWidth,
+                        child: Padding(
+                          padding: const EdgeInsets.all(3),
+                          child: Container(
+                            decoration: BoxDecoration(
+                              color: colors.primary,
+                              borderRadius: BorderRadius.circular(20),
+                              boxShadow: [
+                                BoxShadow(color: Colors.black.withValues(alpha: 0.1), blurRadius: 8, offset: const Offset(0, 2)),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                      Row(
+                        children: [
+                          _buildTab(colors, '已读', Icons.check_circle_outline, currentIndex == 0,
+                              () => provider.setBookStatusIndex(0)),
+                          _buildTab(colors, '在读', Icons.menu_book_outlined, currentIndex == 1,
+                              () => provider.setBookStatusIndex(1)),
+                          _buildTab(colors, '想读', Icons.bookmark_outlined, currentIndex == 2,
+                              () => provider.setBookStatusIndex(2)),
+                        ],
+                      ),
+                    ],
+                  ),
+                );
+              },
             ),
           ),
         );
@@ -42,38 +75,23 @@ class BookStatusBar extends StatelessWidget {
       child: GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: onTap,
-        child: AnimatedContainer(
+        child: AnimatedOpacity(
-          duration: const Duration(milliseconds: 400),
+          opacity: isSelected ? 1.0 : 0.5,
+          duration: const Duration(milliseconds: 200),
           curve: Curves.easeInOut,
-          margin: const EdgeInsets.all(3),
+          child: SizedBox.expand(
-          decoration: BoxDecoration(
-            color: isSelected ? colors.primary : Colors.transparent,
-            borderRadius: BorderRadius.circular(20),
-            boxShadow: isSelected ? [BoxShadow(color: Colors.black.withValues(alpha: 0.1), blurRadius: 8, offset: const Offset(0, 2))] : null,
-          ),
-          alignment: Alignment.center,
-          child: AnimatedDefaultTextStyle(
-            duration: const Duration(milliseconds: 400),
-            curve: Curves.easeInOut,
-            style: TextStyle(
-              fontSize: 13,
-              fontWeight: isSelected ? FontWeight.w600 : FontWeight.w500,
-              color: isSelected ? colors.onPrimary : colors.onSurface.withValues(alpha: 0.6),
-            ),
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               mainAxisSize: MainAxisSize.min,
               children: [
-                AnimatedSwitcher(
+                Icon(icon, size: 16, color: isSelected ? colors.onPrimary : colors.onSurface),
-                  duration: const Duration(milliseconds: 350),
-                  child: Icon(icon, key: ValueKey(isSelected), size: 16,
-                    color: isSelected ? colors.onPrimary : colors.onSurface.withValues(alpha: 0.6)),
-                ),
                 const SizedBox(width: 6),
-                AnimatedSwitcher(
+                Text(label,
-                  duration: const Duration(milliseconds: 350),
+                    style: TextStyle(
-                  child: Text(label, key: ValueKey('$label$isSelected')),
+                      fontSize: 13,
-                ),
+                      fontWeight: isSelected ? FontWeight.w600 : FontWeight.w500,
+                      color: isSelected ? colors.onPrimary : colors.onSurface,
+                    )),
               ],
             ),
           ),

lib/widgets/movie_status_bar.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../providers/app_provider.dart';
 
-/// 观影状态选择栏 - 交叉渐变动画
+/// 观影状态选择栏 - 平滑过渡动画
 class MovieStatusBar extends StatelessWidget {
   const MovieStatusBar({super.key});
 
@@ -11,6 +11,7 @@ class MovieStatusBar extends StatelessWidget {
     final colors = Theme.of(context).colorScheme;
     return Consumer<AppProvider>(
       builder: (context, provider, child) {
+        final currentIndex = provider.movieStatusIndex;
         return Container(
           padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
           decoration: BoxDecoration(
@@ -23,13 +24,45 @@ class MovieStatusBar extends StatelessWidget {
               color: colors.surfaceContainerHighest,
               borderRadius: BorderRadius.circular(24),
             ),
-            child: SizedBox(
+            child: LayoutBuilder(
-              height: 40,
+              builder: (context, constraints) {
-              child: Row(children: [
+                final tabWidth = constraints.maxWidth / 3;
-                _buildTab(colors, '已看', Icons.check_circle_outline, provider.movieStatusIndex == 0, () => provider.setMovieStatusIndex(0)),
+                return SizedBox(
-                _buildTab(colors, '在看', Icons.play_circle_outline, provider.movieStatusIndex == 1, () => provider.setMovieStatusIndex(1)),
+                  height: 40,
-                _buildTab(colors, '想看', Icons.bookmark_outline, provider.movieStatusIndex == 2, () => provider.setMovieStatusIndex(2)),
+                  child: Stack(
-              ]),
+                    children: [
+                      AnimatedPositioned(
+                        duration: const Duration(milliseconds: 200),
+                        curve: Curves.easeInOut,
+                        left: currentIndex * tabWidth,
+                        top: 0, bottom: 0, width: tabWidth,
+                        child: Padding(
+                          padding: const EdgeInsets.all(3),
+                          child: Container(
+                            decoration: BoxDecoration(
+                              color: colors.primary,
+                              borderRadius: BorderRadius.circular(20),
+                              boxShadow: [
+                                BoxShadow(color: Colors.black.withValues(alpha: 0.1), blurRadius: 8, offset: const Offset(0, 2)),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                      Row(
+                        children: [
+                          _buildTab(colors, '已看', Icons.check_circle_outline, currentIndex == 0,
+                              () => provider.setMovieStatusIndex(0)),
+                          _buildTab(colors, '在看', Icons.play_circle_outline, currentIndex == 1,
+                              () => provider.setMovieStatusIndex(1)),
+                          _buildTab(colors, '想看', Icons.bookmark_outline, currentIndex == 2,
+                              () => provider.setMovieStatusIndex(2)),
+                        ],
+                      ),
+                    ],
+                  ),
+                );
+              },
             ),
           ),
         );
@@ -42,38 +75,23 @@ class MovieStatusBar extends StatelessWidget {
       child: GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: onTap,
-        child: AnimatedContainer(
+        child: AnimatedOpacity(
-          duration: const Duration(milliseconds: 400),
+          opacity: isSelected ? 1.0 : 0.5,
+          duration: const Duration(milliseconds: 200),
           curve: Curves.easeInOut,
-          margin: const EdgeInsets.all(3),
+          child: SizedBox.expand(
-          decoration: BoxDecoration(
-            color: isSelected ? colors.primary : Colors.transparent,
-            borderRadius: BorderRadius.circular(20),
-            boxShadow: isSelected ? [BoxShadow(color: Colors.black.withValues(alpha: 0.1), blurRadius: 8, offset: const Offset(0, 2))] : null,
-          ),
-          alignment: Alignment.center,
-          child: AnimatedDefaultTextStyle(
-            duration: const Duration(milliseconds: 400),
-            curve: Curves.easeInOut,
-            style: TextStyle(
-              fontSize: 13,
-              fontWeight: isSelected ? FontWeight.w600 : FontWeight.w500,
-              color: isSelected ? colors.onPrimary : colors.onSurface.withValues(alpha: 0.6),
-            ),
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               mainAxisSize: MainAxisSize.min,
               children: [
-                AnimatedSwitcher(
+                Icon(icon, size: 16, color: isSelected ? colors.onPrimary : colors.onSurface),
-                  duration: const Duration(milliseconds: 350),
-                  child: Icon(icon, key: ValueKey(isSelected), size: 16,
-                    color: isSelected ? colors.onPrimary : colors.onSurface.withValues(alpha: 0.6)),
-                ),
                 const SizedBox(width: 6),
-                AnimatedSwitcher(
+                Text(label,
-                  duration: const Duration(milliseconds: 350),
+                    style: TextStyle(
-                  child: Text(label, key: ValueKey('$label$isSelected')),
+                      fontSize: 13,
-                ),
+                      fontWeight: isSelected ? FontWeight.w600 : FontWeight.w500,
+                      color: isSelected ? colors.onPrimary : colors.onSurface,
+                    )),
               ],
             ),
           ),