Skip to content

Fixes for 24.5.2 #23731

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 30, 2024
Merged

Fixes for 24.5.2 #23731

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
2f3e669
Fix an issue with posts not opening in Reader with motion reduction e…
kean Oct 30, 2024
2834131
Fix an issue with Reply button hidden
kean Oct 28, 2024
f362acc
Fix an issue with missing Sidebar button when you have no sites
kean Oct 28, 2024
19972d3
Fix bar chart colors
kean Oct 30, 2024
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
10 changes: 5 additions & 5 deletions WordPress/Classes/Extensions/UINavigationController+SplitViewFullscreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
// }
}
}

Expand Down
2 changes: 0 additions & 2 deletions WordPress/Classes/System/SplitViewRootPresenter+Welcome.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
21 changes: 14 additions & 7 deletions WordPress/Classes/Utility/App Configuration/AppColor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -91,30 +87,41 @@ 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)
static let error = CSColor.Red.base
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)
Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
]];

Expand Down