Skip to content

Resolves layout issues during navigation transitions #695

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 2 commits into from
Oct 23, 2025
Merged

Resolves layout issues during navigation transitions #695

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
b86b46a
PP-3142 - properly manage nav/tab bar dismissal
mauricecarrier7 Oct 23, 2025
35ee22a
Update project.pbxproj
mauricecarrier7 Oct 23, 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
8 changes: 4 additions & 4 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 = 395;
CURRENT_PROJECT_VERSION = 397;
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 = 395;
CURRENT_PROJECT_VERSION = 397;
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 = 396;
CURRENT_PROJECT_VERSION = 397;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
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 = 396;
CURRENT_PROJECT_VERSION = 397;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 88CBA74T8K;
ENABLE_BITCODE = NO;
Expand Down
1 change: 0 additions & 1 deletion Palace/CatalogUI/Views/CatalogContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ struct CatalogContentView: View {
}
}
.padding(.vertical, 17)
.padding(.bottom, 100)
}
.refreshable { await viewModel.refresh() }
.onReceive(viewModel.$shouldScrollToTop) { shouldScroll in
Expand Down
23 changes: 3 additions & 20 deletions Palace/Reader2/UI/TPPEPUBViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,32 +78,16 @@ class TPPEPUBViewController: TPPBaseReaderViewController {

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()
}
tabBarController?.tabBar.isHidden = navigationController?.isNavigationBarHidden ?? false
}

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
setUIColor(for: preferences)
log(.info, "TPPEPUBViewController will appear. UI color set based on preferences.")
epubNavigator.submitPreferences(preferences)

tabBarController?.tabBar.isHidden = true

if navigationItem.leftBarButtonItem == nil {
let backItem = UIBarButtonItem(image: UIImage(systemName: "chevron.left"), style: .plain, target: self, action: #selector(closeEPUB))
navigationItem.leftBarButtonItem = backItem
Expand All @@ -113,7 +97,6 @@ class TPPEPUBViewController: TPPBaseReaderViewController {

navigationController?.setNavigationBarHidden(true, animated: false)
navigationController?.setToolbarHidden(true, animated: false)
tabBarController?.tabBar.isHidden = true
}

@objc private func closeEPUB() {
Expand Down