From 59df2f58e79973b734adeca616cb5f7ed093bb59 Mon Sep 17 00:00:00 2001 From: kean Date: Mon, 19 Jun 2023 16:28:17 -0400 Subject: [PATCH] Cleanup some of the UIButton deprecations --- .../Reader/ReaderTagStreamHeader.swift | 8 +----- .../Reader/WPStyleGuide+Reader.swift | 28 ------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderTagStreamHeader.swift b/WordPress/Classes/ViewRelated/Reader/ReaderTagStreamHeader.swift index 614da97a0d29..0ce723d11d09 100644 --- a/WordPress/Classes/ViewRelated/Reader/ReaderTagStreamHeader.swift +++ b/WordPress/Classes/ViewRelated/Reader/ReaderTagStreamHeader.swift @@ -41,13 +41,7 @@ import WordPressShared } fileprivate func adjustInsetsForTextDirection() { - guard userInterfaceLayoutDirection() == .rightToLeft else { - return - } - - followButton.contentEdgeInsets = followButton.contentEdgeInsets.flippedForRightToLeftLayoutDirection() - followButton.imageEdgeInsets = followButton.imageEdgeInsets.flippedForRightToLeftLayoutDirection() - followButton.titleEdgeInsets = followButton.titleEdgeInsets.flippedForRightToLeftLayoutDirection() + followButton.flipInsetsForRightToLeftLayoutDirection() } // MARK: - Actions diff --git a/WordPress/Classes/ViewRelated/Reader/WPStyleGuide+Reader.swift b/WordPress/Classes/ViewRelated/Reader/WPStyleGuide+Reader.swift index ae96c4e4bee5..38daf05bcaa1 100644 --- a/WordPress/Classes/ViewRelated/Reader/WPStyleGuide+Reader.swift +++ b/WordPress/Classes/ViewRelated/Reader/WPStyleGuide+Reader.swift @@ -264,34 +264,6 @@ extension WPStyleGuide { button.setTitleColor(disabledColor, for: .disabled) } - @objc public class func applyReaderFollowConversationButtonStyle(_ button: UIButton) { - // General - button.naturalContentHorizontalAlignment = .leading - button.backgroundColor = .clear - button.titleLabel?.font = fontForTextStyle(.footnote) - - // Color(s) - let normalColor = UIColor.primary - let highlightedColor = UIColor.neutral - let selectedColor = UIColor.success - - button.setTitleColor(normalColor, for: .normal) - button.setTitleColor(selectedColor, for: .selected) - button.setTitleColor(highlightedColor, for: .highlighted) - - // Image(s) - let side = WPStyleGuide.fontSizeForTextStyle(.headline) - let size = CGSize(width: side, height: side) - let followIcon = UIImage.gridicon(.readerFollowConversation, size: size) - let followingIcon = UIImage.gridicon(.readerFollowingConversation, size: size) - - button.setImage(followIcon.imageWithTintColor(normalColor), for: .normal) - button.setImage(followingIcon.imageWithTintColor(selectedColor), for: .selected) - button.setImage(followingIcon.imageWithTintColor(highlightedColor), for: .highlighted) - button.imageEdgeInsets = FollowConversationButton.Style.imageEdgeInsets - button.contentEdgeInsets = FollowConversationButton.Style.contentEdgeInsets - } - @objc public class func applyReaderFollowButtonStyle(_ button: UIButton) { let side = WPStyleGuide.fontSizeForTextStyle(.callout) let size = CGSize(width: side, height: side)