From 6355e3f007060df330c09ba4ea432d476a50c7fd Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 27 Apr 2019 08:16:37 -0500 Subject: [PATCH] Made settings dynamic type compliant --- iOS/Settings/AboutViewController.swift | 3 + .../RefreshIntervalViewController.swift | 1 + iOS/Settings/Settings.storyboard | 74 ++++++++++--------- 3 files changed, 44 insertions(+), 34 deletions(-) diff --git a/iOS/Settings/AboutViewController.swift b/iOS/Settings/AboutViewController.swift index 38a15abfe..b935a753a 100644 --- a/iOS/Settings/AboutViewController.swift +++ b/iOS/Settings/AboutViewController.swift @@ -30,6 +30,7 @@ class AboutViewController: UITableViewController { buildLabel.font = UIFont.systemFont(ofSize: 11.0) buildLabel.textColor = UIColor.gray buildLabel.text = NSLocalizedString("Copyright © 2002-2019 Ranchero Software", comment: "Copyright") + buildLabel.numberOfLines = 0 buildLabel.sizeToFit() buildLabel.translatesAutoresizingMaskIntoConstraints = false tableView.tableFooterView = buildLabel @@ -48,6 +49,8 @@ private extension AboutViewController { let url = Bundle.main.url(forResource: file, withExtension: "rtf")! let string = try! NSAttributedString(url: url, options: [NSAttributedString.DocumentReadingOptionKey.documentType: NSAttributedString.DocumentType.rtf], documentAttributes: nil) textView.attributedText = string + textView.adjustsFontForContentSizeCategory = true + textView.font = .preferredFont(forTextStyle: .body) } } diff --git a/iOS/Settings/RefreshIntervalViewController.swift b/iOS/Settings/RefreshIntervalViewController.swift index 6d7f24283..d2fe29ed5 100644 --- a/iOS/Settings/RefreshIntervalViewController.swift +++ b/iOS/Settings/RefreshIntervalViewController.swift @@ -22,6 +22,7 @@ class RefreshIntervalViewController: UITableViewController { override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) + cell.textLabel?.adjustsFontForContentSizeCategory = true let userRefreshInterval = AppDefaults.refreshInterval switch indexPath.row { diff --git a/iOS/Settings/Settings.storyboard b/iOS/Settings/Settings.storyboard index dc7a68646..6ee01d1d4 100644 --- a/iOS/Settings/Settings.storyboard +++ b/iOS/Settings/Settings.storyboard @@ -27,10 +27,10 @@ -