Skip to content

[PP-3022][PP-3077] Show proper holds position, hide epub tabbar #685

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
merged 4 commits into from
Oct 16, 2025
Merged

[PP-3022][PP-3077] Show proper holds position, hide epub tabbar #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa315de
PP-3077 Hide tabbar when hiding navbar
mauricecarrier7 Oct 15, 2025
880bba4
PP-3022 Make hold available when in first position
mauricecarrier7 Oct 16, 2025
9cf83ef
Update project.pbxproj
mauricecarrier7 Oct 16, 2025
3718b25
Update project.pbxproj
mauricecarrier7 Oct 16, 2025
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
12 changes: 6 additions & 6 deletions Palace.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4731,7 +4731,7 @@
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 389;
CURRENT_PROJECT_VERSION = 390;
DEVELOPMENT_TEAM = 88CBA74T8K;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -4790,7 +4790,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES_ERROR;
CODE_SIGN_ENTITLEMENTS = Palace/SimplyE.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 389;
CURRENT_PROJECT_VERSION = 390;
DEVELOPMENT_TEAM = 88CBA74T8K;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -4974,7 +4974,7 @@
CODE_SIGN_ENTITLEMENTS = Palace/PalaceDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 389;
CURRENT_PROJECT_VERSION = 390;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -5000,7 +5000,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.0;
MARKETING_VERSION = 2.0.1;
PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
PROVISIONING_PROFILE_SPECIFIER = "";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -5035,7 +5035,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 389;
CURRENT_PROJECT_VERSION = 390;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand All @@ -5062,7 +5062,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.0;
MARKETING_VERSION = 2.0.1;
PRODUCT_BUNDLE_IDENTIFIER = org.thepalaceproject.palace;
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "App Store";
Expand Down
12 changes: 9 additions & 3 deletions Palace/MyBooks/MyBooks/BookCell/ButtonView/BookButtonState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,16 @@ extension BookButtonState {
buttons.append(book.isAudiobook ? .audiobookSample : .sample)
}
case .holding, .holdingFrontOfQueue:
buttons.append(.manageHold)
if book.hasSample && previewEnabled {
buttons.append(book.isAudiobook ? .audiobookSample : .sample)
if isHoldReady(book: book) {
buttons = [.get, .cancelHold]
} else {
buttons.append(.manageHold)

if book.hasSample && previewEnabled {
buttons.append(book.isAudiobook ? .audiobookSample : .sample)
}
}

case .managingHold:
if isHoldReady(book: book) {
buttons = [.get, .cancelHold]
Expand Down
22 changes: 22 additions & 0 deletions Palace/Reader2/UI/TPPEPUBViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,28 @@ class TPPEPUBViewController: TPPBaseReaderViewController {
setUIColor(for: preferences)
}

override func updateNavigationBar(animated: Bool = true) {
super.updateNavigationBar(animated: animated)
let navHidden = navigationController?.isNavigationBarHidden ?? false
tabBarController?.tabBar.isHidden = navHidden

if !navHidden, let tabBar = tabBarController?.tabBar {
if #available(iOS 13.0, *) {
let appearance = UITabBarAppearance()
appearance.configureWithOpaqueBackground()
appearance.backgroundColor = TPPConfiguration.backgroundColor()
tabBar.standardAppearance = appearance
if #available(iOS 15.0, *) {
tabBar.scrollEdgeAppearance = appearance
}
} else {
tabBar.barTintColor = TPPConfiguration.backgroundColor()
}
tabBar.isTranslucent = false
tabBar.tintColor = TPPConfiguration.iconColor()
}
}

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
setUIColor(for: preferences)
Expand Down
Loading