Skip to content

fix(reader): keep completed loading progress full #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
everpcpc merged 2 commits into from
Jul 7, 2026
Merged

fix(reader): keep completed loading progress full #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01c8731
fix(reader): keep completed loading progress full
everpcpc Jul 7, 2026
0d94f7a
chore: incr build ver to 503
everpcpc Jul 7, 2026
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
8 changes: 4 additions & 4 deletions KMReader.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
"CODE_SIGN_ENTITLEMENTS[sdk=macosx*]" = "KMReader/KMReader-macOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 502;
CURRENT_PROJECT_VERSION = 503;
DEVELOPMENT_TEAM = M777UHWZA4;
ENABLE_APP_SANDBOX = YES;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -500,7 +500,7 @@
"CODE_SIGN_ENTITLEMENTS[sdk=macosx*]" = "KMReader/KMReader-macOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 502;
CURRENT_PROJECT_VERSION = 503;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=appletvos*]" = M777UHWZA4;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = M777UHWZA4;
Expand Down Expand Up @@ -560,7 +560,7 @@
CODE_SIGN_ENTITLEMENTS = KMReaderWidgets/KMReaderWidgets.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 502;
CURRENT_PROJECT_VERSION = 503;
DEVELOPMENT_TEAM = M777UHWZA4;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = KMReaderWidgets/Info.plist;
Expand Down Expand Up @@ -594,7 +594,7 @@
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 502;
CURRENT_PROJECT_VERSION = 503;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = M777UHWZA4;
GENERATE_INFOPLIST_FILE = YES;
Expand Down
2 changes: 2 additions & 0 deletions KMReader/Features/Reader/ViewModels/ReaderLoadingProgress.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
enum ReaderLoadingProgress {
static let complete = 1.0

static func displayValue(for progress: Double) -> Double {
let normalized = min(max(progress, 0), 1)
guard normalized > 0, normalized < 1 else { return normalized }
Expand Down
8 changes: 4 additions & 4 deletions KMReader/Features/Reader/ViewModels/ReaderViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ class ReaderViewModel {
let status = await OfflineManager.shared.getDownloadStatus(bookId: book.id)
if case .downloaded = status {
if updatesLoadingState {
clearLoadingProgress()
updateLoadingProgress(ReaderLoadingProgress.complete)
updateLoadingDetail(String(localized: "Using downloaded book files"))
}
return
Expand All @@ -853,7 +853,7 @@ class ReaderViewModel {
info: downloadInfo
)
case .downloaded:
clearLoadingProgress()
updateLoadingProgress(ReaderLoadingProgress.complete)
updateLoadingDetail(String(localized: "Using downloaded book files"))
return
}
Expand All @@ -867,7 +867,7 @@ class ReaderViewModel {
switch currentStatus {
case .downloaded:
if updatesLoadingState {
clearLoadingProgress()
updateLoadingProgress(ReaderLoadingProgress.complete)
updateLoadingDetail(String(localized: "Using downloaded book files"))
}
return
Expand All @@ -882,7 +882,7 @@ class ReaderViewModel {
let progress = DownloadProgressTracker.shared.progress[book.id]
{
if progress >= 1 {
clearLoadingProgress()
updateLoadingProgress(ReaderLoadingProgress.complete)
let status = offlinePostDownloadStatus(for: downloadInfo.kind)
updateLoadingTitle(status.title)
updateLoadingDetail(status.detail)
Expand Down
16 changes: 11 additions & 5 deletions KMReader/Features/Reader/Views/Epub/EpubReaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,12 +690,18 @@
}

private var loadingProgress: Double? {
guard viewModel.loadingStage == .downloading else { return nil }
if let expectedBytes = viewModel.downloadBytesExpected, expectedBytes > 0 {
return viewModel.downloadProgress
}
switch viewModel.loadingStage {
case .downloading:
if let expectedBytes = viewModel.downloadBytesExpected, expectedBytes > 0 {
return viewModel.downloadProgress
}

return viewModel.downloadProgress > 0 ? viewModel.downloadProgress : nil
return viewModel.downloadProgress > 0 ? viewModel.downloadProgress : nil
case .finalizingOfflineDownload, .preparingOfflineResources, .preparingReader, .paginating:
return ReaderLoadingProgress.complete
case .fetchingMetadata, .idle:
return nil
}
}

private var loadingDetail: String {
Expand Down
16 changes: 11 additions & 5 deletions KMReader/Features/Reader/Views/Pdf/PdfReaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,12 +444,18 @@
}

private var loadingProgress: Double? {
guard viewModel.loadingStage == .downloading else { return nil }
if let expectedBytes = viewModel.downloadBytesExpected, expectedBytes > 0 {
return viewModel.downloadProgress
}
switch viewModel.loadingStage {
case .downloading:
if let expectedBytes = viewModel.downloadBytesExpected, expectedBytes > 0 {
return viewModel.downloadProgress
}

return viewModel.downloadProgress > 0 ? viewModel.downloadProgress : nil
return viewModel.downloadProgress > 0 ? viewModel.downloadProgress : nil
case .finalizingOfflineDownload, .preparingReader:
return ReaderLoadingProgress.complete
case .fetchingMetadata, .idle:
return nil
}
}

private var loadingDetail: String {
Expand Down