diff --git a/Palace.xcodeproj/project.pbxproj b/Palace.xcodeproj/project.pbxproj index 30c332ba8..fbdcbb648 100644 --- a/Palace.xcodeproj/project.pbxproj +++ b/Palace.xcodeproj/project.pbxproj @@ -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; @@ -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; @@ -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 = ( @@ -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; @@ -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; @@ -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"; diff --git a/Palace/MyBooks/MyBooks/BookCell/ButtonView/BookButtonState.swift b/Palace/MyBooks/MyBooks/BookCell/ButtonView/BookButtonState.swift index a679e2274..d4a5e4697 100644 --- a/Palace/MyBooks/MyBooks/BookCell/ButtonView/BookButtonState.swift +++ b/Palace/MyBooks/MyBooks/BookCell/ButtonView/BookButtonState.swift @@ -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] diff --git a/Palace/Reader2/UI/TPPEPUBViewController.swift b/Palace/Reader2/UI/TPPEPUBViewController.swift index a8033acd7..b6c17e0c8 100644 --- a/Palace/Reader2/UI/TPPEPUBViewController.swift +++ b/Palace/Reader2/UI/TPPEPUBViewController.swift @@ -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)