Skip to content

Make extension work for UITextView and UITextField #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vol24pl wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make extension work for UITextView and UITextField #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63aa3ca
Make extension work for UITextView and UITextField
vol24pl May 15, 2022
e21854f
Make optional extension fileprivate
vol24pl May 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions UILabel_Typography_Extensions.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
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 */; };
55F7E33225A03D8300E7F48B /* UILabel+Observer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E33125A03D8300E7F48B /* UILabel+Observer.swift */; };
55F7E33E25A051FE00E7F48B /* UILabel+Grid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E33825A03FE500E7F48B /* UILabel+Grid.swift */; };
55F7E33225A03D8300E7F48B /* Typography+Observer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E33125A03D8300E7F48B /* Typography+Observer.swift */; };
55F7E33E25A051FE00E7F48B /* Typography+Grid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E33825A03FE500E7F48B /* Typography+Grid.swift */; };
55F7E34125A0A91E00E7F48B /* LoremIpsumViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E34025A0A91E00E7F48B /* LoremIpsumViewController.swift */; };
55F7E34425A0AA5E00E7F48B /* GlyphViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E34325A0AA5E00E7F48B /* GlyphViewController.swift */; };
55F7E34825A0AD7F00E7F48B /* AttributesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E34725A0AD7F00E7F48B /* AttributesViewController.swift */; };
55F7E34B25A0ADFA00E7F48B /* UILabel+Typograpy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E34A25A0ADFA00E7F48B /* UILabel+Typograpy.swift */; };
55F7E34B25A0ADFA00E7F48B /* Views+Typography.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7E34A25A0ADFA00E7F48B /* Views+Typography.swift */; };
55F7F0A2259A6F03001BEF90 /* Typography.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F7F0A1259A6F03001BEF90 /* Typography.swift */; };
55FE48F027DFE62800DCD799 /* UlLabel_Line_Height_Letter_Spacing_Extension_UIKit.png in Resources */ = {isa = PBXBuildFile; fileRef = 55FE48EF27DFE62800DCD799 /* UlLabel_Line_Height_Letter_Spacing_Extension_UIKit.png */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -72,13 +72,13 @@
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+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>"; };
55F7E33125A03D8300E7F48B /* Typography+Observer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Typography+Observer.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>"; };
55F7E33825A03FE500E7F48B /* Typography+Grid.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Typography+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>"; };
55F7E34A25A0ADFA00E7F48B /* Views+Typography.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Views+Typography.swift"; sourceTree = "<group>"; };
55F7F0A1259A6F03001BEF90 /* Typography.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Typography.swift; sourceTree = "<group>"; };
55FE48EF27DFE62800DCD799 /* UlLabel_Line_Height_Letter_Spacing_Extension_UIKit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = UlLabel_Line_Height_Letter_Spacing_Extension_UIKit.png; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -98,9 +98,9 @@
isa = PBXGroup;
children = (
55F7F0A1259A6F03001BEF90 /* Typography.swift */,
55F7E34A25A0ADFA00E7F48B /* UILabel+Typograpy.swift */,
55F7E33125A03D8300E7F48B /* UILabel+Observer.swift */,
55F7E33825A03FE500E7F48B /* UILabel+Grid.swift */,
55F7E33125A03D8300E7F48B /* Typography+Observer.swift */,
55F7E33825A03FE500E7F48B /* Typography+Grid.swift */,
55F7E34A25A0ADFA00E7F48B /* Views+Typography.swift */,
559795E425A259E400A757A3 /* UIColor+Styles.swift */,
551B425E259BCE40001310A9 /* UIFont+Extensions.swift */,
55A3EECD27D7F24C0002193A /* UIFont+Inspection.swift */,
Expand Down Expand Up @@ -277,15 +277,15 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
55F7E34B25A0ADFA00E7F48B /* UILabel+Typograpy.swift in Sources */,
55F7E34B25A0ADFA00E7F48B /* Views+Typography.swift in Sources */,
55F236A225912BBE0007BC69 /* AppDelegate.swift in Sources */,
55F7F0A2259A6F03001BEF90 /* Typography.swift in Sources */,
55F236CA25912E690007BC69 /* PreviewView.swift in Sources */,
5501DB9327D81EC9009E0FDA /* ManualViewController.swift in Sources */,
55722E1F27DB63BC002DE7DC /* PlanetViewController.swift in Sources */,
559FB34E25A4B1A200CE795D /* LineHeightViewController.swift in Sources */,
5501DB9727D8240E009E0FDA /* UIButton+Styles.swift in Sources */,
55F7E33225A03D8300E7F48B /* UILabel+Observer.swift in Sources */,
55F7E33225A03D8300E7F48B /* Typography+Observer.swift in Sources */,
55F236BB25912C430007BC69 /* Withable.swift in Sources */,
55F7E34425A0AA5E00E7F48B /* GlyphViewController.swift in Sources */,
55F236BF25912C710007BC69 /* UIKit+Extensions.swift in Sources */,
Expand All @@ -301,7 +301,7 @@
5558DA4627DA1FA900A4A178 /* MockupViewController.swift in Sources */,
55F7E34825A0AD7F00E7F48B /* AttributesViewController.swift in Sources */,
55F236B725912BF20007BC69 /* MenuViewController.swift in Sources */,
55F7E33E25A051FE00E7F48B /* UILabel+Grid.swift in Sources */,
55F7E33E25A051FE00E7F48B /* Typography+Grid.swift in Sources */,
5501DB9127D81E70009E0FDA /* EmptyViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
76 changes: 45 additions & 31 deletions ..._Extensions/Typography/UILabel+Grid.swift → ...tensions/Typography/Typography+Grid.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,38 @@

import UIKit

fileprivate enum Keys {
static var showGrid: UInt8 = 0
fileprivate static let gridLayerName = "Grid"
fileprivate static let compositingFilter = "multiplyBlendMode"
}

extension UITextView {
override open func layoutSubviews() {
super.layoutSubviews()
removeGridLayerIfNeeded()
addGridLayerIfNeeded()
}
}

extension UILabel {

fileprivate struct Keys {

static var showGrid: UInt8 = 0
}

override open func layoutSubviews() {
super.layoutSubviews()
removeGridLayerIfNeeded()
addGridLayerIfNeeded()
}
}

extension UITextField {
override open func layoutSubviews() {
super.layoutSubviews()
removeGridLayerIfNeeded()
addGridLayerIfNeeded()
}
}

extension TypographyExtensions where Self: UIView {

public var showGrid: Bool {
get {
(objc_getAssociatedObject(self, &Keys.showGrid) as? NSNumber)?.boolValue ?? false
Expand All @@ -43,20 +67,10 @@ extension UILabel {
}
}

fileprivate static let gridLayerName = "Grid"

fileprivate static let compositingFilter = "multiplyBlendMode"

fileprivate var gridLayer: CALayer? {
layer.sublayers?.first(where: { $0.name == Self.gridLayerName })
layer.sublayers?.first(where: { $0.name == Keys.gridLayerName })
}

override open func layoutSubviews() {
super.layoutSubviews()
removeGridLayerIfNeeded()
addGridLayerIfNeeded()
}


fileprivate func addGridLayerIfNeeded() {

// Only if needed.
Expand All @@ -66,18 +80,18 @@ extension UILabel {

// Add.
let gridLayer = CALayer()
gridLayer.name = Self.gridLayerName
gridLayer.compositingFilter = Self.compositingFilter
gridLayer.name = Keys.gridLayerName
gridLayer.compositingFilter = Keys.compositingFilter
layer.addSublayer(gridLayer)

// Draw until fits.
let baselineOffset = abs(self.baselineOffset)
var cursor = CGFloat.zero
cursor += baselineOffset
while cursor + font.lineHeight - 2 < frame.size.height {
while cursor + optionalFont!.lineHeight - 2 < frame.size.height {
addGridLayers(to: gridLayer, offset: cursor)
cursor += font.lineHeight
cursor += font.leading
cursor += optionalFont!.lineHeight
cursor += optionalFont!.leading
cursor += baselineOffset
cursor += baselineOffset
}
Expand All @@ -92,11 +106,11 @@ extension UILabel {
fileprivate func addGridLayers(to gridLayer: CALayer, offset: CGFloat) {

// Top down.
let baseline = font.ascender + offset
let descender = baseline - font.descender
let xHeight = baseline - font.xHeight
let capHeight = baseline - font.capHeight
let ascender = baseline - font.ascender
let baseline = optionalFont!.ascender + offset
let descender = baseline - optionalFont!.descender
let xHeight = baseline - optionalFont!.xHeight
let capHeight = baseline - optionalFont!.capHeight
let ascender = baseline - optionalFont!.ascender

let baselineOffset = abs(self.baselineOffset)
let top = ascender - baselineOffset
Expand Down Expand Up @@ -144,19 +158,19 @@ extension UILabel {
layer.strokeColor = stroke?.cgColor
layer.lineDashPattern = dash
layer.lineCap = .round
layer.compositingFilter = Self.compositingFilter
layer.compositingFilter = Keys.compositingFilter
return layer
}
}


fileprivate extension UILabel {
fileprivate extension TypographyExtensions {

var baselineOffset: CGFloat {
guard let lineHeight = paragraphStyle?.maximumLineHeight,
lineHeight != 0.0 else {
return 0.0
}
return (lineHeight - font.lineHeight) / 2.0
return (lineHeight - optionalFont!.lineHeight) / 2.0
}
}
13 changes: 6 additions & 7 deletions ...ensions/Typography/UILabel+Observer.swift → ...ions/Typography/Typography+Observer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,15 @@

import UIKit

fileprivate enum Keys {
static var observer: UInt8 = 0
}

extension UILabel {
extension TypographyExtensions {

typealias TextObserver = Observer<UILabel, String?>
typealias TextObserver = Observer<Self, String?>
typealias TextChangeAction = (_ oldValue: String?, _ newValue: String?) -> Void

fileprivate struct Keys {
static var observer: UInt8 = 0
}


fileprivate var observer: TextObserver? {
get {
objc_getAssociatedObject(self, &Keys.observer) as? TextObserver
Expand Down
Loading