0.9.0

Author: Geri-Borbas

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 	+ (May) lookup baseline reset issue with overflowing text
 
+* 0.9.0
+
+	+ Cleanup, renamings
+
 * Feature/Empty_Label_Support/0.2.0 - 0.2.1
 
 	+ Added `oldText` and `newText` parameters to `onTextChange` observer

UILabel_Typography_Extensions/Typography/UILabel+Observer.swift

@@ -45,15 +45,17 @@ extension UILabel {
 		}
 	}
 
-	func onTextChange(onChange completion: @escaping TextChangeAction) {
+	func onTextChange(_ completion: @escaping TextChangeAction) {
 		guard observer == nil else {
 			return
 		}
 
 		observer = TextObserver(
 			for: self,
 			keyPath: \.text,
-			onChange: { oldText, newText in completion(oldText ?? nil, newText ?? nil) }
+			onChange: { oldText, newText in
+				completion(oldText ?? nil, newText ?? nil)
+			}
 		)
 	}
 }

UILabel_Typography_Extensions/Typography/UILabel+Typograpy.swift

@@ -57,15 +57,15 @@ extension UILabel: TypographyExtensions {
 				.paragraphStyle,
 				value: (paragraphStyle ?? NSParagraphStyle())
 					.mutable
-//					 .withProperty(textAlignment, for: \.alignment)
+					// .withProperty(textAlignment, for: \.alignment)
 					.withProperty(lineHeight, for: \.minimumLineHeight)
 					.withProperty(lineHeight, for: \.maximumLineHeight)
 			)
-			setupCache()
+			setupAttributeCacheIfNeeded()
 		}
 	}
 
-	func setupCache() {
+	func setupAttributeCacheIfNeeded() {
 		onTextChange { [unowned self] oldText, newText in
 
 			// Apply cached attributes (if any) in case text have just changed from empty.
@@ -86,23 +86,23 @@ extension UILabel: TypographyExtensions {
 		get { getAttribute(.kern) }
 		set {
 			setAttribute(.kern, value: newValue)
-			setupCache()
+			setupAttributeCacheIfNeeded()
 		}
 	}
 
 	public var underline: NSUnderlineStyle? {
 		get { getAttribute(.underlineStyle) }
 		set {
 			setAttribute(.underlineStyle, value: newValue)
-			setupCache()
+			setupAttributeCacheIfNeeded()
 		}
 	}
 
 	public var strikethrough: NSUnderlineStyle? {
 		get { getAttribute(.strikethroughStyle) }
 		set {
 			setAttribute(.strikethroughStyle, value: newValue)
-			setupCache()
+			setupAttributeCacheIfNeeded()
 		}
 	}
 
@@ -118,6 +118,8 @@ extension UILabel: TypographyExtensions {
 }
 
 
+// MARK: Attributes (and caching)
+
 fileprivate extension NSAttributedString {
 
 	var entireRange: NSRange {
@@ -138,21 +140,19 @@ fileprivate extension NSAttributedString {
 }
 
 
-// MARK: Attributes
-
 fileprivate extension UILabel {
 
 	struct Keys {
-		static var placeholder: UInt8 = 0
+		static var cache: UInt8 = 0
 	}
 
 	/// An attributed string property to cache typography even when the label text is empty.
 	var cache: NSAttributedString {
 		get {
-			objc_getAssociatedObject(self, &Keys.placeholder) as? NSAttributedString ?? NSAttributedString(string: "Placeholder")
+			objc_getAssociatedObject(self, &Keys.cache) as? NSAttributedString ?? NSAttributedString(string: "Placeholder")
 		}
 		set {
-			objc_setAssociatedObject(self, &Keys.placeholder, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+			objc_setAssociatedObject(self, &Keys.cache, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
 		}
 	}
 
@@ -185,17 +185,17 @@ fileprivate extension UILabel {
 }
 
 
-extension UILabel {
+fileprivate extension UILabel {
 
 	/// Get attribute for the given key (if any).
-	fileprivate func getAttribute<AttributeType>(
+	func getAttribute<AttributeType>(
 		_ key: NSAttributedString.Key
 	) -> AttributeType? where AttributeType: Any {
 		return (attributes ?? cachedAttributes)[key] as? AttributeType
 	}
 
 	/// Get `OptionSet` attribute for the given key (if any).
-	fileprivate func getAttribute<AttributeType>(
+	func getAttribute<AttributeType>(
 		_ key: NSAttributedString.Key
 	) -> AttributeType? where AttributeType: OptionSet {
 		if let attribute = (attributes ?? cachedAttributes)[key] as? AttributeType.RawValue {
@@ -206,7 +206,7 @@ extension UILabel {
 	}
 
 	/// Add (or remove) attribute for the given key (if any).
-	fileprivate func setAttribute<AttributeType>(
+	func setAttribute<AttributeType>(
 		_ key: NSAttributedString.Key,
 		value: AttributeType?
 	) where AttributeType: Any  {
@@ -218,7 +218,7 @@ extension UILabel {
 	}
 
 	/// Add (or remove) `OptionSet` attribute for the given key (if any).
-	fileprivate func setAttribute<AttributeType>(
+	 func setAttribute<AttributeType>(
 		_ key: NSAttributedString.Key,
 		value: AttributeType?
 	) where AttributeType: OptionSet  {
@@ -231,7 +231,9 @@ extension UILabel {
 }
 
 
-extension NSParagraphStyle {
+// MARK: Paragraph Style
+
+fileprivate extension NSParagraphStyle {
 
 	var mutable: NSMutableParagraphStyle {
 		let mutable = NSMutableParagraphStyle()
@@ -241,7 +243,7 @@ extension NSParagraphStyle {
 }
 
 
-extension NSMutableParagraphStyle {
+fileprivate extension NSMutableParagraphStyle {
 
 	func withProperty<ValueType>(
 		_ value: ValueType,

UILabel_Typography_Extensions/View/EmptyViewController.swift

@@ -21,12 +21,14 @@ class EmptyViewController: UIViewController {
 			$0.layer.compositingFilter = "multiplyBlendMode"
 			$0.numberOfLines = 0
 			$0.showGrid = true
+			
+			// Alignment before typography.
+			$0.textAlignment = .right
 			$0.lineHeight = CGFloat(87)
 			$0.underline = .single
 
 			// Set text after.
 			$0.text = loremIpsum
-			$0.textAlignment = .right
 
 		}.inspect