Skip to content

Fix an issue with a missing "Reply" button in Notifications / Comments #23710

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

Fix an issue with a missing "Reply" button in Notifications / Comments #23710

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
6b9ee34
Remove ReplyStyle
kean Oct 28, 2024
2a8f46a
Fix an issue with Reply button hidden
kean Oct 28, 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
11 changes: 5 additions & 6 deletions WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,13 @@ import Gridicons
textView.contentInset = .zero
textView.textContainerInset = .zero
textView.autocorrectionType = .yes
textView.textColor = Style.textColor
textView.textColor = .label
textView.textContainer.lineFragmentPadding = 0
textView.layoutManager.allowsNonContiguousLayout = false
textView.accessibilityIdentifier = "reply-text-view"

// Placeholder
placeholderLabel.textColor = Style.placeholderColor
placeholderLabel.textColor = .tertiaryLabel

// Fullscreen toggle button
fullscreenToggleButton.setImage(.gridicon(.chevronUp), for: .normal)
Expand All @@ -286,17 +286,17 @@ 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")
refreshReplyButton()

// Background
contentView.backgroundColor = Style.backgroundColor
contentView.backgroundColor = .systemBackground

// Top Separator
topSeparator.backgroundColor = Style.separatorColor
topSeparator.backgroundColor = .separator
topSeparatorHeightConstraint.constant = .hairlineBorderWidth

// Recognizers
Expand Down Expand Up @@ -344,7 +344,6 @@ import Gridicons

// MARK: - Private Properties
fileprivate var bundle: NSArray?
private typealias Style = WPStyleGuide.Reply

// MARK: - IBOutlets
@IBOutlet private weak var contentView: UIView!
Expand Down
14 changes: 0 additions & 14 deletions WordPress/Classes/ViewRelated/Notifications/Style/WPStyleGuide+Reply.swift
View file
Open in desktop

This file was deleted.

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],
Copy link
Contributor Author

@kean kean Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change was the root cause.

[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
6 changes: 0 additions & 6 deletions WordPress/WordPress.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3101,7 +3101,6 @@
B5AEEC7C1ACACFDA008BF2A4 /* notifications-new-follower.json in Resources */ = {isa = PBXBuildFile; fileRef = B5AEEC771ACACFDA008BF2A4 /* notifications-new-follower.json */; };
B5AEEC7D1ACACFDA008BF2A4 /* notifications-replied-comment.json in Resources */ = {isa = PBXBuildFile; fileRef = B5AEEC781ACACFDA008BF2A4 /* notifications-replied-comment.json */; };
B5B410B61B1772B000CFCF8D /* NavigationTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B410B51B1772B000CFCF8D /* NavigationTitleView.swift */; };
B5B56D3219AFB68800B4E29B /* WPStyleGuide+Reply.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B56D3019AFB68800B4E29B /* WPStyleGuide+Reply.swift */; };
B5B56D3319AFB68800B4E29B /* WPStyleGuide+Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B56D3119AFB68800B4E29B /* WPStyleGuide+Notifications.swift */; };
B5B68BD41C19AAED00EB59E0 /* InteractiveNotificationsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B68BD31C19AAED00EB59E0 /* InteractiveNotificationsManager.swift */; };
B5BEA55F1C7CE6D100C8035B /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = B5CC05F51962150600975CAC /* Constants.m */; };
Expand Down Expand Up @@ -4455,7 +4454,6 @@
FABB21112602FC2C00C8785C /* BaseRestoreOptionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAB8F74F25AD72CE00D5D54A /* BaseRestoreOptionsViewController.swift */; };
FABB21132602FC2C00C8785C /* AuthenticationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F12FA5D82428FA8F0054DA21 /* AuthenticationService.swift */; };
FABB21142602FC2C00C8785C /* JetpackSiteRef.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16A76F01FC4758300A661E3 /* JetpackSiteRef.swift */; };
FABB21152602FC2C00C8785C /* WPStyleGuide+Reply.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B56D3019AFB68800B4E29B /* WPStyleGuide+Reply.swift */; };
FABB21172602FC2C00C8785C /* JetpackBackupOptionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAB8F76D25AD73C000D5D54A /* JetpackBackupOptionsViewController.swift */; };
FABB21192602FC2C00C8785C /* NotificationContentRangeFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E4123B120F4097A00DF8486 /* NotificationContentRangeFactory.swift */; };
FABB211A2602FC2C00C8785C /* SiteInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6D170361EF9D8D10046D433 /* SiteInfo.swift */; };
Expand Down Expand Up @@ -8631,7 +8629,6 @@
B5AEEC771ACACFDA008BF2A4 /* notifications-new-follower.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "notifications-new-follower.json"; sourceTree = "<group>"; };
B5AEEC781ACACFDA008BF2A4 /* notifications-replied-comment.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "notifications-replied-comment.json"; sourceTree = "<group>"; };
B5B410B51B1772B000CFCF8D /* NavigationTitleView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationTitleView.swift; sourceTree = "<group>"; };
B5B56D3019AFB68800B4E29B /* WPStyleGuide+Reply.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WPStyleGuide+Reply.swift"; sourceTree = "<group>"; };
B5B56D3119AFB68800B4E29B /* WPStyleGuide+Notifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "WPStyleGuide+Notifications.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
B5B63F3F19621A9F001601C3 /* WordPress 19.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 19.xcdatamodel"; sourceTree = "<group>"; };
B5B68BD31C19AAED00EB59E0 /* InteractiveNotificationsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InteractiveNotificationsManager.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -12345,7 +12342,6 @@
402FFB1D218C2B8D00FF4A0B /* Style */ = {
isa = PBXGroup;
children = (
B5B56D3019AFB68800B4E29B /* WPStyleGuide+Reply.swift */,
B5B56D3119AFB68800B4E29B /* WPStyleGuide+Notifications.swift */,
);
path = Style;
Expand Down Expand Up @@ -21523,7 +21519,6 @@
FA85F5F52A9DFDCC001D8425 /* NoSitesViewModel.swift in Sources */,
F12FA5D92428FA8F0054DA21 /* AuthenticationService.swift in Sources */,
E16A76F11FC4758300A661E3 /* JetpackSiteRef.swift in Sources */,
B5B56D3219AFB68800B4E29B /* WPStyleGuide+Reply.swift in Sources */,
FA6C32B92BF1FFEF00BBDDB4 /* AppStoreSearchService.swift in Sources */,
4A358DE629B5EB8D00BFCEBE /* PublicizeService+Lookup.swift in Sources */,
C7234A422832C2BA0045C63F /* QRLoginScanningViewController.swift in Sources */,
Expand Down Expand Up @@ -24463,7 +24458,6 @@
FABB21132602FC2C00C8785C /* AuthenticationService.swift in Sources */,
FABB21142602FC2C00C8785C /* JetpackSiteRef.swift in Sources */,
835771362A7C2755006B2A3E /* JetpackSocialNoSharesView.swift in Sources */,
FABB21152602FC2C00C8785C /* WPStyleGuide+Reply.swift in Sources */,
836498CF281735CC00A2C170 /* BloggingPromptsHeaderView.swift in Sources */,
01E258032ACC36FA00F09666 /* PlanStep.swift in Sources */,
FABB21172602FC2C00C8785C /* JetpackBackupOptionsViewController.swift in Sources */,
Expand Down