Fixes for 24.5.2 (#23731)

wordpress-mobile · Oct 30, 2024 · abcf66d · abcf66d
2 parents 3b24a39 + 19972d3
commit abcf66d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git 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)
-        }
+//        }
     }
 }
 

diff --git 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) {

diff --git 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,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)

diff --git 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
@@ -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]
     ]];