0.2.1

Author: Geri-Borbas

CHANGELOG.md

@@ -1,7 +1,10 @@
 #  CHANGELOG
 
+* Doing
 
-* Feature/Empty_Label_Support/0.2.0
+	+ (May) lookup baseline reset issue with overflowing text
+
+* Feature/Empty_Label_Support/0.2.0 - 0.2.1
 
 	+ Added `oldText` and `newText` parameters to `onTextChange` observer
 	+ Renamed `placeholder` to `cache`

UILabel_Typography_Extensions/Typography/UILabel+Typograpy.swift

@@ -57,7 +57,7 @@ extension UILabel: TypographyExtensions {
 				.paragraphStyle,
 				value: (paragraphStyle ?? NSParagraphStyle())
 					.mutable
-					.withProperty(textAlignment, for: \.alignment)
+//					 .withProperty(textAlignment, for: \.alignment)
 					.withProperty(lineHeight, for: \.minimumLineHeight)
 					.withProperty(lineHeight, for: \.maximumLineHeight)
 			)
@@ -72,7 +72,9 @@ extension UILabel: TypographyExtensions {
 			if oldText.count == 0,
 			   newText.count > 0,
 			   let newText = newText {
+				let alignment = textAlignment
 				self.attributedText = NSAttributedString(string: newText, attributes: cachedAttributes)
+				self.textAlignment = alignment
 			}
 
 			// Update attributed string layout due to (unknown) UIKit internals.

UILabel_Typography_Extensions/View/EmptyViewController.swift

@@ -23,10 +23,10 @@ class EmptyViewController: UIViewController {
 			$0.showGrid = true
 			$0.lineHeight = CGFloat(87)
 			$0.underline = .single
-			$0.textAlignment = .center
 
 			// Set text after.
 			$0.text = loremIpsum
+			$0.textAlignment = .right
 
 		}.inspect
 

UILabel_Typography_Extensions/View/LineHeightViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class LineHeightViewController: UIViewController {
 
-	let text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+	let text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
 
 	var label: UILabel!
 	var sliderObserver: Observer<UISlider, Float>!
@@ -27,6 +27,7 @@ class LineHeightViewController: UIViewController {
 					$0.numberOfLines = 0
 					$0.showGrid = true
 					$0.underline = .single
+					$0.textAlignment = .center
 					self.label = $0
 				}
                 .with(text: text),

UILabel_Typography_Extensions/View/LoremIpsumViewController.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class LoremIpsumViewController: UIViewController {
 
-	let loremIpsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+	let loremIpsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur." // Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 
 	lazy var body = UIStackView()
 		.vertical(spacing: 10)
@@ -19,7 +19,7 @@ class LoremIpsumViewController: UIViewController {
 			UILabel()
 				.with {
 					$0.textColor = .label
-					$0.font = .preferredFont(forTextStyle: .headline)
+					$0.font = UIFont.newYork(ofSize: 1024 / 26.0 / 2.0) // .preferredFont(forTextStyle: .headline)
 					$0.letterSpacing = 1
 					$0.lineHeight = 50
 				}

UILabel_Typography_Extensions/View/MenuViewController.swift

@@ -36,8 +36,7 @@ class MenuViewController: UIViewController {
 				.with(title: "Manual Label Styling")
 				.onTouchUpInside { [unowned self] in
 					self.present(ManualViewController(), animated: true)
-				}
-			,
+				},
 			UIButton()
 				.with(title: "Empty Label Styling")
 				.onTouchUpInside { [unowned self] in
@@ -80,7 +79,7 @@ class MenuViewController: UIViewController {
 
 	override func viewDidAppear(_ animated: Bool) {
 		super.viewDidAppear(animated)
-		self.present(EmptyViewController(), animated: true)
+		// self.present(EmptyViewController(), animated: true)
 	}
 }
 

UILabel_Typography_Extensions/View/UIButton+Styles.swift

@@ -14,15 +14,15 @@ extension UIButton {
 		with {
 			$0.titleLabel?.textColor = .systemBackground
 			$0.titleLabel?.backgroundColor = .systemBlue
-			$0.titleLabel?.letterSpacing = 5
+			$0.titleLabel?.letterSpacing = 2
 			$0.titleLabel?.lineHeight = 50
 			$0.titleLabel?.textAlignment = .center
 			$0.titleLabel?.lineBreakMode = .byTruncatingMiddle
 			$0.titleLabel?.pin(to: $0, insets: UIEdgeInsets.zero)
 			_ = $0.titleLabel?.withImages
 			$0.setTitleColor(.systemBackground, for: .normal)
 			$0.setAttributedTitle($0.titleLabel?.attributedText, for: .normal)
-			$0.layer.cornerRadius = 5
+			$0.layer.cornerRadius = 25
 			$0.clipsToBounds = true
 		}
 	}
@@ -34,13 +34,4 @@ extension UIButton {
 				$0.setTitle(title, for: .normal)
 			}
 	}
-	
-	func with(title: String, target: Any, selector: Selector) -> Self {
-		self
-			.withButtonStyle
-			.with {
-				$0.setTitle(title, for: .normal)
-				$0.addTarget(target, action: selector, for: .touchUpInside)
-			}
-	}
 }