Bug 1394362 - Allow font scaling in Onboarding slides. (#3112) r=garvan

mozilla-mobile · Aug 31, 2017 · fdee601 · fdee601
1 parent acf8db2
commit fdee601
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/Client/Frontend/Intro/IntroViewController.swift b/Client/Frontend/Intro/IntroViewController.swift
@@ -8,6 +8,8 @@ import SnapKit
 struct IntroViewControllerUX {
     static let Width = 375
     static let Height = 667
+    static let SyncButtonTopPadding = 5
+    static let MinimumFontScale: CGFloat = 0.5
 
     static let CardSlides = ["tour-Welcome", "tour-Search", "tour-Private", "tour-Mail", "tour-Sync"]
     static let NumberOfCards = CardSlides.count
@@ -153,6 +155,9 @@ class IntroViewController: UIViewController, UIScrollViewDelegate {
             let textLabel = UILabel()
             textLabel.numberOfLines = 0
             textLabel.attributedText = attributedStringForLabel(text)
+            textLabel.adjustsFontSizeToFitWidth = true
+            textLabel.minimumScaleFactor = IntroViewControllerUX.MinimumFontScale
+            textLabel.lineBreakMode = .byTruncatingTail
             textLabels.append(textLabel)
             introView.addSubview(textLabel)
             textLabel.snp.makeConstraints({ (make) -> Void in
@@ -189,6 +194,13 @@ class IntroViewController: UIViewController, UIScrollViewDelegate {
             make.bottom.equalTo(syncCardView)
         }
 
+        // We need a reference to the sync pages textlabel so we can adjust the constraints
+        if let index = introViews.index(of: syncCardView), index < textLabels.count {
+            let syncTextLabel = textLabels[index]
+            syncTextLabel.snp.makeConstraints { make in
+                make.bottom.equalTo(signInButton.snp.top).offset(-IntroViewControllerUX.SyncButtonTopPadding)
+            }
+        }
         // Add all the cards to the view, make them invisible with zero alpha
         for introView in introViews {
             introView.alpha = 0