Merge pull request wordpress-mobile#20906 from wordpress-mobile/task/…

…ios-15-fix-uibutton-deprecations-some
jeff4a501 · Jun 20, 2023 · d1824d8 · d1824d8
2 parents aa12b00 + 59df2f5
commit d1824d8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 35 deletions.
diff --git 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
@@ -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)