From e0fbf88912100d665a5f6055b0e1e05e445aede2 Mon Sep 17 00:00:00 2001
From: 3stud1ant3 <rkeeper4418@gmail.com>
Date: Fri, 24 Nov 2017 23:42:01 +0500
Subject: [PATCH] feat: change corner radius for multilines from storyboard

---
 Example/Base.lproj/Main.storyboard          |  6 ++
 Sources/Extensions/CALayer+Extensions.swift |  4 +-
 Sources/Helpers/ContainsMultilineText.swift | 82 +++++++++++++--------
 Sources/SkeletonDefaultConfig.swift         | 22 +++---
 Sources/SkeletonLayer.swift                 |  8 +-
 5 files changed, 79 insertions(+), 43 deletions(-)

diff --git a/Example/Base.lproj/Main.storyboard b/Example/Base.lproj/Main.storyboard
index 02df0d0..6b1516c 100644
--- a/Example/Base.lproj/Main.storyboard
+++ b/Example/Base.lproj/Main.storyboard
@@ -52,6 +52,9 @@
                                                     <nil key="highlightedColor"/>
                                                     <userDefinedRuntimeAttributes>
                                                         <userDefinedRuntimeAttribute type="boolean" keyPath="isSkeletonable" value="YES"/>
+                                                        <userDefinedRuntimeAttribute type="number" keyPath="linesCornerRadius">
+                                                            <integer key="value" value="0"/>
+                                                        </userDefinedRuntimeAttribute>
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
                                             </subviews>
@@ -99,6 +102,9 @@
                                             <userDefinedRuntimeAttribute type="number" keyPath="lastLineFillPercent">
                                                 <integer key="value" value="40"/>
                                             </userDefinedRuntimeAttribute>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="linesCornerRadius">
+                                                <integer key="value" value="6"/>
+                                            </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                     </textView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar" translatesAutoresizingMaskIntoConstraints="NO" id="nMj-pU-5wJ">
diff --git a/Sources/Extensions/CALayer+Extensions.swift b/Sources/Extensions/CALayer+Extensions.swift
index 886ccc0..e300c81 100644
--- a/Sources/Extensions/CALayer+Extensions.swift
+++ b/Sources/Extensions/CALayer+Extensions.swift
@@ -36,7 +36,7 @@ extension CALayer {
         return sublayers?.filter { $0.name == CALayer.skeletonSubLayersName } ?? [CALayer]()
     }
     
-    func addMultilinesLayers(lines: Int, type: SkeletonType, lastLineFillPercent: Int) {
+    func addMultilinesLayers(lines: Int, type: SkeletonType, lastLineFillPercent: Int, multilineCornerRadius: Int) {
         let numberOfSublayers = calculateNumLines(maxLines: lines)
         for index in 0..<numberOfSublayers {
             var width = bounds.width
@@ -45,7 +45,7 @@ extension CALayer {
                 width = width * CGFloat(lastLineFillPercent)/100;
             }
             
-            let layer = SkeletonLayerFactory().makeMultilineLayer(withType: type, for: index, width: width)
+            let layer = SkeletonLayerFactory().makeMultilineLayer(withType: type, for: index, width: width, multilineCornerRadius: multilineCornerRadius)
             addSublayer(layer)
         }
     }
diff --git a/Sources/Helpers/ContainsMultilineText.swift b/Sources/Helpers/ContainsMultilineText.swift
index d3f287d..d3b63a2 100644
--- a/Sources/Helpers/ContainsMultilineText.swift
+++ b/Sources/Helpers/ContainsMultilineText.swift
@@ -9,50 +9,74 @@
 import UIKit
 
 private enum AssociatedKeys {
-    static var lastLineFillingPercent = "lastLineFillingPercent"
+        static var lastLineFillingPercent = "lastLineFillingPercent"
+        static var multilineCornerRadius = "multilineCornerRadius"
+        
 }
 
 protocol ContainsMultilineText {
-    var numLines: Int { get }
-    var lastLineFillingPercent: Int { get }
+        var numLines: Int { get }
+        var lastLineFillingPercent: Int { get }
+        var multilineCornerRadius: Int { get }
 }
 
 extension ContainsMultilineText {
-    var numLines: Int { return 0 }
+        var numLines: Int { return 0 }
 }
 
 public extension UILabel {
-    
-    @IBInspectable
-    var lastLineFillPercent: Int {
-        get { return lastLineFillingPercent }
-        set { lastLineFillingPercent = min(newValue, 100) }
-    }
+        
+        @IBInspectable
+        var lastLineFillPercent: Int {
+                get { return lastLineFillingPercent }
+                set { lastLineFillingPercent = min(newValue, 100) }
+        }
+        @IBInspectable
+        var linesCornerRadius: Int {
+                get { return multilineCornerRadius }
+                set { multilineCornerRadius = min(newValue, 10) }
+        }
 }
 
 public extension UITextView {
-    
-    @IBInspectable
-    var lastLineFillPercent: Int {
-        get { return lastLineFillingPercent }
-        set { lastLineFillingPercent = min(newValue, 100) }
-    }
+        
+        @IBInspectable
+        var lastLineFillPercent: Int {
+                get { return lastLineFillingPercent }
+                set { lastLineFillingPercent = min(newValue, 100) }
+        }
+        
+        @IBInspectable
+        var linesCornerRadius: Int {
+                get { return multilineCornerRadius }
+                set { multilineCornerRadius = min(newValue, 10) }
+        }
 }
 
 extension UILabel: ContainsMultilineText {
-    var numLines: Int { 
-        return numberOfLines
-    }
-    
-    var lastLineFillingPercent: Int {
-        get { return objc_getAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent) as? Int ?? SkeletonDefaultConfig.multilineLastLineFillPercent }
-        set { objc_setAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent, newValue, AssociationPolicy.retain.objc) }
-    }
+        var numLines: Int {
+                return numberOfLines
+        }
+        
+        var lastLineFillingPercent: Int {
+                get { return objc_getAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent) as? Int ?? SkeletonDefaultConfig.multilineLastLineFillPercent }
+                set { objc_setAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent, newValue, AssociationPolicy.retain.objc) }
+        }
+        var multilineCornerRadius: Int {
+                get { return objc_getAssociatedObject(self, &AssociatedKeys.multilineCornerRadius) as? Int ?? SkeletonDefaultConfig.multilineCornerRadius }
+                set { objc_setAssociatedObject(self, &AssociatedKeys.multilineCornerRadius, newValue, AssociationPolicy.retain.objc) }
+        }
+        
 }
 extension UITextView: ContainsMultilineText {
-    
-    var lastLineFillingPercent: Int {
-        get { return objc_getAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent) as? Int ?? SkeletonDefaultConfig.multilineLastLineFillPercent }
-        set { objc_setAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent, newValue, AssociationPolicy.retain.objc) }
-    }
+        
+        var lastLineFillingPercent: Int {
+                get { return objc_getAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent) as? Int ?? SkeletonDefaultConfig.multilineLastLineFillPercent }
+                set { objc_setAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent, newValue, AssociationPolicy.retain.objc) }
+        }
+        
+        var multilineCornerRadius: Int {
+                get { return objc_getAssociatedObject(self, &AssociatedKeys.multilineCornerRadius) as? Int ?? SkeletonDefaultConfig.multilineCornerRadius }
+                set { objc_setAssociatedObject(self, &AssociatedKeys.multilineCornerRadius, newValue, AssociationPolicy.retain.objc) }
+        }
 }
diff --git a/Sources/SkeletonDefaultConfig.swift b/Sources/SkeletonDefaultConfig.swift
index 3922fb1..0c130fd 100644
--- a/Sources/SkeletonDefaultConfig.swift
+++ b/Sources/SkeletonDefaultConfig.swift
@@ -9,14 +9,16 @@
 import UIKit
 
 public enum SkeletonDefaultConfig {
-    
-    public static let tintColor = UIColor.clouds
-    
-    public static let gradient = SkeletonGradient(baseColor: tintColor)
-    
-    public static let multilineHeight: CGFloat = 15
-    
-    public static let multilineSpacing: CGFloat = 10
-    
-    public static let multilineLastLineFillPercent = 70
+        
+        public static let tintColor = UIColor.clouds
+        
+        public static let gradient = SkeletonGradient(baseColor: tintColor)
+        
+        public static let multilineHeight: CGFloat = 15
+        
+        public static let multilineSpacing: CGFloat = 10
+        
+        public static let multilineLastLineFillPercent = 70
+        
+        public static let multilineCornerRadius = 0
 }
diff --git a/Sources/SkeletonLayer.swift b/Sources/SkeletonLayer.swift
index 4df1c31..a16a470 100644
--- a/Sources/SkeletonLayer.swift
+++ b/Sources/SkeletonLayer.swift
@@ -14,12 +14,16 @@ class SkeletonLayerFactory {
         return SkeletonLayer(withType: type, usingColors: colors, andSkeletonHolder: holder)
     }
     
-    func makeMultilineLayer(withType type: SkeletonType, for index: Int, width: CGFloat) -> CALayer {
+    func makeMultilineLayer(withType type: SkeletonType, for index: Int, width: CGFloat, multilineCornerRadius: Int) -> CALayer {
         let spaceRequiredForEachLine = SkeletonDefaultConfig.multilineHeight + SkeletonDefaultConfig.multilineSpacing
         let layer = type.layer
         layer.anchorPoint = .zero
         layer.name = CALayer.skeletonSubLayersName
         layer.frame = CGRect(x: 0.0, y: CGFloat(index) * spaceRequiredForEachLine, width: width, height: SkeletonDefaultConfig.multilineHeight)
+        
+        layer.cornerRadius = CGFloat(multilineCornerRadius)
+        layer.masksToBounds = true
+
         return layer
     }
 }
@@ -77,7 +81,7 @@ struct SkeletonLayer {
     
     func addMultilinesIfNeeded() {
         guard let multiLineView = holder as? ContainsMultilineText else { return }
-        maskLayer.addMultilinesLayers(lines: multiLineView.numLines, type: type, lastLineFillPercent: multiLineView.lastLineFillingPercent)
+        maskLayer.addMultilinesLayers(lines: multiLineView.numLines, type: type, lastLineFillPercent: multiLineView.lastLineFillingPercent, multilineCornerRadius: multiLineView.multilineCornerRadius)
     }
 }