nyne/venera
1
0
Fork 0
mirror of https://github.com/venera-app/venera.git synced 2025-09-27 07:47:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve history with grouped chapters.

Browse Source
This commit is contained in:
nyne
2025-02-20 19:16:26 +08:00
parent 011619340f
commit a63d458707
7 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pages/comic_details_page/chapters.dart
View File

@@ -286,8 +286,13 @@ class _GroupedComicChaptersState extends State<_GroupedComicChapters>
}
chapterIndex += chapters.getGroupByIndex(j).length;
}
bool visited =
(history?.readEpisode ?? {}).contains(chapterIndex + 1);
String rawIndex = (chapterIndex + 1).toString();
String groupedIndex = "${index + 1}-${i + 1}";
bool visited = false;
if (history != null) {
visited = history!.readEpisode.contains(groupedIndex) ||
history!.readEpisode.contains(rawIndex);
}
return Padding(
padding: const EdgeInsets.fromLTRB(6, 4, 6, 4),
child: Material(

13
lib/pages/comic_details_page/comic_page.dart
View File

@@ -167,6 +167,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
chapters: localComic.chapters,
initialPage: history?.page,
initialChapter: history?.ep,
initialChapterGroup: history?.group,
history: history ??
History.fromModel(
model: localComic,
@@ -383,11 +384,19 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
bool haveChapter = comic.chapters != null;
var page = history!.page;
var ep = history!.ep;
var group = history!.group;
String text;
if (haveChapter) {
var epName = group == null
? comic.chapters!.titles.elementAt(
math.min(ep - 1, comic.chapters!.length - 1),
)
: comic.chapters!
.getGroupByIndex(group - 1)
.values
.elementAt(ep - 1);
text = "Last Reading: @epName Page @page".tlParams({
'epName': comic.chapters!.titles.elementAt(
math.min(ep - 1, comic.chapters!.length - 1)),
'epName': epName,
'page': page,
});
} else {

1
lib/pages/reader/loading.dart
View File

@@ -33,6 +33,7 @@ class _ReaderWithLoadingState
history: data.history,
initialChapter: widget.initialEp ?? data.history.ep,
initialPage: widget.initialPage ?? data.history.page,
initialChapterGroup: data.history.group,
author: data.author,
tags: data.tags,
);

27
lib/pages/reader/reader.dart
View File

@@ -62,6 +62,7 @@ class Reader extends StatefulWidget {
required this.history,
this.initialPage,
this.initialChapter,
this.initialChapterGroup,
required this.author,
required this.tags,
});
@@ -84,6 +85,9 @@ class Reader extends StatefulWidget {
/// Starts from 1, invalid values equal to 1
final int? initialChapter;
/// Starts from 1, invalid values equal to 1
final int? initialChapterGroup;
final History history;
@override
@@ -147,13 +151,18 @@ class _ReaderState extends State<Reader> with _ReaderLocation, _ReaderWindow {
@override
void initState() {
page = widget.initialPage ?? 1;
chapter = widget.initialChapter ?? 1;
if (page < 1) {
page = 1;
}
chapter = widget.initialChapter ?? 1;
if (chapter < 1) {
chapter = 1;
}
if (widget.initialChapterGroup != null) {
for (int i=0; i<(widget.initialChapterGroup!-1); i++) {
chapter += widget.chapters!.getGroupByIndex(i).length;
}
}
if (widget.initialPage != null) {
page = (widget.initialPage! / imagesPerPage).ceil();
}
@@ -238,11 +247,23 @@ class _ReaderState extends State<Reader> with _ReaderLocation, _ReaderWindow {
void updateHistory() {
if (history != null) {
history!.page = page;
history!.ep = chapter;
if (maxPage > 1) {
history!.maxPage = maxPage;
}
history!.readEpisode.add(chapter);
if (widget.chapters?.isGrouped ?? false) {
int g = 0;
int c = chapter;
while (c > widget.chapters!.getGroupByIndex(g).length) {
c -= widget.chapters!.getGroupByIndex(g).length;
g++;
}
history!.readEpisode.add('${g + 1}-$c');
history!.ep = c;
history!.group = g+1;
} else {
history!.readEpisode.add(chapter.toString());
history!.ep = chapter;
}
history!.time = DateTime.now();
_updateHistoryTimer?.cancel();
_updateHistoryTimer = Timer(const Duration(seconds: 1), () {