fix: readme

feat: Migrate to Swift 5

.github/FUNDING.yml

@@ -0,0 +1,9 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: skeletonview
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+custom: # Replace with a single custom sponsorship URL

.gitignore

@@ -46,7 +46,7 @@ playground.xcworkspace
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-# Pods/
+Pods/
 
 # Carthage
 #

.swift-version

@@ -1 +1 @@
-4.2
+5.0

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.2
 script:
   - xcodebuild -project SkeletonView.xcodeproj -target SkeletonView-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=12'
   - xcodebuild -project SkeletonView.xcodeproj -target SkeletonView-tvOS -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV,OS=12'

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file
 
+## Next version
+
+### New
+- Adding swift news to mentioned section (thanks @osterbergmarcus)
+
 ## [Debug (1.4)](https://github.com/Juanpe/SkeletonView/releases/tag/1.4)
 
 ### New

Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+gem 'cocoapods', '~> 1.7.0.beta.2'

Gemfile.lock

@@ -0,0 +1,212 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.0)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    atomos (0.1.3)
+    babosa (1.0.2)
+    claide (1.0.2)
+    cocoapods (1.7.0.beta.3)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.7.0.beta.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.2.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.6.6)
+      nap (~> 1.0)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.8.2, < 2.0)
+    cocoapods-core (1.7.0.beta.3)
+      activesupport (>= 4.0.2, < 6)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.2.2)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.3.1)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
+    concurrent-ruby (1.1.5)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    digest-crc (0.4.1)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.2)
+    emoji_regex (1.0.1)
+    escape (0.0.4)
+    excon (0.64.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
+    fastimage (2.1.5)
+    fastlane (2.121.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.3, < 3.0.0)
+      babosa (>= 1.0.2, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored
+      commander-fastlane (>= 4.4.6, < 5.0.0)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 2.0)
+      excon (>= 0.45.0, < 1.0.0)
+      faraday (~> 0.9)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 0.9)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.21.2, < 0.24.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
+      highline (>= 1.7.2, < 2.0.0)
+      json (< 3.0.0)
+      mini_magick (~> 4.5.1)
+      multi_json
+      multi_xml (~> 0.5)
+      multipart-post (~> 2.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
+      rubyzip (>= 1.2.2, < 2.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.8.1, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    fourflusher (2.2.0)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    google-api-client (0.23.9)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.7.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.9)
+    google-cloud-core (1.3.0)
+      google-cloud-env (~> 1.0)
+    google-cloud-env (1.0.5)
+      faraday (~> 0.11)
+    google-cloud-storage (1.16.0)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.23)
+      google-cloud-core (~> 1.2)
+      googleauth (>= 0.6.2, < 0.10.0)
+    googleauth (0.6.7)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.7)
+    highline (1.7.10)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.2.0)
+    jwt (2.1.0)
+    memoist (0.16.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mini_magick (4.5.1)
+    minitest (5.11.3)
+    molinillo (0.6.6)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nanaimo (0.2.6)
+    nap (1.1.0)
+    naturally (2.2.0)
+    netrc (0.11.0)
+    os (1.0.0)
+    plist (3.5.0)
+    public_suffix (2.0.5)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rouge (2.0.7)
+    ruby-macho (1.4.0)
+    rubyzip (1.2.2)
+    security (0.1.3)
+    signet (0.11.0)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.5)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
+    terminal-notifier (2.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    tty-cursor (0.6.1)
+    tty-screen (0.6.5)
+    tty-spinner (0.9.0)
+      tty-cursor (~> 0.6.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    unicode-display_width (1.5.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.8.2)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods (~> 1.7.0.beta.2)
+  fastlane
+
+BUNDLED WITH
+   1.16.6

Package.swift

@@ -0,0 +1,23 @@
+// swift-tools-version:5.0
+
+import PackageDescription
+
+let package = Package(
+    name: "SkeletonView",
+	platforms: [
+		.iOS(.v9),
+		.tvOS(.v9)
+	],
+    products: [
+        .library(
+            name: "SkeletonView",
+            targets: ["SkeletonView"])
+	],
+	targets: [
+		.target(
+			name: "SkeletonView",
+			dependencies: [],
+			path: "Sources")
+	],
+	swiftLanguageVersions: [.v5]
+)

README.md

@@ -1,34 +1,30 @@
 ![](Assets/header2.jpg)
 
 <p align="center">
-    <a href="https://travis-ci.org/Juanpe/SkeletonView">
-      <img src="https://img.shields.io/travis/Juanpe/SkeletonView.svg">
+    <a href="https://app.bitrise.io/app/6d289a17e22c8323">
+      <img src="https://app.bitrise.io/app/6d289a17e22c8323/status.svg?token=fI7gKC41XD9-aRXDScCKBw&branch=master">
     </a>
-    <a href="https://instagram.github.io/IGListKit/">
+    <a href="https://codebeat.co/projects/github-com-juanpe-skeletonview-master"><img alt="codebeat badge" src="https://codebeat.co/badges/f854fdfd-31e5-4689-ba04-075d83653e60" /></a>
+    <a href="https://github.com/Juanpe/SkeletonView">
         <img src="https://img.shields.io/cocoapods/p/SkeletonView.svg" alt="Platforms">
     </a>
-    <img src="https://img.shields.io/badge/Swift-4.1-orange.svg" />
+    <img src="https://img.shields.io/badge/Swift-5-orange.svg" />
     <a href="https://cocoapods.org/pods/SkeletonView">
         <img src="https://img.shields.io/cocoapods/v/SkeletonView.svg" alt="CocoaPods" />
     </a>
     <a href="https://github.com/Carthage/Carthage">
-        <img src="https://img.shields.io/badge/carthage-compatible-4BC51D.svg?style=flat" alt="Carthage" />
+        <img src="https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat" alt="Carthage" />
     </a>
-    <a href="https://cocoapods.org/pods/SkeletonView">
-        <img src="https://img.shields.io/cocoapods/dt/SkeletonView.svg?style=flat" alt="CocoaPods downloads" />
+    <a href="https://github.com/apple/swift-package-manager">
+        <img src="https://img.shields.io/badge/SPM-compatible-brightgreen.svg" alt="SPM" />
     </a>
     <a href="https://twitter.com/JuanpeCatalan">
         <img src="https://img.shields.io/badge/contact-@JuanpeCatalan-blue.svg?style=flat" alt="Twitter: @JuanpeCatalan" />
     </a>
-    <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=MJ4Y2D9DEX6FL&lc=ES&item_name=SkeletonView&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted">
-        <img src="https://img.shields.io/badge/Donate-PayPal-green.svg" alt="Paypal" />
-    </a>
+    <br/>
     <a href="https://twitter.com/intent/tweet?text=Wow%20This%20library%20is%20awesome:&url=https%3A%2F%2Fgithub.com%2FJuanpe%2FSkeletonView">
       <img src="https://img.shields.io/twitter/url/https/github.com/Juanpe/SkeletonView.svg?style=social" alt="License" />
     </a>
-    <a href="https://twitter.com/JuanpeCatalan">
-      <img src="https://img.shields.io/twitter/follow/JuanpeCatalan.svg?style=social&label=Follow" alt="Twitter" />
-    </a>
 </p>
 
 🌎  Translations: </br>
@@ -42,12 +38,11 @@ Today almost all apps have async processes, such as Api requests, long running p
 Enjoy it! 🙂
 
 * [Features](#-features)
-* [Requirements](#-supported-os--sdk-versions)
 * [Guides](#-guides)
-* [Example Project](#-example)
 * [Installation](#-installation)
   * [Cocoapods](#using-cocoapods)
   * [Carthage](#using-carthage)
+  * [SPM](#using-swift-package-manager)
 * [How to use](#-how-to-use)
   * [Collections](#-collections)
   * [Multiline text](#-multiline-text)
@@ -57,6 +52,7 @@ Enjoy it! 🙂
   * [Hierarchy](#-hierarchy)
   * [Debug](#-debug)
 * [Documentation](#-documentation)
+* [Supported OS & SDK Versions](#-supported-os--sdk-versions)
 * [Next steps](#-next-steps)
 * [Contributing](#-contributing)
 * [Mentions](#-mentions)
@@ -74,20 +70,10 @@ Enjoy it! 🙂
 - [x] Simple Swift syntax
 - [x] Lightweight readable codebase
 
-### 📋 Supported OS & SDK Versions
-
-* iOS 9.0+
-* tvOS 9.0+
-* Swift 4
-
-### 🎬 Guides
+## 🎬 Guides
 
  [<img src="Assets/thumb_getting_started.png">](https://youtu.be/75kgOhWsPNA)
 
-### 🔮 Example
-
-To run the example project, clone the repo and run `SkeletonViewExample` target.
-
 ## 📲 Installation
 
 #### Using [CocoaPods](https://cocoapods.org)
@@ -106,6 +92,18 @@ Edit your `Cartfile` and specify the dependency:
 github "Juanpe/SkeletonView"
 ```
 
+#### Using [Swift Package Manager](https://github.com/apple/swift-package-manager)
+
+Once you have your Swift package set up, adding `SkeletonView` as a dependency is as easy as adding it to the `dependencies` value of your `Package.swift`.
+
+```swift
+  dependencies: [
+    .package(url: "https://github.com/Juanpe/SkeletonView.git", from: "1.6")
+  ]
+```
+
+
+
 ## 🐒 How to use
 
 Only **3** steps needed to use `SkeletonView`:
@@ -174,7 +172,7 @@ avatarImageView.isSkeletonable = true
 
  Now, ```SkeletonView``` is compatible with ```UITableView``` and ```UICollectionView```.
 
-###### UITableView
+#### UITableView
 
 If you want to show the skeleton in a ```UITableView```, you need to conform to ```SkeletonTableViewDataSource``` protocol.
 
@@ -215,7 +213,15 @@ There is only one method you need to implement to let Skeleton know the cell ide
 > **IMPORTANT!**
 > If you are using resizable cells (`tableView.rowHeight = UITableViewAutomaticDimension` ), it's mandatory define the `estimatedRowHeight`.
 
-###### UICollectionView
+👩🏼‍🏫  **How specify which elements are skeletonables?**
+
+Here is an illustration that shows how you should specify which elements are skeletonables when you are using an `UITableView`:
+
+![](Assets/tableview_scheme.png)
+
+As you can see, we have to make skeletonable the tableview, the cell and the UI elements, but we don't need to set as skeletonable the `contentView`
+
+####  UICollectionView
 
 For ```UICollectionView```, you need to conform to ```SkeletonCollectionViewDataSource``` protocol.
 
@@ -403,6 +409,12 @@ Then, when the skeleton appears, you can see the view hierarchy in the Xcode con
 ### 📚 Documentation
 Coming soon...😅
 
+### 📋 Supported OS & SDK Versions
+
+* iOS 9.0+
+* tvOS 9.0+
+* Swift 4.2
+
 ## 📬 Next steps
 
 * [x] Set the filling percent of the last line in multiline elements
@@ -440,6 +452,7 @@ See [all contributors](https://github.com/Juanpe/SkeletonView/graphs/contributor
 - [Swift Weekly #96](http://digest.swiftweekly.com/issues/swift-weekly-issue-96-81759)
 - [CocoaControls](https://www.cocoacontrols.com/controls/skeletonview)
 - [Awesome iOS Newsletter #74](https://ios.libhunt.com/newsletter/74)
+- [Swift News #36](https://www.youtube.com/watch?v=mAGpsQiy6so)
 
 
 

README_pt-br.md

@@ -1,19 +1,17 @@
 ![](Assets/header2.jpg)
 
 <p align="center">
-    <a href="https://travis-ci.org/Juanpe/SkeletonView">
-      <img src="https://img.shields.io/travis/Juanpe/SkeletonView.svg">
+    <a href="https://app.bitrise.io/app/6d289a17e22c8323">
+      <img src="https://app.bitrise.io/app/6d289a17e22c8323/status.svg?token=fI7gKC41XD9-aRXDScCKBw&branch=master">
     </a>
-    <a href="https://instagram.github.io/IGListKit/">
+    <a href="https://codebeat.co/projects/github-com-juanpe-skeletonview-master"><img alt="codebeat badge" src="https://codebeat.co/badges/f854fdfd-31e5-4689-ba04-075d83653e60" /></a>
+    <a href="https://github.com/Juanpe/SkeletonView">
         <img src="https://img.shields.io/cocoapods/p/SkeletonView.svg" alt="Platforms">
     </a>
-    <img src="https://img.shields.io/badge/Swift-4.1-orange.svg" />
+    <img src="https://img.shields.io/badge/Swift-5-orange.svg" />
     <a href="https://cocoapods.org/pods/SkeletonView">
         <img src="https://img.shields.io/cocoapods/v/SkeletonView.svg" alt="CocoaPods" />
     </a>
-    <a href="https://github.com/Carthage/Carthage">
-        <img src="https://img.shields.io/badge/carthage-compatible-4BC51D.svg?style=flat" alt="Carthage" />
-    </a>
     <a href="https://cocoapods.org/pods/SkeletonView">
         <img src="https://img.shields.io/cocoapods/dt/SkeletonView.svg?style=flat" alt="CocoaPods downloads" />
     </a>
@@ -23,12 +21,10 @@
     <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=MJ4Y2D9DEX6FL&lc=ES&item_name=SkeletonView&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted">
         <img src="https://img.shields.io/badge/Donate-PayPal-green.svg" alt="Paypal" />
     </a>
+    <br/>
     <a href="https://twitter.com/intent/tweet?text=Wow%20This%20library%20is%20awesome:&url=https%3A%2F%2Fgithub.com%2FJuanpe%2FSkeletonView">
       <img src="https://img.shields.io/twitter/url/https/github.com/Juanpe/SkeletonView.svg?style=social" alt="License" />
     </a>
-    <a href="https://twitter.com/JuanpeCatalan">
-      <img src="https://img.shields.io/twitter/follow/JuanpeCatalan.svg?style=social&label=Follow" alt="Twitter" />
-    </a>
 </p>
 
 🌎  Traduções: </br>
@@ -76,7 +72,7 @@ Aproveite! 🙂
 
 * iOS 9.0+
 * tvOS 9.0+
-* Swift 4
+* Swift 4.2
 
 ### 🔮 Exemplo
 

README_zh.md

@@ -1,19 +1,17 @@
 ![](Assets/header2.jpg)
 
 <p align="center">
-    <a href="https://travis-ci.org/Juanpe/SkeletonView">
-      <img src="https://img.shields.io/travis/Juanpe/SkeletonView.svg">
+    <a href="https://app.bitrise.io/app/6d289a17e22c8323">
+      <img src="https://app.bitrise.io/app/6d289a17e22c8323/status.svg?token=fI7gKC41XD9-aRXDScCKBw&branch=master">
     </a>
-    <a href="https://instagram.github.io/IGListKit/">
+    <a href="https://codebeat.co/projects/github-com-juanpe-skeletonview-master"><img alt="codebeat badge" src="https://codebeat.co/badges/f854fdfd-31e5-4689-ba04-075d83653e60" /></a>
+    <a href="https://github.com/Juanpe/SkeletonView">
         <img src="https://img.shields.io/cocoapods/p/SkeletonView.svg" alt="Platforms">
     </a>
-    <img src="https://img.shields.io/badge/Swift-4.1-orange.svg" />
+    <img src="https://img.shields.io/badge/Swift-5-orange.svg" />
     <a href="https://cocoapods.org/pods/SkeletonView">
         <img src="https://img.shields.io/cocoapods/v/SkeletonView.svg" alt="CocoaPods" />
     </a>
-    <a href="https://github.com/Carthage/Carthage">
-        <img src="https://img.shields.io/badge/carthage-compatible-4BC51D.svg?style=flat" alt="Carthage" />
-    </a>
     <a href="https://cocoapods.org/pods/SkeletonView">
         <img src="https://img.shields.io/cocoapods/dt/SkeletonView.svg?style=flat" alt="CocoaPods downloads" />
     </a>
@@ -23,14 +21,13 @@
     <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=MJ4Y2D9DEX6FL&lc=ES&item_name=SkeletonView&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted">
         <img src="https://img.shields.io/badge/Donate-PayPal-green.svg" alt="Paypal" />
     </a>
+    <br/>
     <a href="https://twitter.com/intent/tweet?text=Wow%20This%20library%20is%20awesome:&url=https%3A%2F%2Fgithub.com%2FJuanpe%2FSkeletonView">
       <img src="https://img.shields.io/twitter/url/https/github.com/Juanpe/SkeletonView.svg?style=social" alt="License" />
     </a>
-    <a href="https://twitter.com/JuanpeCatalan">
-      <img src="https://img.shields.io/twitter/follow/JuanpeCatalan.svg?style=social&label=Follow" alt="Twitter" />
-    </a>
 </p>
 
+
 🌎  翻译: [ [原版的](https://github.com/Juanpe/SkeletonView) ] </br>
 [🇧🇷](https://github.com/Juanpe/SkeletonView/blob/master/README_pt-br.md) [@brunomunizaf](https://twitter.com/brunomuniz_af)
 
@@ -75,7 +72,7 @@
 
 * iOS 9.0+
 * tvOS 9.0+
-* Swift 4
+* Swift 4.2
 
 ### 🔮 示例
 

SkeletonView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SkeletonView"
-  s.version      = "1.4.1"
+  s.version      = "1.6"
   s.summary      = "An elegant way to show users that something is happening and also prepare them to which contents he is waiting"
   s.description  = <<-DESC
   Today almost all apps have async processes, as API requests, long runing processes, etc. And while the processes are working, usually developers place a loading view to show users that something is going on.
@@ -12,6 +12,7 @@ Pod::Spec.new do |s|
   s.social_media_url   = "https://twitter.com/JuanpeCatalan"
   s.ios.deployment_target = "9.0"
   s.tvos.deployment_target = "9.0"
+  s.swift_version = "5.0"
   s.source       = { :git => "https://github.com/Juanpe/SkeletonView.git", :tag => s.version.to_s }
   s.source_files  = "Sources/**/*"
 end

SkeletonView.xcodeproj/project.pbxproj

@@ -29,7 +29,6 @@
 		17DD0E1D207FB32100C56334 /* ContainsMultilineText.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E3A1FB123C100EE67C5 /* ContainsMultilineText.swift */; };
 		17DD0E1E207FB32100C56334 /* PrepareForSkeletonProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F56B94451FAE20AF0095662F /* PrepareForSkeletonProtocol.swift */; };
 		17DD0E1F207FB32100C56334 /* RecursiveProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E311FB0F42F00EE67C5 /* RecursiveProtocol.swift */; };
-		3B83EE4720C41488005178A4 /* ContainsMultilineText.swift in Headers */ = {isa = PBXBuildFile; fileRef = 3B83EE4520C41488005178A4 /* ContainsMultilineText.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		3B83EE4820C41488005178A4 /* UIView+IBInspectable.swift in Headers */ = {isa = PBXBuildFile; fileRef = 3B83EE4620C41488005178A4 /* UIView+IBInspectable.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		42ABD063210B548200BEEFF4 /* SkeletonView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* SkeletonView.framework */; };
 		42ABD069210B548200BEEFF4 /* SkeletonView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* SkeletonView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -39,8 +38,18 @@
 		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 */; };
+		872D5A5621C177E20037D763 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872D5A5521C177E20037D763 /* UIView+Extension.swift */; };
+		872D5A5721C177E20037D763 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872D5A5521C177E20037D763 /* UIView+Extension.swift */; };
+		872D5A5C21C24EDD0037D763 /* UILabel+Multiline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872D5A5B21C24EDD0037D763 /* UILabel+Multiline.swift */; };
+		872D5A5D21C24EDD0037D763 /* UILabel+Multiline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872D5A5B21C24EDD0037D763 /* UILabel+Multiline.swift */; };
+		872D5A5F21C24F8E0037D763 /* UITextView+Multiline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872D5A5E21C24F8E0037D763 /* UITextView+Multiline.swift */; };
+		872D5A6021C24F8E0037D763 /* UITextView+Multiline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872D5A5E21C24F8E0037D763 /* UITextView+Multiline.swift */; };
 		8748240D20C6A88A00E92179 /* UIView+IBInspectable.swift in Headers */ = {isa = PBXBuildFile; fileRef = F5F899CF1FAA6A4D002E8FDA /* UIView+IBInspectable.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		8748240E20C6A88E00E92179 /* ContainsMultilineText.swift in Headers */ = {isa = PBXBuildFile; fileRef = F5307E3A1FB123C100EE67C5 /* ContainsMultilineText.swift */; settings = {ATTRIBUTES = (Public, ); }; };
+		877EFA4521BEE9D80031FC00 /* SkeletonLayerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 877EFA4421BEE9D80031FC00 /* SkeletonLayerBuilder.swift */; };
+		877EFA4621BEE9D80031FC00 /* SkeletonLayerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 877EFA4421BEE9D80031FC00 /* SkeletonLayerBuilder.swift */; };
+		877EFA4821BEED760031FC00 /* SkeletonMultilineLayerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 877EFA4721BEED760031FC00 /* SkeletonMultilineLayerBuilder.swift */; };
+		877EFA4921BEED760031FC00 /* SkeletonMultilineLayerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 877EFA4721BEED760031FC00 /* SkeletonMultilineLayerBuilder.swift */; };
 		8785E3A1211C9C9800CC9DFD /* SkeletonDebug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8785E3A0211C9C9800CC9DFD /* SkeletonDebug.swift */; };
 		8785E3A2211C9CA500CC9DFD /* SkeletonDebug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8785E3A0211C9C9800CC9DFD /* SkeletonDebug.swift */; };
 		8785E3A3211C9CE800CC9DFD /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88DEA97D1FCDBD1F006C80EF /* Constants.swift */; };
@@ -137,7 +146,6 @@
 		17DD0E00207FB27400C56334 /* SkeletonView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SkeletonView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		17DD0E1A207FB2C200C56334 /* SkeletonView-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SkeletonView-tvOS.plist"; sourceTree = "<group>"; };
 		17DD0E1B207FB2C200C56334 /* SkeletonView-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SkeletonView-iOS.plist"; sourceTree = "<group>"; };
-		3B83EE4520C41488005178A4 /* ContainsMultilineText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ContainsMultilineText.swift; path = Sources/Helpers/ContainsMultilineText.swift; sourceTree = "<group>"; };
 		3B83EE4620C41488005178A4 /* UIView+IBInspectable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "UIView+IBInspectable.swift"; path = "Sources/Extensions/UIView+IBInspectable.swift"; sourceTree = "<group>"; };
 		42ABD06D210B548200BEEFF4 /* SkeletonViewExampleUICollectionView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SkeletonViewExampleUICollectionView.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		42ABD070210B54E100BEEFF4 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -148,6 +156,11 @@
 		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; };
+		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>"; };
+		872D5A5E21C24F8E0037D763 /* UITextView+Multiline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextView+Multiline.swift"; sourceTree = "<group>"; };
+		877EFA4421BEE9D80031FC00 /* SkeletonLayerBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonLayerBuilder.swift; sourceTree = "<group>"; };
+		877EFA4721BEED760031FC00 /* SkeletonMultilineLayerBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonMultilineLayerBuilder.swift; sourceTree = "<group>"; };
 		8785E3A0211C9C9800CC9DFD /* SkeletonDebug.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonDebug.swift; sourceTree = "<group>"; };
 		88DEA97D1FCDBD1F006C80EF /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		8933C7841EB5B820000D00A4 /* SkeletonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SkeletonView.swift; sourceTree = "<group>"; };
@@ -223,25 +236,10 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		42ABD06F210B54BC00BEEFF4 /* Example UICollectionView */ = {
-			isa = PBXGroup;
-			children = (
-				42ABD070210B54E100BEEFF4 /* AppDelegate.swift */,
-				42ABD072210B54E100BEEFF4 /* Assets.xcassets */,
-				42ABD074210B54E100BEEFF4 /* Base.lproj */,
-				42ABD077210B54E200BEEFF4 /* CollectionViewCell.swift */,
-				42ABD071210B54E100BEEFF4 /* Main.storyboard */,
-				42ABD073210B54E100BEEFF4 /* ViewController.swift */,
-			);
-			path = "Example UICollectionView";
-			sourceTree = "<group>";
-		};
 		52D6D9721BEFF229002C0205 = {
 			isa = PBXGroup;
 			children = (
-				3B83EE4520C41488005178A4 /* ContainsMultilineText.swift */,
 				3B83EE4620C41488005178A4 /* UIView+IBInspectable.swift */,
-				42ABD06F210B54BC00BEEFF4 /* Example UICollectionView */,
 				F5F899F31FABA607002E8FDA /* Example */,
 				8933C7811EB5B7E0000D00A4 /* Sources */,
 				52D6D99C1BEFF38C002C0205 /* Configs */,
@@ -270,6 +268,52 @@
 			path = Configs;
 			sourceTree = "<group>";
 		};
+		872D5A5821C17D850037D763 /* CollectionView */ = {
+			isa = PBXGroup;
+			children = (
+				42ABD070210B54E100BEEFF4 /* AppDelegate.swift */,
+				42ABD072210B54E100BEEFF4 /* Assets.xcassets */,
+				42ABD074210B54E100BEEFF4 /* Base.lproj */,
+				42ABD077210B54E200BEEFF4 /* CollectionViewCell.swift */,
+				42ABD071210B54E100BEEFF4 /* Main.storyboard */,
+				42ABD073210B54E100BEEFF4 /* ViewController.swift */,
+			);
+			path = CollectionView;
+			sourceTree = "<group>";
+		};
+		872D5A5921C17D980037D763 /* TableView */ = {
+			isa = PBXGroup;
+			children = (
+				F5F899F41FABA607002E8FDA /* AppDelegate.swift */,
+				88DEA97D1FCDBD1F006C80EF /* Constants.swift */,
+				F5F899F61FABA607002E8FDA /* ViewController.swift */,
+				F5F622441FACA338007C062A /* Cell.swift */,
+				F5F899F81FABA607002E8FDA /* Main.storyboard */,
+				F5F899FB1FABA607002E8FDA /* Assets.xcassets */,
+				F5F899FD1FABA607002E8FDA /* LaunchScreen.storyboard */,
+			);
+			path = TableView;
+			sourceTree = "<group>";
+		};
+		872D5A5A21C24E7C0037D763 /* Multilines */ = {
+			isa = PBXGroup;
+			children = (
+				F5307E3A1FB123C100EE67C5 /* ContainsMultilineText.swift */,
+				872D5A5B21C24EDD0037D763 /* UILabel+Multiline.swift */,
+				872D5A5E21C24F8E0037D763 /* UITextView+Multiline.swift */,
+			);
+			path = Multilines;
+			sourceTree = "<group>";
+		};
+		877EFA4321BEE9C40031FC00 /* Builders */ = {
+			isa = PBXGroup;
+			children = (
+				877EFA4421BEE9D80031FC00 /* SkeletonLayerBuilder.swift */,
+				877EFA4721BEED760031FC00 /* SkeletonMultilineLayerBuilder.swift */,
+			);
+			path = Builders;
+			sourceTree = "<group>";
+		};
 		8785E39E211C9C6D00CC9DFD /* Appearance */ = {
 			isa = PBXGroup;
 			children = (
@@ -289,6 +333,8 @@
 		8933C7811EB5B7E0000D00A4 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				872D5A5A21C24E7C0037D763 /* Multilines */,
+				877EFA4321BEE9C40031FC00 /* Builders */,
 				8785E39F211C9C7C00CC9DFD /* Debug */,
 				8785E39E211C9C6D00CC9DFD /* Appearance */,
 				F58A6E7020A8C87100612494 /* Recoverable */,
@@ -362,6 +408,7 @@
 				F5F622401FAC6E31007C062A /* UIColor+Skeleton.swift */,
 				F5307E2D1FB0E5E400EE67C5 /* UIView+Frame.swift */,
 				F5F899CF1FAA6A4D002E8FDA /* UIView+IBInspectable.swift */,
+				872D5A5521C177E20037D763 /* UIView+Extension.swift */,
 				F587FB85202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift */,
 				F5A5E8B3211DCE7000FD20D0 /* Int+Whitespaces.swift */,
 			);
@@ -372,7 +419,6 @@
 			isa = PBXGroup;
 			children = (
 				F5F899D11FAB9630002E8FDA /* AssociationPolicy.swift */,
-				F5307E3A1FB123C100EE67C5 /* ContainsMultilineText.swift */,
 				F56B94451FAE20AF0095662F /* PrepareForSkeletonProtocol.swift */,
 				F5307E311FB0F42F00EE67C5 /* RecursiveProtocol.swift */,
 			);
@@ -391,13 +437,8 @@
 		F5F899F31FABA607002E8FDA /* Example */ = {
 			isa = PBXGroup;
 			children = (
-				F5F899F41FABA607002E8FDA /* AppDelegate.swift */,
-				88DEA97D1FCDBD1F006C80EF /* Constants.swift */,
-				F5F899F61FABA607002E8FDA /* ViewController.swift */,
-				F5F622441FACA338007C062A /* Cell.swift */,
-				F5F899F81FABA607002E8FDA /* Main.storyboard */,
-				F5F899FB1FABA607002E8FDA /* Assets.xcassets */,
-				F5F899FD1FABA607002E8FDA /* LaunchScreen.storyboard */,
+				872D5A5921C17D980037D763 /* TableView */,
+				872D5A5821C17D850037D763 /* CollectionView */,
 			);
 			path = Example;
 			sourceTree = "<group>";
@@ -434,7 +475,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3B83EE4720C41488005178A4 /* ContainsMultilineText.swift in Headers */,
 				3B83EE4820C41488005178A4 /* UIView+IBInspectable.swift in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -523,7 +563,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0910;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = SkeletonView;
 				TargetAttributes = {
 					17DD0DFF207FB27400C56334 = {
@@ -547,7 +587,7 @@
 			};
 			buildConfigurationList = 52D6D9761BEFF229002C0205 /* Build configuration list for PBXProject "SkeletonView" */;
 			compatibilityVersion = "Xcode 6.3";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -608,7 +648,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				872D5A5721C177E20037D763 /* UIView+Extension.swift in Sources */,
 				17DD0E1F207FB32100C56334 /* RecursiveProtocol.swift in Sources */,
+				872D5A5D21C24EDD0037D763 /* UILabel+Multiline.swift in Sources */,
 				17DD0E1E207FB32100C56334 /* PrepareForSkeletonProtocol.swift in Sources */,
 				F51ED28520973CC9008B2434 /* SkeletonReusableCell.swift in Sources */,
 				17DD0E17207FB28F00C56334 /* SkeletonLayer.swift in Sources */,
@@ -618,6 +660,7 @@
 				17DD0E0B207FB28900C56334 /* SkeletonTableViewProtocols.swift in Sources */,
 				17DD0E0D207FB28900C56334 /* UITableView+CollectionSkeleton.swift in Sources */,
 				17DD0E0E207FB28900C56334 /* UIView+CollectionSkeleton.swift in Sources */,
+				877EFA4921BEED760031FC00 /* SkeletonMultilineLayerBuilder.swift in Sources */,
 				F51ED28320973CBB008B2434 /* SkeletonCollectionDelegate.swift in Sources */,
 				F58A6E6F20A8C66300612494 /* Recoverable.swift in Sources */,
 				17DD0E18207FB28F00C56334 /* SkeletonView.swift in Sources */,
@@ -630,10 +673,12 @@
 				17DD0E14207FB28F00C56334 /* SkeletonAnimationBuilder.swift in Sources */,
 				17DD0E11207FB28C00C56334 /* UIView+Frame.swift in Sources */,
 				17DD0E15207FB28F00C56334 /* SkeletonAppearance.swift in Sources */,
+				872D5A6021C24F8E0037D763 /* UITextView+Multiline.swift in Sources */,
 				17DD0E10207FB28C00C56334 /* UIColor+Skeleton.swift in Sources */,
 				F51ED28420973CC6008B2434 /* GenericCollectionView.swift in Sources */,
 				17DD0E0A207FB28900C56334 /* SkeletonCollectionViewProtocols.swift in Sources */,
 				17DD0E1C207FB32100C56334 /* AssociationPolicy.swift in Sources */,
+				877EFA4621BEE9D80031FC00 /* SkeletonLayerBuilder.swift in Sources */,
 				F5A5E8B5211DCE7000FD20D0 /* Int+Whitespaces.swift in Sources */,
 				17DD0E1D207FB32100C56334 /* ContainsMultilineText.swift in Sources */,
 				17DD0E0F207FB28C00C56334 /* CALayer+Extensions.swift in Sources */,
@@ -656,7 +701,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				872D5A5621C177E20037D763 /* UIView+Extension.swift in Sources */,
 				F5F899D01FAA6A4D002E8FDA /* UIView+IBInspectable.swift in Sources */,
+				872D5A5C21C24EDD0037D763 /* UILabel+Multiline.swift in Sources */,
 				F54CF5E42024CEB000330B0D /* UIView+CollectionSkeleton.swift in Sources */,
 				F5307E371FB1076E00EE67C5 /* SkeletonTableViewProtocols.swift in Sources */,
 				8933C7851EB5B820000D00A4 /* SkeletonView.swift in Sources */,
@@ -666,6 +713,7 @@
 				F54CF5E52024CEB000330B0D /* UITableView+CollectionSkeleton.swift in Sources */,
 				F5307E321FB0F42F00EE67C5 /* RecursiveProtocol.swift in Sources */,
 				F5F622431FAC81FD007C062A /* CALayer+Extensions.swift in Sources */,
+				877EFA4821BEED760031FC00 /* SkeletonMultilineLayerBuilder.swift in Sources */,
 				F5F899ED1FAB9F04002E8FDA /* CollectionSkeletonProtocol.swift in Sources */,
 				F58A6E6E20A8C66300612494 /* Recoverable.swift in Sources */,
 				F5307E2C1FAF6BC900EE67C5 /* SkeletonGradient.swift in Sources */,
@@ -678,10 +726,12 @@
 				F54CF5E62024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift in Sources */,
 				F56B94461FAE20AF0095662F /* PrepareForSkeletonProtocol.swift in Sources */,
 				F5307E391FB1078E00EE67C5 /* SkeletonCollectionViewProtocols.swift in Sources */,
+				872D5A5F21C24F8E0037D763 /* UITextView+Multiline.swift in Sources */,
 				F51DF873206E91FB00D23301 /* GenericCollectionView.swift in Sources */,
 				F5307E3B1FB123C100EE67C5 /* ContainsMultilineText.swift in Sources */,
 				F5F899E91FAB9D2B002E8FDA /* SkeletonLayer.swift in Sources */,
 				F5307E2E1FB0E5E400EE67C5 /* UIView+Frame.swift in Sources */,
+				877EFA4521BEE9D80031FC00 /* SkeletonLayerBuilder.swift in Sources */,
 				F5A5E8B4211DCE7000FD20D0 /* Int+Whitespaces.swift in Sources */,
 				F51DF871206E91B300D23301 /* SkeletonReusableCell.swift in Sources */,
 				F51DF879206E9F5500D23301 /* SkeletonCollectionDelegate.swift in Sources */,
@@ -761,7 +811,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -793,7 +843,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -821,7 +871,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -847,7 +897,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.juanpecatalan.SkeletonViewExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -856,6 +906,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -904,7 +955,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -915,6 +966,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -955,7 +1007,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -984,7 +1036,7 @@
 				PRODUCT_NAME = SkeletonView;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1008,7 +1060,7 @@
 				PRODUCT_NAME = SkeletonView;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1032,7 +1084,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.juanpecatalan.SkeletonViewExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1057,7 +1109,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.juanpecatalan.SkeletonViewExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

SkeletonView.xcodeproj/xcshareddata/xcschemes/SkeletonView-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,6 +29,15 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "52D6D97B1BEFF229002C0205"
+            BuildableName = "SkeletonView.framework"
+            BlueprintName = "SkeletonView-iOS"
+            ReferencedContainer = "container:SkeletonView.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>

SkeletonView.xcodeproj/xcshareddata/xcschemes/SkeletonView-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SkeletonView.xcodeproj/xcshareddata/xcschemes/SkeletonViewExample.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1020"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F5F899F11FABA607002E8FDA"
+               BuildableName = "SkeletonViewExample.app"
+               BlueprintName = "SkeletonViewExample"
+               ReferencedContainer = "container:SkeletonView.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F5F899F11FABA607002E8FDA"
+            BuildableName = "SkeletonViewExample.app"
+            BlueprintName = "SkeletonViewExample"
+            ReferencedContainer = "container:SkeletonView.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F5F899F11FABA607002E8FDA"
+            BuildableName = "SkeletonViewExample.app"
+            BlueprintName = "SkeletonViewExample"
+            ReferencedContainer = "container:SkeletonView.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F5F899F11FABA607002E8FDA"
+            BuildableName = "SkeletonViewExample.app"
+            BlueprintName = "SkeletonViewExample"
+            ReferencedContainer = "container:SkeletonView.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Sources/Appearance/SkeletonAppearance.swift

@@ -15,6 +15,7 @@ public enum SkeletonAppearance {
     public static var `default`: Appearance = SkeletonViewAppearance.shared
 }
 
+// codebeat:disable[TOO_MANY_IVARS]
 class SkeletonViewAppearance: Appearance {
 
     static var shared = SkeletonViewAppearance()
@@ -31,3 +32,4 @@ class SkeletonViewAppearance: Appearance {
 
     var multilineCornerRadius: Int = 0
 }
+// codebeat:enable[TOO_MANY_IVARS]

Sources/Builders/SkeletonLayerBuilder.swift

@@ -0,0 +1,41 @@
+// Copyright © 2018 SkeletonView. All rights reserved.
+
+import UIKit
+
+/// Object that facilitates the creation of skeleton layers,
+/// based on the builder pattern
+class SkeletonLayerBuilder {
+
+    var skeletonType: SkeletonType?
+    var colors: [UIColor] = []
+    var holder: UIView?
+
+    func setSkeletonType(_ type: SkeletonType) -> SkeletonLayerBuilder {
+        self.skeletonType = type
+        return self
+    }
+
+    func addColor(_ color: UIColor) -> SkeletonLayerBuilder {
+        return addColors([color])
+    }
+
+    func addColors(_ colors: [UIColor]) -> SkeletonLayerBuilder {
+        self.colors.append(contentsOf: colors)
+        return self
+    }
+
+    func setHolder(_ holder: UIView) -> SkeletonLayerBuilder {
+        self.holder = holder
+        return self
+    }
+
+    func build() -> SkeletonLayer? {
+        guard let type = skeletonType,
+              let holder = holder
+            else { return nil }
+
+        return SkeletonLayer(withType: type,
+                             usingColors: colors,
+                             andSkeletonHolder: holder)
+    }
+}

Sources/Builders/SkeletonMultilineLayerBuilder.swift

@@ -0,0 +1,52 @@
+// Copyright © 2018 SkeletonView. All rights reserved.
+
+import UIKit
+
+/// Object that facilitates the creation of skeleton layers for multiline
+/// elements, based on the builder pattern
+class SkeletonMultilineLayerBuilder {
+
+    var skeletonType: SkeletonType?
+    var index: Int?
+    var width: CGFloat?
+    var cornerRadius: Int?
+
+    func setSkeletonType(_ type: SkeletonType) -> SkeletonMultilineLayerBuilder {
+        self.skeletonType = type
+        return self
+    }
+
+    func setIndex(_ index: Int) -> SkeletonMultilineLayerBuilder {
+        self.index = index
+        return self
+    }
+
+    func setWidth(_ width: CGFloat) -> SkeletonMultilineLayerBuilder {
+        self.width = width
+        return self
+    }
+
+    func setCornerRadius(_ radius: Int) -> SkeletonMultilineLayerBuilder {
+        self.cornerRadius = radius
+        return self
+    }
+
+    func build() -> CALayer? {
+        guard let type = skeletonType,
+              let index = index,
+              let width = width,
+              let radius = cornerRadius
+            else { return nil }
+
+        let spaceRequiredForEachLine = SkeletonAppearance.default.multilineHeight + SkeletonAppearance.default.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: SkeletonAppearance.default.multilineHeight)
+
+        layer.cornerRadius = CGFloat(radius)
+        layer.masksToBounds = true
+
+        return layer
+    }
+}

Sources/Collections/CollectionViews/UICollectionView+CollectionSkeleton.swift

@@ -16,17 +16,17 @@ extension UICollectionView: CollectionSkeleton {
     }
     
     var skeletonDataSource: SkeletonCollectionDataSource? {
-        get { return objc_getAssociatedObject(self, &CollectionAssociatedKeys.dummyDataSource) as? SkeletonCollectionDataSource }
+        get { return ao_get(pkey: &CollectionAssociatedKeys.dummyDataSource) as? SkeletonCollectionDataSource }
         set {
-            objc_setAssociatedObject(self, &CollectionAssociatedKeys.dummyDataSource, newValue, AssociationPolicy.retain.objc)
+            ao_setOptional(newValue, pkey: &CollectionAssociatedKeys.dummyDataSource)
             self.dataSource = newValue
         }
     }
     
     var skeletonDelegate: SkeletonCollectionDelegate? {
-        get { return objc_getAssociatedObject(self, &CollectionAssociatedKeys.dummyDelegate) as? SkeletonCollectionDelegate }
+        get { return ao_get(pkey: &CollectionAssociatedKeys.dummyDelegate) as? SkeletonCollectionDelegate }
         set {
-            objc_setAssociatedObject(self, &CollectionAssociatedKeys.dummyDelegate, newValue, AssociationPolicy.retain.objc)
+            ao_setOptional(newValue, pkey: &CollectionAssociatedKeys.dummyDelegate)
             self.delegate = newValue
         }
     }

Sources/Collections/TableViews/UITableView+CollectionSkeleton.swift

@@ -15,17 +15,17 @@ extension UITableView: CollectionSkeleton {
     }
     
     var skeletonDataSource: SkeletonCollectionDataSource? {
-        get { return objc_getAssociatedObject(self, &CollectionAssociatedKeys.dummyDataSource) as? SkeletonCollectionDataSource }
+        get { return ao_get(pkey: &CollectionAssociatedKeys.dummyDataSource) as? SkeletonCollectionDataSource }
         set {
-            objc_setAssociatedObject(self, &CollectionAssociatedKeys.dummyDataSource, newValue, AssociationPolicy.retain.objc)
+            ao_setOptional(newValue, pkey: &CollectionAssociatedKeys.dummyDataSource)
             self.dataSource = newValue
         }
     }
     
     var skeletonDelegate: SkeletonCollectionDelegate? {
-        get { return objc_getAssociatedObject(self, &CollectionAssociatedKeys.dummyDelegate) as? SkeletonCollectionDelegate }
+        get { return ao_get(pkey: &CollectionAssociatedKeys.dummyDelegate) as? SkeletonCollectionDelegate }
         set {
-            objc_setAssociatedObject(self, &CollectionAssociatedKeys.dummyDelegate, newValue, AssociationPolicy.retain.objc)
+            ao_setOptional(newValue, pkey: &CollectionAssociatedKeys.dummyDelegate)
             self.delegate = newValue
         }
     }
@@ -34,7 +34,9 @@ extension UITableView: CollectionSkeleton {
         guard let originalDataSource = self.dataSource as? SkeletonTableViewDataSource,
             !(originalDataSource is SkeletonCollectionDataSource)
             else { return }
-        let dataSource = SkeletonCollectionDataSource(tableViewDataSource: originalDataSource, rowHeight: calculateRowHeight())
+        let rowHeight = calculateRowHeight()
+        let dataSource = SkeletonCollectionDataSource(tableViewDataSource: originalDataSource,
+                                                      rowHeight: rowHeight)
         self.skeletonDataSource = dataSource
         reloadData()
     }

Sources/Extensions/CALayer+Extensions.swift

@@ -40,15 +40,23 @@ extension CALayer {
     
     func addMultilinesLayers(lines: Int, type: SkeletonType, lastLineFillPercent: Int, multilineCornerRadius: Int) {
         let numberOfSublayers = calculateNumLines(maxLines: lines)
-        for index in 0..<numberOfSublayers {
+
+        let layerBuilder = SkeletonMultilineLayerBuilder()
+            .setSkeletonType(type)
+            .setCornerRadius(multilineCornerRadius)
+
+        (0..<numberOfSublayers).forEach { index in
             var width = bounds.width
-            
-            if index == numberOfSublayers-1 && numberOfSublayers != 1 {
-                width = width * CGFloat(lastLineFillPercent)/100;
+            if index == numberOfSublayers - 1 && numberOfSublayers != 1 {
+                width = width * CGFloat(lastLineFillPercent) / 100;
+            }
+
+            if let layer = layerBuilder
+                .setIndex(index)
+                .setWidth(width)
+                .build() {
+                addSublayer(layer)
             }
-            
-            let layer = SkeletonLayerFactory().makeMultilineLayer(withType: type, for: index, width: width, multilineCornerRadius: multilineCornerRadius)
-            addSublayer(layer)
         }
     }
     

Sources/Extensions/UIColor+Skeleton.swift

@@ -1,13 +1,8 @@
-//
-//  UIColor+Skeleton.swift
-//  SkeletonView-iOS
-//
-//  Created by Juanpe Catalán on 03/11/2017.
 //  Copyright © 2017 SkeletonView. All rights reserved.
-//
 
 import UIKit
 
+// codebeat:disable[TOO_MANY_IVARS]
 extension UIColor {
     
     convenience init(_ hex: UInt) {
@@ -20,9 +15,8 @@ extension UIColor {
     }
     
     func isLight() -> Bool {
-        // algorithm from: http://www.w3.org/WAI/ER/WD-AERT/#color-contrast
         guard let components = cgColor.components,
-              components.count >= 3 else { return false }
+            components.count >= 3 else { return false }
         let brightness = ((components[0] * 299) + (components[1] * 587) + (components[2] * 114)) / 1000
         return !(brightness < 0.5)
     }
@@ -72,4 +66,4 @@ public extension UIColor {
     static var silver       = UIColor(0xbdc3c7)
     static var asbestos     = UIColor(0x7f8c8d)
 }
-
+// codebeat:enable[TOO_MANY_IVARS]

Sources/Extensions/UIView+Extension.swift

@@ -0,0 +1,42 @@
+// Copyright © 2018 SkeletonView. All rights reserved.
+
+import UIKit
+
+// codebeat:disable[TOO_MANY_IVARS]
+enum ViewAssociatedKeys {
+    static var skeletonable = "skeletonable"
+    static var status = "status"
+    static var skeletonLayer = "layer"
+    static var flowDelegate = "flowDelegate"
+    static var isSkeletonAnimated = "isSkeletonAnimated"
+    static var viewState = "viewState"
+}
+// codebeat:enable[TOO_MANY_IVARS]
+
+extension UIView {
+
+    enum Status {
+        case on
+        case off
+    }
+
+    var flowDelegate: SkeletonFlowDelegate? {
+        get { return ao_get(pkey: &ViewAssociatedKeys.flowDelegate) as? SkeletonFlowDelegate }
+        set { ao_setOptional(newValue, pkey: &ViewAssociatedKeys.flowDelegate) }
+    }
+
+    var skeletonLayer: SkeletonLayer? {
+        get { return ao_get(pkey: &ViewAssociatedKeys.skeletonLayer) as? SkeletonLayer }
+        set { ao_setOptional(newValue, pkey: &ViewAssociatedKeys.skeletonLayer) }
+    }
+
+    var status: Status! {
+        get { return ao_get(pkey: &ViewAssociatedKeys.status) as? Status ?? .off }
+        set { ao_set(newValue ?? .off, pkey: &ViewAssociatedKeys.status) }
+    }
+
+    var skeletonIsAnimated: Bool! {
+        get { return ao_get(pkey: &ViewAssociatedKeys.isSkeletonAnimated) as? Bool ?? false }
+        set { ao_set(newValue ?? false, pkey: &ViewAssociatedKeys.isSkeletonAnimated) }
+    }
+}

Sources/Extensions/UIView+IBInspectable.swift

@@ -1,22 +1,7 @@
-//
-//  UIView+IBInspectable.swift
-//  SkeletonView-iOS
-//
-//  Created by Juanpe Catalán on 01/11/2017.
 //  Copyright © 2017 SkeletonView. All rights reserved.
-//
 
 import UIKit
 
-private enum AssociatedKeys {
-    static var skeletonable = "skeletonable"
-    static var status = "status"
-    static var skeletonLayer = "layer"
-    static var flowDelegate = "flowDelegate"
-    static var isSkeletonAnimated = "isSkeletonAnimated"
-    static var viewState = "viewState"
-}
-
 public extension UIView {
     
     @IBInspectable
@@ -28,43 +13,10 @@ public extension UIView {
     var isSkeletonActive: Bool {
         return status == .on || (subviewsSkeletonables.first(where: { $0.isSkeletonActive }) != nil)
     }
-}
-
-extension UIView {
-    
-    enum Status {
-        case on
-        case off
-    }
-    
-    var flowDelegate: SkeletonFlowDelegate? {
-        get { return objc_getAssociatedObject(self, &AssociatedKeys.flowDelegate) as? SkeletonFlowDelegate }
-        set { objc_setAssociatedObject(self, &AssociatedKeys.flowDelegate, newValue, AssociationPolicy.retain.objc) }
-    }
-    
-    var skeletonLayer: SkeletonLayer? {
-        get { return objc_getAssociatedObject(self, &AssociatedKeys.skeletonLayer) as? SkeletonLayer }
-        set { objc_setAssociatedObject(self, &AssociatedKeys.skeletonLayer, newValue, AssociationPolicy.retain.objc) }
-    }
-    
-    var status: Status! {
-        get { return objc_getAssociatedObject(self, &AssociatedKeys.status) as? Status ?? .off }
-        set { objc_setAssociatedObject(self, &AssociatedKeys.status, newValue, AssociationPolicy.retain.objc) }
-    }
-    
-    var viewState: RecoverableViewState? {
-        get { return objc_getAssociatedObject(self, &AssociatedKeys.viewState) as? RecoverableViewState }
-        set { objc_setAssociatedObject(self, &AssociatedKeys.viewState, newValue, AssociationPolicy.retain.objc) }
-    }
-    
-    var skeletonIsAnimated: Bool! {
-        get { return objc_getAssociatedObject(self, &AssociatedKeys.isSkeletonAnimated) as? Bool ?? false }
-        set { objc_setAssociatedObject(self, &AssociatedKeys.isSkeletonAnimated, newValue, AssociationPolicy.retain.objc) }
-    }
 
     fileprivate var skeletonable: Bool! {
-        get { return objc_getAssociatedObject(self, &AssociatedKeys.skeletonable) as? Bool ?? false }
-        set { objc_setAssociatedObject(self, &AssociatedKeys.skeletonable, newValue, AssociationPolicy.retain.objc) }
+        get { return ao_get(pkey: &ViewAssociatedKeys.skeletonable) as? Bool ?? false }
+        set { ao_set(newValue ?? false, pkey: &ViewAssociatedKeys.skeletonable) }
     }
 }
 

Sources/Helpers/AssociationPolicy.swift

@@ -1,10 +1,4 @@
-//
-//  AssociationPolicy.swift
-//  SkeletonView-iOS
-//
-//  Created by Juanpe Catalán on 02/11/2017.
 //  Copyright © 2017 SkeletonView. All rights reserved.
-//
 
 import Foundation
 
@@ -21,3 +15,32 @@ enum AssociationPolicy: UInt {
         return objc_AssociationPolicy(rawValue: rawValue)!
     }
 }
+
+protocol AssociatedObjects: class { }
+
+// transparent wrappers
+extension AssociatedObjects {
+
+    /// wrapper around `objc_getAssociatedObject`
+    func ao_get(pkey: UnsafeRawPointer) -> Any? {
+        return objc_getAssociatedObject(self, pkey)
+    }
+
+    /// wrapper around `objc_setAssociatedObject`
+    func ao_setOptional(_ value: Any?, pkey: UnsafeRawPointer, policy: AssociationPolicy = .retainNonatomic) {
+        guard let value = value else { return }
+        objc_setAssociatedObject(self, pkey, value, policy.objc)
+    }
+
+    /// wrapper around `objc_setAssociatedObject`
+    func ao_set(_ value: Any, pkey: UnsafeRawPointer, policy: AssociationPolicy = .retainNonatomic) {
+        objc_setAssociatedObject(self, pkey, value, policy.objc)
+    }
+
+    /// wrapper around 'objc_removeAssociatedObjects'
+    func ao_removeAll() {
+        objc_removeAssociatedObjects(self)
+    }
+}
+
+extension NSObject: AssociatedObjects { }

Sources/Helpers/ContainsMultilineText.swift

@@ -1,82 +0,0 @@
-//
-//  ContainsMultilineText.swift
-//  SkeletonView-iOS
-//
-//  Created by Juanpe Catalán on 07/11/2017.
-//  Copyright © 2017 SkeletonView. All rights reserved.
-//
-
-import UIKit
-
-private enum AssociatedKeys {
-        static var lastLineFillingPercent = "lastLineFillingPercent"
-        static var multilineCornerRadius = "multilineCornerRadius"
-        
-}
-
-protocol ContainsMultilineText {
-        var numLines: Int { get }
-        var lastLineFillingPercent: Int { get }
-        var multilineCornerRadius: Int { get }
-}
-
-extension ContainsMultilineText {
-        var numLines: Int { return 0 }
-}
-
-public extension UILabel {
-        
-        @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 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 ?? SkeletonAppearance.default.multilineLastLineFillPercent }
-                set { objc_setAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent, newValue, AssociationPolicy.retain.objc) }
-        }
-        var multilineCornerRadius: Int {
-                get { return objc_getAssociatedObject(self, &AssociatedKeys.multilineCornerRadius) as? Int ?? SkeletonAppearance.default.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 ?? SkeletonAppearance.default.multilineLastLineFillPercent }
-                set { objc_setAssociatedObject(self, &AssociatedKeys.lastLineFillingPercent, newValue, AssociationPolicy.retain.objc) }
-        }
-        
-        var multilineCornerRadius: Int {
-                get { return objc_getAssociatedObject(self, &AssociatedKeys.multilineCornerRadius) as? Int ?? SkeletonAppearance.default.multilineCornerRadius }
-                set { objc_setAssociatedObject(self, &AssociatedKeys.multilineCornerRadius, newValue, AssociationPolicy.retain.objc) }
-        }
-}

Sources/Multilines/ContainsMultilineText.swift

@@ -0,0 +1,18 @@
+//  Copyright © 2017 SkeletonView. All rights reserved.
+
+import UIKit
+
+enum MultilineAssociatedKeys {
+    static var lastLineFillingPercent = "lastLineFillingPercent"
+    static var multilineCornerRadius = "multilineCornerRadius"
+}
+
+protocol ContainsMultilineText {
+    var numLines: Int { get }
+    var lastLineFillingPercent: Int { get }
+    var multilineCornerRadius: Int { get }
+}
+
+extension ContainsMultilineText {
+    var numLines: Int { return 0 }
+}

Sources/Multilines/UILabel+Multiline.swift

@@ -0,0 +1,32 @@
+// Copyright © 2018 SkeletonView. All rights reserved.
+
+import UIKit
+
+public extension UILabel {
+    @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 ao_get(pkey: &MultilineAssociatedKeys.lastLineFillingPercent) as? Int ?? SkeletonAppearance.default.multilineLastLineFillPercent }
+        set { ao_set(newValue, pkey: &MultilineAssociatedKeys.lastLineFillingPercent) }
+    }
+
+    var multilineCornerRadius: Int {
+        get { return ao_get(pkey: &MultilineAssociatedKeys.multilineCornerRadius) as? Int ?? SkeletonAppearance.default.multilineCornerRadius }
+        set { ao_set(newValue, pkey: &MultilineAssociatedKeys.multilineCornerRadius) }
+    }
+}

Sources/Multilines/UITextView+Multiline.swift

@@ -0,0 +1,36 @@
+// Copyright © 2018 SkeletonView. All rights reserved.
+
+import UIKit
+
+public extension UITextView {
+
+    @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 UITextView: ContainsMultilineText {
+    var lastLineFillingPercent: Int {
+        get {
+            let defaultValue = SkeletonAppearance.default.multilineLastLineFillPercent
+            return ao_get(pkey: &MultilineAssociatedKeys.lastLineFillingPercent) as? Int ?? defaultValue
+        }
+        set { ao_set(newValue, pkey: &MultilineAssociatedKeys.lastLineFillingPercent) }
+    }
+
+    var multilineCornerRadius: Int {
+        get {
+            let defaultValue = SkeletonAppearance.default.multilineCornerRadius
+            return ao_get(pkey: &MultilineAssociatedKeys.multilineCornerRadius) as? Int ?? defaultValue
+        }
+        set { ao_set(newValue, pkey: &MultilineAssociatedKeys.multilineCornerRadius) }
+    }
+}

Sources/Recoverable/Recoverable.swift

@@ -15,6 +15,11 @@ protocol Recoverable {
 }
 
 extension UIView: Recoverable {
+
+    var viewState: RecoverableViewState? {
+        get { return ao_get(pkey: &ViewAssociatedKeys.viewState) as? RecoverableViewState }
+        set { ao_setOptional(newValue, pkey: &ViewAssociatedKeys.viewState) }
+    }
     
     @objc func saveViewState() {
         viewState = RecoverableViewState(view: self)

Sources/SkeletonAnimationBuilder.swift

@@ -21,7 +21,8 @@ public enum GradientDirection {
     public func slidingAnimation(duration: CFTimeInterval = 1.5) -> SkeletonLayerAnimation {
         return SkeletonAnimationBuilder().makeSlidingAnimation(withDirection: self, duration: duration)
     }
-    
+
+    // codebeat:disable[ABC]
     var startPoint: GradientAnimationPoint {
         switch self {
         case .leftRight:
@@ -55,6 +56,7 @@ public enum GradientDirection {
             return ( from: CGPoint(x:2, y:2), to: CGPoint(x:0, y:0))
         }
     }
+    // codebeat:enable[ABC]
 }
 
 public class SkeletonAnimationBuilder {

Sources/SkeletonFlow.swift

@@ -7,7 +7,6 @@ protocol SkeletonFlowDelegate {
     func didShowSkeletons(withRootView rootView: UIView)
     func willBeginHidingSkeletons(withRootView rootView: UIView)
     func didHideSkeletons(withRootView rootView: UIView)
-
 }
 
 class SkeletonFlowHandler: SkeletonFlowDelegate {

Sources/SkeletonLayer.swift

@@ -8,26 +8,6 @@
 
 import UIKit
 
-class SkeletonLayerFactory {
-    
-    func makeSkeletonLayer(withType type: SkeletonType, usingColors colors: [UIColor], andHolder holder: UIView) -> SkeletonLayer {
-        return SkeletonLayer(withType: type, usingColors: colors, andSkeletonHolder: holder)
-    }
-    
-    func makeMultilineLayer(withType type: SkeletonType, for index: Int, width: CGFloat, multilineCornerRadius: Int) -> CALayer {
-        let spaceRequiredForEachLine = SkeletonAppearance.default.multilineHeight + SkeletonAppearance.default.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: SkeletonAppearance.default.multilineHeight)
-        
-        layer.cornerRadius = CGFloat(multilineCornerRadius)
-        layer.masksToBounds = true
-
-        return layer
-    }
-}
-
 public typealias SkeletonLayerAnimation = (CALayer) -> CAAnimation
 
 public enum SkeletonType {

Sources/SkeletonView.swift

@@ -68,7 +68,7 @@ extension UIView {
     }
     
     fileprivate func recursiveHideSkeleton(reloadDataAfter reload: Bool, root: UIView? = nil) {
-        removeDummyDataSourceIfNeeded()
+        removeDummyDataSourceIfNeeded(reloadAfter: reload)
         isUserInteractionEnabled = true
         subviewsSkeletonables.recursiveSearch(leafBlock: {
             recoverViewState(forced: false)
@@ -99,9 +99,16 @@ extension UIView {
 extension UIView {
     
     func addSkeletonLayer(withType type: SkeletonType, usingColors colors: [UIColor], gradientDirection direction: GradientDirection? = nil, animated: Bool, animation: SkeletonLayerAnimation? = nil) {
-        self.skeletonLayer = SkeletonLayerFactory().makeSkeletonLayer(withType: type, usingColors: colors, andHolder: self)
-        layer.insertSublayer(skeletonLayer!.contentLayer, at: UInt32.max)
-        if animated { skeletonLayer!.start(animation) }
+        guard let skeletonLayer = SkeletonLayerBuilder()
+            .setSkeletonType(type)
+            .addColors(colors)
+            .setHolder(self)
+            .build()
+            else { return }
+
+        self.skeletonLayer = skeletonLayer
+        layer.insertSublayer(skeletonLayer.contentLayer, at: UInt32.max)
+        if animated { skeletonLayer.start(animation) }
         status = .on
     }
     

fastlane/Fastfile

@@ -0,0 +1,13 @@
+default_platform(:ios)
+podspec_name = "SkeletonView.podspec"
+
+lane :release_current do
+   version = version_get_podspec(path: @podspec_name)
+   if git_tag_exists(tag: version)
+   UI.user_error!("The tag #{version} already exists on the repo. To release a new version of the library bump the version on #{@podspec_name}")
+   end
+   pod_lib_lint
+   add_git_tag(tag: "#{version}")
+   push_git_tags
+   pod_push
+end

fastlane/README.md

@@ -0,0 +1,28 @@
+fastlane documentation
+================
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```
+xcode-select --install
+```
+
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew cask install fastlane`
+
+# Available Actions
+### release_current
+```
+fastlane release_current
+```
+
+
+----
+
+This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
+More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
+The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).