From ae4ecfa7602b2af6e5bddcf3aec7db35da66883f Mon Sep 17 00:00:00 2001 From: Esme Putt Date: Fri, 4 Oct 2019 11:28:17 +1300 Subject: [PATCH] Added comments --- Sources/Appearance/SkeletonAppearance.swift | 2 +- Sources/Extensions/CALayer+Extensions.swift | 2 +- Sources/SkeletonLayer.swift | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Sources/Appearance/SkeletonAppearance.swift b/Sources/Appearance/SkeletonAppearance.swift index 0984c1c..deda304 100644 --- a/Sources/Appearance/SkeletonAppearance.swift +++ b/Sources/Appearance/SkeletonAppearance.swift @@ -33,7 +33,7 @@ class SkeletonViewAppearance: Appearance { var multilineCornerRadius: Int = 0 - var singlelineFillPercent: Int = 70 + var singlelineFillPercent: Int = 100 var singlelineCornerRadius: Int = 0 } diff --git a/Sources/Extensions/CALayer+Extensions.swift b/Sources/Extensions/CALayer+Extensions.swift index afc3e99..b1bbb8e 100644 --- a/Sources/Extensions/CALayer+Extensions.swift +++ b/Sources/Extensions/CALayer+Extensions.swift @@ -37,7 +37,7 @@ extension CALayer { return sublayers?.filter { $0.name == CALayer.skeletonSubLayersName } ?? [CALayer]() } - // If preferences have been set for single lines, render these with custom preferences + /// If preferences have been set for single lines, render these with custom preferences func addSingleLineLayers(type: SkeletonType, lastLineFillPercent: Int, multilineCornerRadius: Int) { addMultilinesLayers(lines: 1, type: type, lastLineFillPercent: lastLineFillPercent, multilineCornerRadius: multilineCornerRadius, multilineSpacing: 0, paddingInsets: .zero) } diff --git a/Sources/SkeletonLayer.swift b/Sources/SkeletonLayer.swift index d969601..ff0a41c 100755 --- a/Sources/SkeletonLayer.swift +++ b/Sources/SkeletonLayer.swift @@ -87,11 +87,12 @@ struct SkeletonLayer { return multiLineView } + /// If there is more than one line, or custom preferences have been set for a single line, draw custom layers func addLines() { if let multiLineView = multiLineViewHolder { maskLayer.addMultilinesLayers(lines: multiLineView.numLines, type: type, lastLineFillPercent: multiLineView.lastLineFillingPercent, multilineCornerRadius: multiLineView.multilineCornerRadius, multilineSpacing: multiLineView.multilineSpacing, paddingInsets: multiLineView.paddingInsets) } else if let singleLineView = holder as? ContainsSinglelineText, - singleLineView.singlelineFillingPercent != 100 || singleLineView.singlelineCornerRadius != 100 { + singleLineView.singlelineFillingPercent != SkeletonAppearance.default.singlelineFillPercent || singleLineView.singlelineCornerRadius != SkeletonAppearance.default.singlelineCornerRadius { maskLayer.addSingleLineLayers(type: type, lastLineFillPercent: singleLineView.singlelineFillingPercent, multilineCornerRadius: singleLineView.singlelineCornerRadius) } }