Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions lib/routing/router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,6 @@ GoRouter router(SettingsRepository settingsRepository) => GoRouter(
final title =
_getTitleForRoute(state.fullPath ?? state.matchedLocation);

// 检查是否为书签列表页面,需要显示FAB
final isBookmarkListRoute = [
Routes.dailyRead,
Routes.unarchived,
Routes.reading,
Routes.archived,
Routes.marked,
].contains(state.fullPath ?? state.matchedLocation);

// 从设置页返回,跳转首页
if ((state.fullPath ?? state.matchedLocation) ==
Routes.settings) {
Expand All @@ -95,9 +86,22 @@ GoRouter router(SettingsRepository settingsRepository) => GoRouter(
);
}

// 书签列表页面不被 MainLayout 包装,它们自己管理 UI
final selfManagedRoutes = [
Routes.dailyRead,
Routes.unarchived,
Routes.reading,
Routes.archived,
Routes.marked,
];

if (selfManagedRoutes
.contains(state.fullPath ?? state.matchedLocation)) {
return child;
}

return MainLayout(
title: title,
showFab: isBookmarkListRoute,
child: child,
);
},
Expand Down
44 changes: 35 additions & 9 deletions lib/ui/bookmarks/widget/archived_screen.dart
Original file line number Diff line number Diff line change
@@ -1,22 +1,48 @@
import 'package:flutter/material.dart';
import 'package:readeck_app/ui/bookmarks/view_models/bookmarks_viewmodel.dart';
import 'package:readeck_app/ui/bookmarks/widget/bookmark_list_screen.dart';
import 'package:readeck_app/ui/core/main_layout.dart';

class ArchivedScreen extends StatelessWidget {
class ArchivedScreen extends StatefulWidget {
const ArchivedScreen({super.key, required this.viewModel});

final ArchivedViewmodel viewModel;

@override
State<ArchivedScreen> createState() => _ArchivedScreenState();
}

class _ArchivedScreenState extends State<ArchivedScreen> {
late final ScrollController _scrollController;

@override
void initState() {
super.initState();
_scrollController = ScrollController();
}

@override
void dispose() {
_scrollController.dispose();
super.dispose();
}

@override
Widget build(BuildContext context) {
return BookmarkListScreen(
viewModel: viewModel,
texts: const BookmarkListTexts(
loadingText: '正在加载已归档书签',
errorMessage: '已归档书签加载失败',
emptyIcon: Icons.archive_outlined,
emptyTitle: '暂无已归档书签',
emptySubtitle: '归档的书签将在这里显示',
return MainLayout(
title: '已归档',
showFab: true,
scrollController: _scrollController,
child: BookmarkListScreen(
viewModel: widget.viewModel,
scrollController: _scrollController,
texts: const BookmarkListTexts(
loadingText: '正在加载已归档书签',
errorMessage: '已归档书签加载失败',
emptyIcon: Icons.archive_outlined,
emptyTitle: '暂无已归档书签',
emptySubtitle: '归档的书签将在这里显示',
),
),
);
}
Expand Down
50 changes: 26 additions & 24 deletions lib/ui/bookmarks/widget/bookmark_list_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:readeck_app/ui/core/ui/loading.dart';
import 'package:readeck_app/ui/bookmarks/view_models/bookmarks_viewmodel.dart';
import 'package:readeck_app/utils/network_error_exception.dart';
import 'package:readeck_app/ui/core/ui/snack_bar_helper.dart';
import 'package:readeck_app/ui/core/main_layout.dart';

/// 书签列表页面的文案配置
class BookmarkListTexts {
Expand Down Expand Up @@ -45,10 +44,12 @@ class BookmarkListScreen<T extends BaseBookmarksViewmodel>
super.key,
required this.viewModel,
required this.texts,
this.scrollController,
});

final T viewModel;
final BookmarkListTexts texts;
final ScrollController? scrollController;

@override
State<BookmarkListScreen<T>> createState() => _BookmarkListScreenState<T>();
Expand All @@ -57,6 +58,7 @@ class BookmarkListScreen<T extends BaseBookmarksViewmodel>
class _BookmarkListScreenState<T extends BaseBookmarksViewmodel>
extends State<BookmarkListScreen<T>> {
ScrollController? _scrollController;
bool _ownsController = false;
late final ListenableSubscription _deleteSuccessSubscription;

@override
Expand Down Expand Up @@ -92,37 +94,37 @@ class _BookmarkListScreenState<T extends BaseBookmarksViewmodel>
void didChangeDependencies() {
super.didChangeDependencies();

// 只有在没有外部提供ScrollController时才创建自己的
// 使用外部提供的 ScrollController 或创建自己的(仅首次绑定)
if (_scrollController == null) {
_scrollController = ScrollController();
_scrollController?.addListener(_onScroll);

// 延迟到下一帧更新Provider,避免在build过程中触发rebuild
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) {
try {
final provider = context.read<ScrollControllerProvider?>();
provider?.setScrollController(_scrollController);
} catch (e) {
// 在测试环境中可能会失败,忽略
}
}
});
_scrollController = widget.scrollController ?? ScrollController();
_scrollController!.addListener(_onScroll);
_ownsController = widget.scrollController == null;
}
}

@override
void dispose() {
// 清除Provider中的ScrollController引用
try {
final provider = context.read<ScrollControllerProvider?>();
provider?.setScrollController(null);
} catch (e) {
// 在测试或context已失效时忽略错误
void didUpdateWidget(covariant BookmarkListScreen<T> oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.scrollController != widget.scrollController) {
// 解绑旧
_scrollController?.removeListener(_onScroll);
if (_ownsController) {
_scrollController?.dispose();
}
// 绑定新
_scrollController = widget.scrollController ?? ScrollController();
_ownsController = widget.scrollController == null;
_scrollController!.addListener(_onScroll);
}
}

@override
void dispose() {
_scrollController?.removeListener(_onScroll);
_scrollController?.dispose();
// 只有自己创建的 ScrollController 才需要 dispose
if (_ownsController) {
_scrollController?.dispose();
}
_deleteSuccessSubscription.cancel();
super.dispose();
}
Expand Down
44 changes: 35 additions & 9 deletions lib/ui/bookmarks/widget/marked_screen.dart
Original file line number Diff line number Diff line change
@@ -1,22 +1,48 @@
import 'package:flutter/material.dart';
import 'package:readeck_app/ui/bookmarks/view_models/bookmarks_viewmodel.dart';
import 'package:readeck_app/ui/bookmarks/widget/bookmark_list_screen.dart';
import 'package:readeck_app/ui/core/main_layout.dart';

class MarkedScreen extends StatelessWidget {
class MarkedScreen extends StatefulWidget {
const MarkedScreen({super.key, required this.viewModel});

final MarkedViewmodel viewModel;

@override
State<MarkedScreen> createState() => _MarkedScreenState();
}

class _MarkedScreenState extends State<MarkedScreen> {
late final ScrollController _scrollController;

@override
void initState() {
super.initState();
_scrollController = ScrollController();
}

@override
void dispose() {
_scrollController.dispose();
super.dispose();
}

@override
Widget build(BuildContext context) {
return BookmarkListScreen(
viewModel: viewModel,
texts: const BookmarkListTexts(
loadingText: '正在加载喜爱书签',
errorMessage: '喜爱书签加载失败',
emptyIcon: Icons.favorite_outline,
emptyTitle: '暂无喜爱书签',
emptySubtitle: '标记为喜爱的书签将在这里显示',
return MainLayout(
title: '标记喜爱',
showFab: true,
scrollController: _scrollController,
child: BookmarkListScreen(
viewModel: widget.viewModel,
scrollController: _scrollController,
texts: const BookmarkListTexts(
loadingText: '正在加载喜爱书签',
errorMessage: '喜爱书签加载失败',
emptyIcon: Icons.favorite_outline,
emptyTitle: '暂无喜爱书签',
emptySubtitle: '标记为喜爱的书签将在这里显示',
),
),
);
}
Expand Down
44 changes: 35 additions & 9 deletions lib/ui/bookmarks/widget/reading_screen.dart
Original file line number Diff line number Diff line change
@@ -1,22 +1,48 @@
import 'package:flutter/material.dart';
import 'package:readeck_app/ui/bookmarks/view_models/bookmarks_viewmodel.dart';
import 'package:readeck_app/ui/bookmarks/widget/bookmark_list_screen.dart';
import 'package:readeck_app/ui/core/main_layout.dart';

class ReadingScreen extends StatelessWidget {
class ReadingScreen extends StatefulWidget {
const ReadingScreen({super.key, required this.viewModel});

final ReadingViewmodel viewModel;

@override
State<ReadingScreen> createState() => _ReadingScreenState();
}

class _ReadingScreenState extends State<ReadingScreen> {
late final ScrollController _scrollController;

@override
void initState() {
super.initState();
_scrollController = ScrollController();
}

@override
void dispose() {
_scrollController.dispose();
super.dispose();
}

@override
Widget build(BuildContext context) {
return BookmarkListScreen(
viewModel: viewModel,
texts: const BookmarkListTexts(
loadingText: '正在加载阅读中书签',
errorMessage: '阅读中书签加载失败',
emptyIcon: Icons.auto_stories_outlined,
emptyTitle: '暂无阅读中书签',
emptySubtitle: '下拉刷新或去Readeck开始阅读书签',
return MainLayout(
title: '阅读中',
showFab: true,
scrollController: _scrollController,
child: BookmarkListScreen(
viewModel: widget.viewModel,
scrollController: _scrollController,
texts: const BookmarkListTexts(
loadingText: '正在加载阅读中书签',
errorMessage: '阅读中书签加载失败',
emptyIcon: Icons.auto_stories_outlined,
emptyTitle: '暂无阅读中书签',
emptySubtitle: '下拉刷新或去Readeck开始阅读书签',
),
),
);
}
Expand Down
44 changes: 35 additions & 9 deletions lib/ui/bookmarks/widget/unarchived_screen.dart
Original file line number Diff line number Diff line change
@@ -1,22 +1,48 @@
import 'package:flutter/material.dart';
import 'package:readeck_app/ui/bookmarks/view_models/bookmarks_viewmodel.dart';
import 'package:readeck_app/ui/bookmarks/widget/bookmark_list_screen.dart';
import 'package:readeck_app/ui/core/main_layout.dart';

class UnarchivedScreen extends StatelessWidget {
class UnarchivedScreen extends StatefulWidget {
const UnarchivedScreen({super.key, required this.viewModel});

final UnarchivedViewmodel viewModel;

@override
State<UnarchivedScreen> createState() => _UnarchivedScreenState();
}

class _UnarchivedScreenState extends State<UnarchivedScreen> {
late final ScrollController _scrollController;

@override
void initState() {
super.initState();
_scrollController = ScrollController();
}

@override
void dispose() {
_scrollController.dispose();
super.dispose();
}

@override
Widget build(BuildContext context) {
return BookmarkListScreen(
viewModel: viewModel,
texts: const BookmarkListTexts(
loadingText: '正在加载未归档书签',
errorMessage: '未归档书签加载失败',
emptyIcon: Icons.inbox_outlined,
emptyTitle: '暂无未归档书签',
emptySubtitle: '下拉刷新或去Readeck添加新的书签',
return MainLayout(
title: '未读',
showFab: true,
scrollController: _scrollController,
child: BookmarkListScreen(
viewModel: widget.viewModel,
scrollController: _scrollController,
texts: const BookmarkListTexts(
loadingText: '正在加载未归档书签',
errorMessage: '未归档书签加载失败',
emptyIcon: Icons.inbox_outlined,
emptyTitle: '暂无未归档书签',
emptySubtitle: '下拉刷新或去Readeck添加新的书签',
),
),
);
}
Expand Down
Loading