dellevin/MookNote
1
0
Fork 0
generated from dellevin/template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
DelLevin-Home
2026-06-30 15:12:11 +08:00
parent 0c7c39e641
commit 9fd80f83c8
30 changed files with 313 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lib/pages/book/book_detail_page.dart
View File

@@ -4,8 +4,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import '../../widgets/fade_in_local_image.dart';
import 'package:share_plus/share_plus.dart';
import 'package:cross_file/cross_file.dart';
import '../../providers/app_provider.dart';
import '../../models/data_models.dart';
import '../../utils/toast_util.dart';
@@ -335,27 +333,25 @@ class _BookDetailPageState extends State<BookDetailPage> {
required Color backgroundColor,
required Color foregroundColor,
}) {
return Material(
color: Colors.transparent,
child: Ink(
width: 40,
height: 40,
decoration: BoxDecoration(
color: backgroundColor,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: backgroundColor.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: IconButton(
icon: Icon(icon, size: 18, color: foregroundColor),
onPressed: onPressed,
padding: EdgeInsets.zero,
tooltip: tooltip,
return Tooltip(
message: tooltip,
child: GestureDetector(
onTap: onPressed,
child: Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: backgroundColor,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: backgroundColor.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Icon(icon, size: 18, color: foregroundColor),
),
),
);
@@ -1252,35 +1248,8 @@ class _BookDetailPageState extends State<BookDetailPage> {
);
}
Future<void> _downloadCover(Book book) async {
if (book.coverPath == null || book.coverPath!.isEmpty) {
ToastUtil.show(context, '没有可下载的封面');
return;
}
try {
final sourceFile = File(book.coverPath!);
if (!await sourceFile.exists()) {
ToastUtil.show(context, '封面文件不存在');
return;
}
final timestamp = DateTime.now().millisecondsSinceEpoch;
final fileName = '${book.title}_${timestamp}_封面.jpg';
final tempDir = await Directory.systemTemp.createTemp();
final tempFile = File('${tempDir.path}/$fileName');
await sourceFile.copy(tempFile.path);
await Share.shareXFiles(
[XFile(tempFile.path)],
subject: '${book.title} 封面',
text: '下载自 MookNote',
);
} catch (e) {
ToastUtil.show(context, '下载失败: $e');
}
}
void _showSharePoster(Book book) {
Navigator.push(

12
lib/pages/book/book_reviews_page.dart
View File

@@ -291,18 +291,6 @@ class _BookReviewsPageState extends State<BookReviewsPage> {
).then((_) => _loadReviews());
}
void _navigateToEditReview(BookReview review) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => BookReviewFormPage(
bookId: widget.book.id,
review: review,
),
),
).then((_) => _loadReviews());
}
void _navigateToReviewDetail(BookReview review) {
Navigator.push(
context,

32
lib/pages/epub_reader/reader_screen.dart
View File

@@ -10,7 +10,6 @@ import '../../utils/epub/epub_stream_service.dart';
import '../../utils/epub/epub_parser.dart';
import '../../utils/epub/reader_settings.dart';
import '../../utils/epub/reader_models.dart';
import '../../utils/epub/volume_control_service.dart';
import '../../utils/epub/reader_dao.dart';
import '../../utils/toast_util.dart';
import 'book_session.dart';
@@ -125,7 +124,6 @@ class _ReaderScreenState extends State<ReaderScreen>
final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
StreamSubscription<String>? volumeSubscription;
bool tocDrawerOpen = false;
bool styleDrawerOpen = false;
AppLifecycleState? lastLifecycleState = AppLifecycleState.resumed;
@@ -195,9 +193,6 @@ class _ReaderScreenState extends State<ReaderScreen>
progressDebouncer?.cancel();
removeFootnoteOverlay(animate: false);
restoreSystemUI();
volumeSubscription?.cancel();
VolumeControlService.disableInterception();
// 立即保存进度（同步写入，不被 dispose 打断）
bookSession.flushProgress(
currentChapterIndex: currentSpineItemIndex,
currentPageInChapter: currentPageInChapter,
@@ -221,31 +216,8 @@ class _ReaderScreenState extends State<ReaderScreen>
}
void setupVolumeControl() {
final resume = readerSettings.volumeKeyTurnsPage &&
!tocDrawerOpen &&
!styleDrawerOpen &&
lastLifecycleState == AppLifecycleState.resumed;
if (resume) {
VolumeControlService.enableInterception();
volumeSubscription ??= VolumeControlService.volumeKeyEvents.listen((
event,
) {
if (readerSettings.volumeKeyTurnsPage) {
if (footnoteOverlayEntry != null) {
removeFootnoteOverlay();
return;
}
if (event == 'up') {
rendererController.performPreviousPageTurn();
} else if (event == 'down') {
rendererController.performNextPageTurn();
}
}
});
} else {
VolumeControlService.disableInterception();
}
// VolumeControlService removed — native implementation never existed.
// TODO: reimplement if native volume-key interception is added.
}
void hideBottomNavigationBar() {

1
lib/pages/main_content_page.dart
View File

@@ -3,7 +3,6 @@ import 'package:provider/provider.dart';
import '../providers/app_provider.dart';
import '../utils/user_prefs.dart';
import '../utils/sync/webdav_service.dart';
import '../utils/toast_util.dart';
import 'movies/movie_tab_page.dart';
import 'book/book_tab_page.dart';
import 'note/note_tab_page.dart';

2
lib/pages/movies/douban_webview_page.dart
View File

@@ -15,7 +15,6 @@ class DoubanWebViewPage extends StatefulWidget {
class _DoubanWebViewPageState extends State<DoubanWebViewPage> {
late WebViewController _controller;
bool _isLoading = true;
bool _canExtract = false;
bool _isExtracting = false; // 防止重复提取
@override
@@ -47,7 +46,6 @@ class _DoubanWebViewPageState extends State<DoubanWebViewPage> {
if (mounted) {
setState(() {
_isLoading = false;
_canExtract = url.contains('douban.com/subject');
});
}
},

82
lib/pages/movies/movie_detail_page.dart
View File

@@ -3,16 +3,11 @@ import 'dart:ui' as ui;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:path_provider/path_provider.dart';
import 'package:path/path.dart' as path;
import '../../widgets/fade_in_local_image.dart';
import 'package:share_plus/share_plus.dart';
import 'package:cross_file/cross_file.dart';
import 'package:permission_handler/permission_handler.dart';
import '../../providers/app_provider.dart';
import '../../models/data_models.dart';
import '../../utils/toast_util.dart';
import '../../utils/user_prefs.dart';
import '../../utils/toast_util.dart';
import 'movie_reviews_page.dart';
import 'movie_posters_page.dart';
import 'movie_share_page.dart';
@@ -113,7 +108,7 @@ class _MovieDetailPageState extends State<MovieDetailPage> {
),
),
),
// 导航栏
// 详情页面的标准顶部导航栏
Positioned(
top: 0, left: 0, right: 0,
child: Container(
@@ -387,27 +382,25 @@ class _MovieDetailPageState extends State<MovieDetailPage> {
required Color backgroundColor,
required Color foregroundColor,
}) {
return Material(
color: Colors.transparent,
child: Ink(
width: 40,
height: 40,
decoration: BoxDecoration(
color: backgroundColor,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: backgroundColor.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: IconButton(
icon: Icon(icon, size: 18, color: foregroundColor),
onPressed: onPressed,
padding: EdgeInsets.zero,
tooltip: tooltip,
return Tooltip(
message: tooltip,
child: GestureDetector(
onTap: onPressed,
child: Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: backgroundColor,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: backgroundColor.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Icon(icon, size: 18, color: foregroundColor),
),
),
);
@@ -1184,11 +1177,15 @@ class _MovieDetailPageState extends State<MovieDetailPage> {
),
ElevatedButton(
onPressed: () async {
await context.read<AppProvider>().removeMovie(widget.movie.id);
final provider = context.read<AppProvider>();
await provider.removeMovie(widget.movie.id);
if (!mounted) return;
Navigator.pop(context);
Navigator.pop(context);
ToastUtil.show(context, '已删除');
final navigator = Navigator.of(context);
navigator.pop();
navigator.pop();
if (mounted) {
ToastUtil.show(context, '已删除');
}
},
style: ElevatedButton.styleFrom(
backgroundColor: colors.error,
@@ -1207,27 +1204,6 @@ class _MovieDetailPageState extends State<MovieDetailPage> {
);
}
Future<bool> _requestStoragePermission() async {
if (Platform.isAndroid) {
final sdkInt = await _getAndroidSdkInt();
if (sdkInt >= 33) {
final status = await Permission.photos.request();
return status.isGranted;
} else {
var status = await Permission.storage.request();
if (status.isDenied) {
status = await Permission.storage.request();
}
return status.isGranted;
}
}
return true;
}
Future<int> _getAndroidSdkInt() async {
return 30;
}
void _showSharePoster(Movie movie) {
Navigator.push(
context,

1
lib/pages/movies/movie_form_page.dart
View File

@@ -3,7 +3,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:image_picker/image_picker.dart';
import 'package:path_provider/path_provider.dart';
import 'package:path/path.dart' as p;
import 'package:provider/provider.dart';
import 'package:http/http.dart' as http;

3
lib/pages/movies/movie_posters_page.dart
View File

@@ -1,8 +1,6 @@
import 'dart:io';
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:image_picker/image_picker.dart';
import 'package:path_provider/path_provider.dart';
import 'package:path/path.dart' as p;
import 'package:provider/provider.dart';
import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
@@ -133,7 +131,6 @@ class _MoviePostersPageState extends State<MoviePostersPage> {
}
Widget _buildPosterItem(MoviePoster poster, int index) {
final colors = Theme.of(context).colorScheme;
// 根据索引生成不同的高度，实现瀑布流效果
final heights = [180.0, 220.0, 160.0, 200.0, 240.0, 190.0];
final height = heights[index % heights.length];

1
lib/pages/movies/movie_review_detail_page.dart
View File

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

1
lib/pages/movies/movie_review_form_page.dart
View File

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

12
lib/pages/movies/movie_reviews_page.dart
View File

@@ -291,18 +291,6 @@ class _MovieReviewsPageState extends State<MovieReviewsPage> {
).then((_) => _loadReviews());
}
void _navigateToEditReview(MovieReview review) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => MovieReviewFormPage(
movieId: widget.movie.id,
review: review,
),
),
).then((_) => _loadReviews());
}
void _navigateToReviewDetail(MovieReview review) {
Navigator.push(
context,

2
lib/pages/movies/movie_tab_page.dart
View File

@@ -80,8 +80,6 @@ class _MovieTabPageState extends State<MovieTabPage> {
}
}
String get _currentStatus => _statusMap[context.read<AppProvider>().movieStatusIndex] ?? 'watched';
Future<void> _loadFirst() async {
final provider = context.read<AppProvider>();
final statusIdx = provider.movieStatusIndex;

1
lib/pages/movies/poster_gallery_page.dart
View File

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

40
lib/pages/note/note_detail_page.dart
View File

@@ -335,27 +335,25 @@ class _NoteDetailPageState extends State<NoteDetailPage> {
required Color backgroundColor,
required Color foregroundColor,
}) {
return Material(
color: Colors.transparent,
child: Ink(
width: 40,
height: 40,
decoration: BoxDecoration(
color: backgroundColor,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: backgroundColor.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: IconButton(
icon: Icon(icon, size: 18, color: foregroundColor),
onPressed: onPressed,
padding: EdgeInsets.zero,
tooltip: tooltip,
return Tooltip(
message: tooltip,
child: GestureDetector(
onTap: onPressed,
child: Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: backgroundColor,
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: backgroundColor.withValues(alpha: 0.3),
blurRadius: 8,
offset: const Offset(0, 2),
),
],
),
child: Icon(icon, size: 18, color: foregroundColor),
),
),
);

1
lib/pages/note/note_share_page.dart
View File

@@ -1,5 +1,4 @@
import 'dart:io';
import 'dart:typed_data';
import 'dart:ui' as ui;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';

20
lib/pages/note/note_tab_page.dart
View File

@@ -209,20 +209,17 @@ class _NoteTabPageState extends State<NoteTabPage> {
'${date.year}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')} ${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
Widget _buildWaterfallView() {
final colors = Theme.of(context).colorScheme;
final leftItems = <Note>[];
final rightItems = <Note>[];
for (int i = 0; i < _items.length; i++) {
(i % 2 == 0 ? leftItems : rightItems).add(_items[i]);
}
return RefreshIndicator(onRefresh: _refresh, color: colors.primary, backgroundColor: colors.surface,
child: SingleChildScrollView(controller: _scrollController, padding: const EdgeInsets.fromLTRB(12, 8, 12, 100),
child: Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
Expanded(child: Column(children: [...leftItems.map(_buildWaterfallCard), if (_hasMore) _buildLoadMore()])),
const SizedBox(width: 8),
Expanded(child: Column(children: rightItems.map(_buildWaterfallCard).toList())),
]),
),
return SingleChildScrollView(controller: _scrollController, padding: const EdgeInsets.fromLTRB(12, 8, 12, 80),
child: Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
Expanded(child: Column(children: leftItems.map(_buildWaterfallCard).toList())),
const SizedBox(width: 8),
Expanded(child: Column(children: rightItems.map(_buildWaterfallCard).toList())),
]),
);
}
@@ -313,9 +310,10 @@ class _NoteTabPageState extends State<NoteTabPage> {
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: () {
onTap: () async {
Navigator.pop(ctx);
context.read<AppProvider>().toggleNotePin(note.id, !note.isPinned);
await context.read<AppProvider>().toggleNotePin(note.id, !note.isPinned);
_loadFirst();
},
),
Divider(height: 0.5, color: colors.outlineVariant),

1
lib/pages/online_search/search_page.dart
View File

@@ -201,7 +201,6 @@ class _SearchPageState extends State<SearchPage> {
}
Widget _buildFilterRow() {
final colors = Theme.of(context).colorScheme;
final keyword = _searchController.text.trim();
final provider = context.read<AppProvider>();
int movieCount = 0, bookCount = 0, noteCount = 0;

35
lib/pages/recycle_bin_page.dart
View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../providers/app_provider.dart';
import '../models/data_models.dart';
import '../models/note_plus_models.dart';
import '../utils/toast_util.dart';
/// 回收站页面
@@ -12,7 +13,7 @@ class RecycleBinPage extends StatefulWidget {
State<RecycleBinPage> createState() => _RecycleBinPageState();
}
enum _ItemType { movie, book, note, movieReview, bookReview }
enum _ItemType { movie, book, note, movieReview, bookReview, bookExcerpt, notePlus }
class _DeletedItem {
final _ItemType type;
@@ -61,6 +62,22 @@ class _DeletedItem {
subtitle = '删除于 ${r.updatedAt.year}.${r.updatedAt.month.toString().padLeft(2, '0')}.${r.updatedAt.day.toString().padLeft(2, '0')}',
icon = Icons.rate_review_outlined,
typeLabel = '书评';
_DeletedItem.bookExcerpt(BookExcerpt e)
: type = _ItemType.bookExcerpt,
id = e.id,
title = e.content.isNotEmpty ? e.content : '摘抄',
subtitle = '删除于 ${e.updatedAt.year}.${e.updatedAt.month.toString().padLeft(2, '0')}.${e.updatedAt.day.toString().padLeft(2, '0')}',
icon = Icons.format_quote_outlined,
typeLabel = '书摘';
_DeletedItem.notePlus(NotePlusDocument d)
: type = _ItemType.notePlus,
id = d.id,
title = d.title.isNotEmpty ? d.title : '未命名文档',
subtitle = '删除于 ${d.updatedAt.year}.${d.updatedAt.month.toString().padLeft(2, '0')}.${d.updatedAt.day.toString().padLeft(2, '0')}',
icon = Icons.edit_note_outlined,
typeLabel = '高级笔记';
}
class _RecycleBinPageState extends State<RecycleBinPage> {
@@ -85,6 +102,8 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
final notes = await provider.getDeletedNotes();
final movieReviews = await provider.getDeletedMovieReviews();
final bookReviews = await provider.getDeletedBookReviews();
final bookExcerpts = await provider.getDeletedBookExcerpts();
final notePlusDocs = await provider.getDeletedNotePlusDocs();
if (!mounted) return;
setState(() {
_allItems = [
@@ -93,6 +112,8 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
for (final n in notes) _DeletedItem.note(n),
for (final r in movieReviews) _DeletedItem.movieReview(r),
for (final r in bookReviews) _DeletedItem.bookReview(r),
for (final e in bookExcerpts) _DeletedItem.bookExcerpt(e),
for (final d in notePlusDocs) _DeletedItem.notePlus(d),
];
_isLoading = false;
});
@@ -166,6 +187,8 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
_filterChip('笔记', _ItemType.note),
_filterChip('影评', _ItemType.movieReview),
_filterChip('书评', _ItemType.bookReview),
_filterChip('书摘', _ItemType.bookExcerpt),
_filterChip('高级笔记', _ItemType.notePlus),
],
),
);
@@ -356,6 +379,12 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
case _ItemType.bookReview:
await provider.restoreBookReview(item.id);
if (mounted) ToastUtil.show(context, '书评已恢复');
case _ItemType.bookExcerpt:
await provider.restoreBookExcerpt(item.id);
if (mounted) ToastUtil.show(context, '书摘已恢复');
case _ItemType.notePlus:
await provider.restoreNotePlusDoc(item.id);
if (mounted) ToastUtil.show(context, '高级笔记已恢复');
}
_loadDeletedItems();
}
@@ -375,6 +404,10 @@ class _RecycleBinPageState extends State<RecycleBinPage> {
await provider.permanentDeleteMovieReview(item.id);
case _ItemType.bookReview:
await provider.permanentDeleteBookReview(item.id);
case _ItemType.bookExcerpt:
await provider.permanentDeleteBookExcerpt(item.id);
case _ItemType.notePlus:
await provider.permanentDeleteNotePlusDoc(item.id);
}
_loadDeletedItems();
if (mounted) ToastUtil.show(context, '已彻底删除');