Merge branch 'Features/Empty_Label_Support' into main

Author: Geri-Borbas

.gitignore

@@ -0,0 +1,17 @@
+#macOS
+.DS_Store
+
+# Xcode
+xcuserdata/
+Build/
+
+# Cocoapods
+Pods
+*.xcworkspace
+
+# Bundler
+vendor
+.bundle
+
+#CocoaPods Keys
+.env

CHANGELOG.md

@@ -0,0 +1,56 @@
+#  CHANGELOG
+
+* Doing
+
+	+ (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`
+	+ Apply cached attributes (if any) in case text have just changed from empty on text change
+	+ More testbed cleanup
+
+* Feature/Empty_Label_Support/0.1.9
+
+	+ Cleaned up testbed views
+
+* Feature/Empty_Label_Support/0.1.8
+
+	+ Cleanup files and folders
+
+* Feature/Empty_Label_Support/0.1.7
+
+	+ Removed unused parameter from `onTextChange()`
+	+ Added `NSMutableParagraphStyle.withProperty()` to mutate paragraph style in place
+	
+* Feature/Empty_Label_Support/0.1.6
+
+	+ Added `NSParagraphStyle.paragraphStyleByAddingProperty` for in-place(ish) mutation
+	+ Copied text alignment at paragraph style mutation(s)
+
+* Feature/Empty_Label_Support/0.1.5
+
+	+ Added empty string ("") and `textAlignment` mutation to testbed
+
+* Feature/Empty_Label_Support/0.1.4
+
+	+ Added `UILabel.placeholder` attributed string to cache typography even when text is empty
+	+ Added `NSMutableString` extensions for in-place(ish) mutation
+		+ `NSMutableString.stringByAddingAttribute`
+		+ `NSMutableString.stringByRemovingAttribute`
+
+* Feature/Empty_Label_Support/0.1.0 - 0.1.2
+
+	+ Added `CHANGELOG.md`
+	+ Reuse `TextObserver.OnChangeAction` in `UILabel` text observer extension
+	+ Renamings
+
+* Feature/Empty_Label_Support
+
+	+ Merged `attributes-lost-when-text-is-empty` from Adrian Zyga
+
+* 0.0.0 - 0.8.1
+
+	+ Initial implementation
+	+ Testbed

README.md

@@ -17,7 +17,7 @@ A single extension on `UILabel` that adds some typographic property (see above)
 
 See the complementary article at [**UILabel line height, letter spacing and more** UILabel typography extensions].
 
-> 🚧  **Work in progress**. I have high hopes to add leading and trailing image feature, as well as upport for `UIButton`.
+> 🚧  **Work in progress**. I have high hopes to add leading and trailing image feature, as well as support for `UIButton`.
 
 ## License
 

UILabel_Typography_Extensions.xcodeproj/project.pbxproj

@@ -7,16 +7,20 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5501DB9127D81E70009E0FDA /* EmptyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5501DB9027D81E70009E0FDA /* EmptyViewController.swift */; };
+		5501DB9327D81EC9009E0FDA /* ManualViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5501DB9227D81EC9009E0FDA /* ManualViewController.swift */; };
+		5501DB9527D82099009E0FDA /* UIButton+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5501DB9427D82099009E0FDA /* UIButton+Extensions.swift */; };
+		5501DB9727D8240E009E0FDA /* UIButton+Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5501DB9627D8240E009E0FDA /* UIButton+Styles.swift */; };
 		551B425F259BCE40001310A9 /* UIFont+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 551B425E259BCE40001310A9 /* UIFont+Extensions.swift */; };
 		554AF31825961B6200A23E41 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 554AF31725961B6200A23E41 /* README.md */; };
-		55653BE625A36E0300678FD9 /* NSAttributedString+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E34F25A0B32D00E7F48B /* NSAttributedString+Extensions.swift */; };
 		559795E525A259E400A757A3 /* UIColor+Styles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 559795E425A259E400A757A3 /* UIColor+Styles.swift */; };
 		559FB34E25A4B1A200CE795D /* LineHeightViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 559FB34D25A4B1A200CE795D /* LineHeightViewController.swift */; };
+		55A3EECE27D7F24C0002193A /* UIFont+Inspection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55A3EECD27D7F24C0002193A /* UIFont+Inspection.swift */; };
 		55F236A225912BBE0007BC69 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F236A125912BBE0007BC69 /* AppDelegate.swift */; };
 		55F236A425912BBE0007BC69 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F236A325912BBE0007BC69 /* SceneDelegate.swift */; };
 		55F236A825912BC30007BC69 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 55F236A725912BC30007BC69 /* Assets.xcassets */; };
 		55F236AE25912BC30007BC69 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 55F236AC25912BC30007BC69 /* LaunchScreen.storyboard */; };
-		55F236B725912BF20007BC69 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F236B625912BF20007BC69 /* ViewController.swift */; };
+		55F236B725912BF20007BC69 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F236B625912BF20007BC69 /* MenuViewController.swift */; };
 		55F236BB25912C430007BC69 /* Withable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F236BA25912C430007BC69 /* Withable.swift */; };
 		55F236BF25912C710007BC69 /* UIKit+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F236BD25912C700007BC69 /* UIKit+Extensions.swift */; };
 		55F236CA25912E690007BC69 /* PreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F236C925912E690007BC69 /* PreviewView.swift */; };
@@ -30,29 +34,34 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		5501DB9027D81E70009E0FDA /* EmptyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyViewController.swift; sourceTree = "<group>"; };
+		5501DB9227D81EC9009E0FDA /* ManualViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualViewController.swift; sourceTree = "<group>"; };
+		5501DB9427D82099009E0FDA /* UIButton+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Extensions.swift"; sourceTree = "<group>"; };
+		5501DB9627D8240E009E0FDA /* UIButton+Styles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Styles.swift"; sourceTree = "<group>"; };
 		551B425E259BCE40001310A9 /* UIFont+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Extensions.swift"; sourceTree = "<group>"; };
+		554A2DCF27D67B66008A4AE4 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
 		554AF31725961B6200A23E41 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		559795E425A259E400A757A3 /* UIColor+Styles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Styles.swift"; sourceTree = "<group>"; };
 		559FB34D25A4B1A200CE795D /* LineHeightViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineHeightViewController.swift; sourceTree = "<group>"; };
+		55A3EECD27D7F24C0002193A /* UIFont+Inspection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Inspection.swift"; sourceTree = "<group>"; };
 		55F2369E25912BBE0007BC69 /* UILabel_Typography_Extensions.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UILabel_Typography_Extensions.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		55F236A125912BBE0007BC69 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		55F236A325912BBE0007BC69 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		55F236A725912BC30007BC69 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		55F236AD25912BC30007BC69 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		55F236AF25912BC30007BC69 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		55F236B625912BF20007BC69 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		55F236B625912BF20007BC69 /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
 		55F236BA25912C430007BC69 /* Withable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Withable.swift; sourceTree = "<group>"; };
 		55F236BD25912C700007BC69 /* UIKit+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIKit+Extensions.swift"; sourceTree = "<group>"; };
 		55F236C925912E690007BC69 /* PreviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewView.swift; sourceTree = "<group>"; };
-		55F236CE259135680007BC69 /* UILabel+DeprecatedExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+DeprecatedExtensions.swift"; sourceTree = "<group>"; };
+		55F236CE259135680007BC69 /* UILabel+Typography 1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Typography 1.swift"; sourceTree = "<group>"; };
 		55F7E33125A03D8300E7F48B /* UILabel+Observer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Observer.swift"; sourceTree = "<group>"; };
-		55F7E33425A03F9600E7F48B /* UILabel+Typograpy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Typograpy.swift"; sourceTree = "<group>"; };
+		55F7E33425A03F9600E7F48B /* UILabel+Typography 2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Typography 2.swift"; sourceTree = "<group>"; };
 		55F7E33825A03FE500E7F48B /* UILabel+Grid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Grid.swift"; sourceTree = "<group>"; };
 		55F7E34025A0A91E00E7F48B /* LoremIpsumViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoremIpsumViewController.swift; sourceTree = "<group>"; };
 		55F7E34325A0AA5E00E7F48B /* GlyphViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlyphViewController.swift; sourceTree = "<group>"; };
 		55F7E34725A0AD7F00E7F48B /* AttributesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributesViewController.swift; sourceTree = "<group>"; };
 		55F7E34A25A0ADFA00E7F48B /* UILabel+Typograpy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Typograpy.swift"; sourceTree = "<group>"; };
-		55F7E34F25A0B32D00E7F48B /* NSAttributedString+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+Extensions.swift"; sourceTree = "<group>"; };
 		55F7F0A1259A6F03001BEF90 /* Typography.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Typography.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -75,26 +84,42 @@
 				55F7E33125A03D8300E7F48B /* UILabel+Observer.swift */,
 				55F7E33825A03FE500E7F48B /* UILabel+Grid.swift */,
 				559795E425A259E400A757A3 /* UIColor+Styles.swift */,
-				55F7E34F25A0B32D00E7F48B /* NSAttributedString+Extensions.swift */,
-				558D107725A15277005DB3DA /* Drafts */,
+				551B425E259BCE40001310A9 /* UIFont+Extensions.swift */,
+				55A3EECD27D7F24C0002193A /* UIFont+Inspection.swift */,
 			);
 			path = Typography;
 			sourceTree = "<group>";
 		};
-		558D107725A15277005DB3DA /* Drafts */ = {
+		558D107725A15277005DB3DA /* Deprecated */ = {
 			isa = PBXGroup;
 			children = (
-				55F7E33425A03F9600E7F48B /* UILabel+Typograpy.swift */,
-				55F236CE259135680007BC69 /* UILabel+DeprecatedExtensions.swift */,
-				551B425E259BCE40001310A9 /* UIFont+Extensions.swift */,
+				55F236CE259135680007BC69 /* UILabel+Typography 1.swift */,
+				55F7E33425A03F9600E7F48B /* UILabel+Typography 2.swift */,
 			);
-			path = Drafts;
+			path = Deprecated;
+			sourceTree = "<group>";
+		};
+		55A3EECF27D7F32E0002193A /* View */ = {
+			isa = PBXGroup;
+			children = (
+				55F236B625912BF20007BC69 /* MenuViewController.swift */,
+				5501DB9227D81EC9009E0FDA /* ManualViewController.swift */,
+				5501DB9027D81E70009E0FDA /* EmptyViewController.swift */,
+				55F7E34725A0AD7F00E7F48B /* AttributesViewController.swift */,
+				55F7E34325A0AA5E00E7F48B /* GlyphViewController.swift */,
+				559FB34D25A4B1A200CE795D /* LineHeightViewController.swift */,
+				55F7E34025A0A91E00E7F48B /* LoremIpsumViewController.swift */,
+				5501DB9427D82099009E0FDA /* UIButton+Extensions.swift */,
+				5501DB9627D8240E009E0FDA /* UIButton+Styles.swift */,
+			);
+			path = View;
 			sourceTree = "<group>";
 		};
 		55F2369525912BBE0007BC69 = {
 			isa = PBXGroup;
 			children = (
 				554AF31725961B6200A23E41 /* README.md */,
+				554A2DCF27D67B66008A4AE4 /* CHANGELOG.md */,
 				55F236A025912BBE0007BC69 /* UILabel_Typography_Extensions */,
 				55F2369F25912BBE0007BC69 /* Products */,
 			);
@@ -113,13 +138,10 @@
 			children = (
 				55F236A125912BBE0007BC69 /* AppDelegate.swift */,
 				55F236A325912BBE0007BC69 /* SceneDelegate.swift */,
+				55A3EECF27D7F32E0002193A /* View */,
 				554AF31C25961F2400A23E41 /* Typography */,
 				55F236C225912C780007BC69 /* Extensions */,
-				55F236B625912BF20007BC69 /* ViewController.swift */,
-				55F7E34725A0AD7F00E7F48B /* AttributesViewController.swift */,
-				55F7E34325A0AA5E00E7F48B /* GlyphViewController.swift */,
-				559FB34D25A4B1A200CE795D /* LineHeightViewController.swift */,
-				55F7E34025A0A91E00E7F48B /* LoremIpsumViewController.swift */,
+				558D107725A15277005DB3DA /* Deprecated */,
 				55F236A725912BC30007BC69 /* Assets.xcassets */,
 				55F236AC25912BC30007BC69 /* LaunchScreen.storyboard */,
 				55F236AF25912BC30007BC69 /* Info.plist */,
@@ -209,22 +231,26 @@
 			buildActionMask = 2147483647;
 			files = (
 				55F7E34B25A0ADFA00E7F48B /* UILabel+Typograpy.swift in Sources */,
-				55653BE625A36E0300678FD9 /* NSAttributedString+Extensions.swift in Sources */,
 				55F236A225912BBE0007BC69 /* AppDelegate.swift in Sources */,
 				55F7F0A2259A6F03001BEF90 /* Typography.swift in Sources */,
 				55F236CA25912E690007BC69 /* PreviewView.swift in Sources */,
+				5501DB9327D81EC9009E0FDA /* ManualViewController.swift in Sources */,
 				559FB34E25A4B1A200CE795D /* LineHeightViewController.swift in Sources */,
+				5501DB9727D8240E009E0FDA /* UIButton+Styles.swift in Sources */,
 				55F7E33225A03D8300E7F48B /* UILabel+Observer.swift in Sources */,
 				55F236BB25912C430007BC69 /* Withable.swift in Sources */,
 				55F7E34425A0AA5E00E7F48B /* GlyphViewController.swift in Sources */,
 				55F236BF25912C710007BC69 /* UIKit+Extensions.swift in Sources */,
+				55A3EECE27D7F24C0002193A /* UIFont+Inspection.swift in Sources */,
 				55F236A425912BBE0007BC69 /* SceneDelegate.swift in Sources */,
 				551B425F259BCE40001310A9 /* UIFont+Extensions.swift in Sources */,
+				5501DB9527D82099009E0FDA /* UIButton+Extensions.swift in Sources */,
 				55F7E34125A0A91E00E7F48B /* LoremIpsumViewController.swift in Sources */,
 				559795E525A259E400A757A3 /* UIColor+Styles.swift in Sources */,
 				55F7E34825A0AD7F00E7F48B /* AttributesViewController.swift in Sources */,
-				55F236B725912BF20007BC69 /* ViewController.swift in Sources */,
+				55F236B725912BF20007BC69 /* MenuViewController.swift in Sources */,
 				55F7E33E25A051FE00E7F48B /* UILabel+Grid.swift in Sources */,
+				5501DB9127D81E70009E0FDA /* EmptyViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

…rafts/UILabel+DeprecatedExtensions.swift …ns/Deprecated/UILabel+Typography 1.swiftUILabel_Typography_Extensions/Typography/Drafts/UILabel+DeprecatedExtensions.swift renamed to UILabel_Typography_Extensions/Deprecated/UILabel+Typography 1.swift UILabel_Typography_Extensions/Typography/Drafts/UILabel+DeprecatedExtensions.swift renamed to UILabel_Typography_Extensions/Deprecated/UILabel+Typography 1.swift

@@ -21,7 +21,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 		// Use a UIHostingController as window root view controller.
 		if let windowScene = scene as? UIWindowScene {
 		    let window = UIWindow(windowScene: windowScene)
-		    window.rootViewController = ViewController()
+		    window.rootViewController = MenuViewController()
 		    self.window = window
 		    window.makeKeyAndVisible()
 		}

…ypography/Drafts/UILabel+Typograpy.swift …ns/Deprecated/UILabel+Typography 2.swiftUILabel_Typography_Extensions/Typography/Drafts/UILabel+Typograpy.swift renamed to UILabel_Typography_Extensions/Deprecated/UILabel+Typography 2.swift UILabel_Typography_Extensions/Typography/Drafts/UILabel+Typograpy.swift renamed to UILabel_Typography_Extensions/Deprecated/UILabel+Typography 2.swift

@@ -0,0 +1,22 @@
+//
+//  UIFont+Extensions.swift
+//  UILabel_Typography_Extensions
+//
+//  Created by Geri Borbás on 29/12/2020.
+//
+
+import UIKit
+
+
+extension UIFont {
+	
+	static func newYork(ofSize size: CGFloat) -> UIFont {
+		let font: UIFont
+		if let newYork = UIFont.italicSystemFont(ofSize: size).fontDescriptor.withDesign(.serif) {
+			font = UIFont(descriptor: newYork, size: size)
+		} else {
+			font = UIFont.italicSystemFont(ofSize: size)
+		}
+		return font
+	}
+}

UILabel_Typography_Extensions/SceneDelegate.swift

@@ -1,8 +1,8 @@
 //
-//  UIFont+Extensions.swift
+//  UIFont+Inspection.swift
 //  UILabel_Typography_Extensions
 //
-//  Created by Geri Borbás on 29/12/2020.
+//  Created by Geri Borbás on 08/03/2022.
 //
 
 import UIKit
@@ -16,16 +16,6 @@ extension UIFont {
 		}.joined(separator: "\n")
 	}
 
-	static func newYork(ofSize size: CGFloat) -> UIFont {
-		let font: UIFont
-		if let newYork = UIFont.italicSystemFont(ofSize: size).fontDescriptor.withDesign(.serif) {
-			font = UIFont(descriptor: newYork, size: size)
-		} else {
-			font = UIFont.italicSystemFont(ofSize: size)
-		}
-		return font
-	}
-	
 	static func inspectNewYork() {
 		logNewYorkSizes()
 	}