From c43da651065f10c01d16c64fd39968512da48725 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Thu, 25 Jun 2020 13:43:30 -0500 Subject: [PATCH 1/3] Expand the TextLinkButton when dynamic type is set to maximum --- .../Reusable Views/TextLinkButtonTableViewCell.swift | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.swift b/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.swift index 363637fdf..7668e9619 100644 --- a/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.swift +++ b/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.swift @@ -18,6 +18,14 @@ class TextLinkButtonTableViewCell: UITableViewCell { public var actionHandler: (() -> Void)? + override func awakeFromNib() { + super.awakeFromNib() + + button.titleLabel?.font = UIFont.preferredFont(forTextStyle: .callout) + button.titleLabel?.adjustsFontForContentSizeCategory = true + button.titleLabel?.lineBreakMode = .byWordWrapping + } + public func configureButton(text: String?) { button.setTitle(text, for: .normal) @@ -25,8 +33,5 @@ class TextLinkButtonTableViewCell: UITableViewCell { let buttonHighlightColor = WordPressAuthenticator.shared.unifiedStyle?.textButtonHighlightColor ?? WordPressAuthenticator.shared.style.textButtonHighlightColor button.setTitleColor(buttonTitleColor, for: .normal) button.setTitleColor(buttonHighlightColor, for: .highlighted) - - button.titleLabel?.font = UIFont.preferredFont(forTextStyle: .callout) - button.titleLabel?.adjustsFontForContentSizeCategory = true } } From 1e8a4f0c923cd71d214a5b3c8474b87ade961d5f Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Thu, 25 Jun 2020 13:44:08 -0500 Subject: [PATCH 2/3] Bump podspec to 1.19.0-beta.5 --- WordPressAuthenticator.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressAuthenticator.podspec b/WordPressAuthenticator.podspec index cdf677963..65d05a4d7 100644 --- a/WordPressAuthenticator.podspec +++ b/WordPressAuthenticator.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressAuthenticator" - s.version = "1.19.0-beta.4" + s.version = "1.19.0-beta.5" s.summary = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps." s.description = <<-DESC From c5509af9ef271f6a90e6cc21ecf1a2e1ce4bbf61 Mon Sep 17 00:00:00 2001 From: "Thuy.Copeland" Date: Fri, 26 Jun 2020 12:03:50 -0500 Subject: [PATCH 3/3] Move UI-based variables to Interface Builder --- .../Reusable Views/TextLinkButtonTableViewCell.swift | 2 -- .../Reusable Views/TextLinkButtonTableViewCell.xib | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.swift b/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.swift index 7668e9619..b6ee1b080 100644 --- a/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.swift +++ b/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.swift @@ -21,9 +21,7 @@ class TextLinkButtonTableViewCell: UITableViewCell { override func awakeFromNib() { super.awakeFromNib() - button.titleLabel?.font = UIFont.preferredFont(forTextStyle: .callout) button.titleLabel?.adjustsFontForContentSizeCategory = true - button.titleLabel?.lineBreakMode = .byWordWrapping } public func configureButton(text: String?) { diff --git a/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.xib b/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.xib index f3f435c19..666796d9f 100644 --- a/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.xib +++ b/WordPressAuthenticator/Unified Auth/View Related/Reusable Views/TextLinkButtonTableViewCell.xib @@ -17,8 +17,9 @@ -