From 2f3e6692544ab7d2d4a38989b5594dea3bf05ed5 Mon Sep 17 00:00:00 2001 From: kean Date: Wed, 30 Oct 2024 16:43:21 -0400 Subject: [PATCH 1/4] Fix an issue with posts not opening in Reader with motion reduction enabled --- .../UINavigationController+SplitViewFullscreen.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/WordPress/Classes/Extensions/UINavigationController+SplitViewFullscreen.swift b/WordPress/Classes/Extensions/UINavigationController+SplitViewFullscreen.swift index 090d925eb79e..83d2801f1130 100644 --- a/WordPress/Classes/Extensions/UINavigationController+SplitViewFullscreen.swift +++ b/WordPress/Classes/Extensions/UINavigationController+SplitViewFullscreen.swift @@ -34,12 +34,12 @@ extension UINavigationController { self.pushViewController(viewController, animated: animated) } - if UIAccessibility.isReduceMotionEnabled && !self.splitViewControllerIsHorizontallyCompact { - splitViewController.view.hideWithBlankingSnapshot(afterScreenUpdates: true) - performTransition(false) - } else { +// if UIAccessibility.isReduceMotionEnabled && !self.splitViewControllerIsHorizontallyCompact { +// splitViewController.view.hideWithBlankingSnapshot(afterScreenUpdates: true) +// performTransition(false) +// } else { performTransition(animated) - } +// } } } From 2834131eb5a42a6327864c82b3690b9697168417 Mon Sep 17 00:00:00 2001 From: kean Date: Mon, 28 Oct 2024 12:11:54 -0400 Subject: [PATCH 2/4] Fix an issue with Reply button hidden --- .../Notifications/ReplyTextView/ReplyTextView.swift | 2 +- .../Reader/Comments/ReaderCommentsViewController.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.swift b/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.swift index 88212ebe8eac..fefa77e17a9b 100644 --- a/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.swift +++ b/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.swift @@ -286,7 +286,7 @@ import Gridicons comment: "Accessibility Label for the enter full screen button on the comment reply text view") // Reply button - replyButton.setTitleColor(Style.replyButtonColor, for: .normal) + replyButton.setTitleColor(UIAppColor.brand, for: .normal) replyButton.titleLabel?.text = NSLocalizedString("Reply", comment: "Reply to a comment.") replyButton.accessibilityIdentifier = "reply-button" replyButton.accessibilityLabel = NSLocalizedString("Reply", comment: "Accessibility label for the reply button") diff --git a/WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m b/WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m index 07901a61bab9..f20c62a244dc 100644 --- a/WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m +++ b/WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m @@ -362,8 +362,8 @@ - (void)configureViewConstraints views:views]]; [NSLayoutConstraint activateConstraints:@[ - [self.replyTextView.leadingAnchor constraintEqualToAnchor:self.replyTextView.leadingAnchor], - [self.replyTextView.trailingAnchor constraintEqualToAnchor:self.replyTextView.trailingAnchor], + [self.replyTextView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor], + [self.replyTextView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor], [self.view.keyboardLayoutGuide.topAnchor constraintEqualToAnchor:self.replyTextView.bottomAnchor] ]]; From f362acc51d04b66e8479c2c5c3d5f93a31b7dcd4 Mon Sep 17 00:00:00 2001 From: kean Date: Mon, 28 Oct 2024 12:35:52 -0400 Subject: [PATCH 3/4] Fix an issue with missing Sidebar button when you have no sites --- WordPress/Classes/System/SplitViewRootPresenter+Welcome.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/WordPress/Classes/System/SplitViewRootPresenter+Welcome.swift b/WordPress/Classes/System/SplitViewRootPresenter+Welcome.swift index bcf70d958a4f..9589f6e4726e 100644 --- a/WordPress/Classes/System/SplitViewRootPresenter+Welcome.swift +++ b/WordPress/Classes/System/SplitViewRootPresenter+Welcome.swift @@ -15,8 +15,6 @@ class WelcomeSplitViewContent: SplitViewDisplayable { let noSitesVC = UIHostingController(rootView: noSiteView) noSitesVC.view.backgroundColor = .systemBackground secondary = UINavigationController(rootViewController: noSitesVC) - - supplementary.isNavigationBarHidden = true } func displayed(in splitVC: UISplitViewController) { From 19972d37842bd67e115a464f73b52dcc3c480ca4 Mon Sep 17 00:00:00 2001 From: kean Date: Wed, 30 Oct 2024 16:45:52 -0400 Subject: [PATCH 4/4] Fix bar chart colors --- .../Utility/App Configuration/AppColor.swift | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/WordPress/Classes/Utility/App Configuration/AppColor.swift b/WordPress/Classes/Utility/App Configuration/AppColor.swift index b633911759d4..d55f47c19ad4 100644 --- a/WordPress/Classes/Utility/App Configuration/AppColor.swift +++ b/WordPress/Classes/Utility/App Configuration/AppColor.swift @@ -3,10 +3,6 @@ import ColorStudio import SwiftUI struct UIAppColor { - static func primary(_ shade: ColorStudioShade) -> UIColor { - CSColor.Blue.shade(shade) - } - static func accent(_ shade: ColorStudioShade) -> UIColor { CSColor.Pink.shade(shade) } @@ -91,20 +87,34 @@ struct UIAppColor { #if IS_JETPACK static let tint = UIColor.label + static let brand = UIColor(light: CSColor.JetpackGreen.shade(.shade40), dark: CSColor.JetpackGreen.shade(.shade30)) static func brand(_ shade: ColorStudioShade) -> UIColor { CSColor.JetpackGreen.shade(shade) } + + static let primary = CSColor.JetpackGreen.base + + static func primary(_ shade: ColorStudioShade) -> UIColor { + CSColor.JetpackGreen.shade(shade) + } #endif #if IS_WORDPRESS static let tint = brand + static let brand = CSColor.WordPressBlue.base static func brand(_ shade: ColorStudioShade) -> UIColor { CSColor.WordPressBlue.shade(shade) } + + static let primary = CSColor.Blue.base + + static func primary(_ shade: ColorStudioShade) -> UIColor { + CSColor.Blue.shade(shade) + } #endif static let divider = CSColor.Gray.shade(.shade10) @@ -112,9 +122,6 @@ struct UIAppColor { static let gray = CSColor.Gray.base static let blue = CSColor.Blue.base - /// - warning: soft-deprecated, use `UIAppColor.tint`. - static let primary = brand - static let success = CSColor.Green.base static let text = CSColor.Gray.shade(.shade80) static let textSubtle = CSColor.Gray.shade(.shade50)