fix: problem with text views that only have one line

Juanpe · Feb 12, 2020 · 6529937 · 6529937
1 parent d8f1b4c
commit 6529937
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 149 deletions.
diff --git a/Example/TableView/Base.lproj/Main.storyboard b/Example/TableView/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Va7-1y-Tel">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Va7-1y-Tel">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -87,12 +87,12 @@
                                                         <userDefinedRuntimeAttribute type="boolean" keyPath="isSkeletonable" value="YES"/>
                                                     </userDefinedRuntimeAttributes>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VhU-1t-AaI" userLabel="Label">
-                                                    <rect key="frame" x="118" y="29" width="237" height="20.333333333333329"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VhU-1t-AaI" userLabel="Label">
+                                                    <rect key="frame" x="118" y="29" width="237" height="18"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" relation="lessThanOrEqual" constant="71" id="HRL-cI-ieC"/>
                                                     </constraints>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                     <userDefinedRuntimeAttributes>
@@ -261,7 +261,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-2682" y="340"/>
+            <point key="canvasLocation" x="-2682.4000000000001" y="339.90147783251234"/>
         </scene>
         <!--Item-->
         <scene sceneID="Cfc-AT-AS1">

diff --git a/SkeletonView.xcodeproj/project.pbxproj b/SkeletonView.xcodeproj/project.pbxproj
@@ -38,9 +38,6 @@
 		42ABD07B210B54E200BEEFF4 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42ABD073210B54E100BEEFF4 /* ViewController.swift */; };
 		42ABD07C210B54E200BEEFF4 /* Base.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 42ABD074210B54E100BEEFF4 /* Base.lproj */; };
 		42ABD07F210B54E200BEEFF4 /* CollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42ABD077210B54E200BEEFF4 /* CollectionViewCell.swift */; };
-		7454EBFE2346A61A0018C8E5 /* ContainsSinglelineText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7454EBFD2346A61A0018C8E5 /* ContainsSinglelineText.swift */; };
-		7454EC002346A62F0018C8E5 /* UILabel+Singleline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7454EBFF2346A62F0018C8E5 /* UILabel+Singleline.swift */; };
-		7454EC022346A6430018C8E5 /* UITextView+Singleline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7454EC012346A6430018C8E5 /* UITextView+Singleline.swift */; };
 		870F4E4321CAC07300B9233B /* SkeletonConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 870F4E4221CAC07300B9233B /* SkeletonConfig.swift */; };
 		870F4E4421CAC07300B9233B /* SkeletonConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 870F4E4221CAC07300B9233B /* SkeletonConfig.swift */; };
 		872D5A5621C177E20037D763 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872D5A5521C177E20037D763 /* UIView+Extension.swift */; };
@@ -164,9 +161,6 @@
 		42ABD076210B54E200BEEFF4 /* SkeletonViewExampleCollectionview-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SkeletonViewExampleCollectionview-Info.plist"; sourceTree = "<group>"; };
 		42ABD077210B54E200BEEFF4 /* CollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewCell.swift; sourceTree = "<group>"; };
 		52D6D97C1BEFF229002C0205 /* SkeletonView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SkeletonView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		7454EBFD2346A61A0018C8E5 /* ContainsSinglelineText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainsSinglelineText.swift; sourceTree = "<group>"; };
-		7454EBFF2346A62F0018C8E5 /* UILabel+Singleline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Singleline.swift"; sourceTree = "<group>"; };
-		7454EC012346A6430018C8E5 /* UITextView+Singleline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextView+Singleline.swift"; sourceTree = "<group>"; };
 		870F4E4221CAC07300B9233B /* SkeletonConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonConfig.swift; sourceTree = "<group>"; };
 		872D5A5521C177E20037D763 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
 		872D5A5B21C24EDD0037D763 /* UILabel+Multiline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+Multiline.swift"; sourceTree = "<group>"; };
@@ -282,16 +276,6 @@
 			path = Configs;
 			sourceTree = "<group>";
 		};
-		7454EBFC2346A5F90018C8E5 /* SingleLine */ = {
-			isa = PBXGroup;
-			children = (
-				7454EBFD2346A61A0018C8E5 /* ContainsSinglelineText.swift */,
-				7454EBFF2346A62F0018C8E5 /* UILabel+Singleline.swift */,
-				7454EC012346A6430018C8E5 /* UITextView+Singleline.swift */,
-			);
-			path = SingleLine;
-			sourceTree = "<group>";
-		};
 		872D5A5821C17D850037D763 /* CollectionView */ = {
 			isa = PBXGroup;
 			children = (
@@ -358,7 +342,6 @@
 			isa = PBXGroup;
 			children = (
 				E4CE587A22EEE62300333067 /* Transitions */,
-				7454EBFC2346A5F90018C8E5 /* SingleLine */,
 				872D5A5A21C24E7C0037D763 /* Multilines */,
 				877EFA4321BEE9C40031FC00 /* Builders */,
 				8785E39F211C9C7C00CC9DFD /* Debug */,
@@ -752,9 +735,7 @@
 				F54CF5E52024CEB000330B0D /* UITableView+CollectionSkeleton.swift in Sources */,
 				F5307E321FB0F42F00EE67C5 /* RecursiveProtocol.swift in Sources */,
 				F5F622431FAC81FD007C062A /* CALayer+Extensions.swift in Sources */,
-				7454EC002346A62F0018C8E5 /* UILabel+Singleline.swift in Sources */,
 				877EFA4821BEED760031FC00 /* SkeletonMultilineLayerBuilder.swift in Sources */,
-				7454EBFE2346A61A0018C8E5 /* ContainsSinglelineText.swift in Sources */,
 				E4CE587D22EEE65200333067 /* SkeletonTransitionStyle.swift in Sources */,
 				F5F899ED1FAB9F04002E8FDA /* CollectionSkeletonProtocol.swift in Sources */,
 				F58A6E6E20A8C66300612494 /* Recoverable.swift in Sources */,
@@ -763,7 +744,6 @@
 				F5F899EB1FAB9DA3002E8FDA /* SkeletonCollectionDataSource.swift in Sources */,
 				F5F622411FAC6E31007C062A /* UIColor+Skeleton.swift in Sources */,
 				F5804772230ECD0000066D02 /* UIView+IBInspectable.swift in Sources */,
-				7454EC022346A6430018C8E5 /* UITextView+Singleline.swift in Sources */,
 				F587FB84202CBFC8002DB5FE /* SkeletonFlow.swift in Sources */,
 				F570ABF42314629700390248 /* Swizzling.swift in Sources */,
 				F5D3FB0B209DCAA300003FCF /* SubviewsSkeletonables.swift in Sources */,

diff --git a/Sources/Appearance/SkeletonAppearance.swift b/Sources/Appearance/SkeletonAppearance.swift
@@ -9,9 +9,7 @@ public protocol Appearance {
     var multilineSpacing: CGFloat { get set }
     var multilineLastLineFillPercent: Int { get set }
     var multilineCornerRadius: Int { get set }
-    var renderSingleLineAsCustom: Bool { get set }
-    var singlelineFillPercent: Int { get set }
-    var singlelineCornerRadius: Int { get set }
+    var renderSingleLineAsView: Bool { get set }
 }
 
 public enum SkeletonAppearance {
@@ -34,10 +32,6 @@ class SkeletonViewAppearance: Appearance {
 
     var multilineCornerRadius: Int = 0
 
-    var renderSingleLineAsCustom: Bool = false
-
-    var singlelineFillPercent: Int = 100
-
-    var singlelineCornerRadius: Int = 0
+    var renderSingleLineAsView: Bool = false
 }
 // codebeat:enable[TOO_MANY_IVARS]
diff --git a/Sources/Builders/SkeletonMultilineLayerBuilder.swift b/Sources/Builders/SkeletonMultilineLayerBuilder.swift
@@ -7,6 +7,7 @@ import UIKit
 class SkeletonMultilineLayerBuilder {
     var skeletonType: SkeletonType?
     var index: Int?
+    var height: CGFloat?
     var width: CGFloat?
     var cornerRadius: Int?
     var multilineSpacing: CGFloat = SkeletonAppearance.default.multilineSpacing
@@ -22,6 +23,11 @@ class SkeletonMultilineLayerBuilder {
         return self
     }
 
+    func setHeight(_ height: CGFloat) -> SkeletonMultilineLayerBuilder {
+           self.height = height
+           return self
+       }
+
     func setWidth(_ width: CGFloat) -> SkeletonMultilineLayerBuilder {
         self.width = width
         return self
@@ -46,13 +52,14 @@ class SkeletonMultilineLayerBuilder {
         guard let type = skeletonType,
               let index = index,
               let width = width,
+              let height = height,
               let radius = cornerRadius
             else { return nil }
 
         let layer = type.layer
         layer.anchorPoint = .zero
         layer.name = CALayer.skeletonSubLayersName
-        layer.updateLayerFrame(for: index, width: width, multilineSpacing: self.multilineSpacing, paddingInsets: paddingInsets)
+        layer.updateLayerFrame(for: index, size: CGSize(width: width, height: height), multilineSpacing: self.multilineSpacing, paddingInsets: paddingInsets)
 
         layer.cornerRadius = CGFloat(radius)
         layer.masksToBounds = true

diff --git a/Sources/Extensions/CALayer+Extensions.swift b/Sources/Extensions/CALayer+Extensions.swift
@@ -47,20 +47,20 @@ extension CALayer {
         return sublayers?.filter { $0.name == CALayer.skeletonSubLayersName } ?? [CALayer]()
     }
 
-    /// If preferences have been set for single lines, render these with custom preferences
-    func addSingleLineLayers(type: SkeletonType, singlelineFillPercent: Int, singlelineCornerRadius: Int, spacing: CGFloat) {
-        addMultilinesLayers(lines: 1, type: type, lastLineFillPercent: singlelineFillPercent, multilineCornerRadius: singlelineCornerRadius, multilineSpacing: spacing, paddingInsets: .zero)
-    }
-
 	func addMultilinesLayers(for config: SkeletonMultilinesLayerConfig) {
-		let numberOfSublayers = calculateNumLines(for: config)
+        let numberOfSublayers = config.lines == 1 ? 1 : calculateNumLines(for: config)
+        var height = config.lineHeight ?? SkeletonAppearance.default.multilineHeight
+        if numberOfSublayers == 1 {
+            height = bounds.height
+        }
 
         let layerBuilder = SkeletonMultilineLayerBuilder()
 			.setSkeletonType(config.type)
 			.setCornerRadius(config.multilineCornerRadius)
 			.setMultilineSpacing(config.multilineSpacing)
-			.setPadding(config.paddingInsets)
-
+            .setPadding(config.paddingInsets)
+            .setHeight(height)
+
         (0..<numberOfSublayers).forEach { index in
 			let width = calculatedWidthForLine(at: index, totalLines: numberOfSublayers, lastLineFillPercent: config.lastLineFillPercent, paddingInsets: config.paddingInsets)
             if let layer = layerBuilder
@@ -72,12 +72,20 @@ extension CALayer {
         }
     }
 
-    func updateMultilinesLayers(lastLineFillPercent: Int, multilineSpacing: CGFloat, paddingInsets: UIEdgeInsets) {
+    func updateMultilinesLayers(for config: SkeletonMultilinesLayerConfig) {
         let currentSkeletonSublayers = skeletonSublayers
         let numberOfSublayers = currentSkeletonSublayers.count
+        let lastLineFillPercent = config.lastLineFillPercent
+        let paddingInsets = config.paddingInsets
+        let multilineSpacing = config.multilineSpacing
+        var height = config.lineHeight ?? SkeletonAppearance.default.multilineHeight
+        if numberOfSublayers == 1 {
+            height = bounds.height
+        }
+
         for (index, layer) in currentSkeletonSublayers.enumerated() {
             let width = calculatedWidthForLine(at: index, totalLines: numberOfSublayers, lastLineFillPercent: lastLineFillPercent, paddingInsets: paddingInsets)
-            layer.updateLayerFrame(for: index, width: width, multilineSpacing: multilineSpacing, paddingInsets: paddingInsets)
+            layer.updateLayerFrame(for: index, size: CGSize(width: width, height: height), multilineSpacing: multilineSpacing, paddingInsets: paddingInsets)
         }
     }
 
@@ -89,14 +97,13 @@ extension CALayer {
         return width
     }
 
-    func updateLayerFrame(for index: Int, width: CGFloat, multilineSpacing: CGFloat, paddingInsets: UIEdgeInsets) {
+    func updateLayerFrame(for index: Int, size: CGSize, multilineSpacing: CGFloat, paddingInsets: UIEdgeInsets) {
         let spaceRequiredForEachLine = SkeletonAppearance.default.multilineHeight + multilineSpacing
-        frame = CGRect(x: paddingInsets.left, y: CGFloat(index) * spaceRequiredForEachLine + paddingInsets.top, width: width, height: SkeletonAppearance.default.multilineHeight)
+        frame = CGRect(x: paddingInsets.left, y: CGFloat(index) * spaceRequiredForEachLine + paddingInsets.top, width: size.width, height: size.height)
     }
 
 	private func calculateNumLines(for config: SkeletonMultilinesLayerConfig) -> Int {
-		let requiredSpaceForEachLine = config.lineHeight ?? (SkeletonAppearance.default.multilineHeight
-			+ config.multilineSpacing)
+		let requiredSpaceForEachLine = (config.lineHeight ?? SkeletonAppearance.default.multilineHeight) + config.multilineSpacing
 		var numberOfSublayers = Int(round(CGFloat(bounds.height - config.paddingInsets.top - config.paddingInsets.bottom)/CGFloat(requiredSpaceForEachLine)))
 		if config.lines != 0,  config.lines <= numberOfSublayers { numberOfSublayers = config.lines }
         return numberOfSublayers

diff --git a/Sources/SingleLine/ContainsSinglelineText.swift b/Sources/SingleLine/ContainsSinglelineText.swift
diff --git a/Sources/SingleLine/UILabel+Singleline.swift b/Sources/SingleLine/UILabel+Singleline.swift
diff --git a/Sources/SingleLine/UITextView+Singleline.swift b/Sources/SingleLine/UITextView+Singleline.swift