fix: Add some missing files to tvOS framework

feat: Bump version to 1.2
feat: Update README file
2018-04-30 14:00:37 +02:00 · 2018-04-30 13:58:13 +02:00 · 2018-04-30 13:53:35 +02:00 · 2018-04-30 13:53:18 +02:00 · 2018-04-30 13:49:36 +02:00 · 2018-04-30 13:49:32 +02:00
35 changed files with 736 additions and 106 deletions
@@ -21,6 +21,7 @@ xcuserdata/
 *.moved-aside
 *.xccheckout
 *.xcscmblueprint
+.DS_Store

 ## Obj-C/Swift specific
 *.hmap
@@ -1 +1 @@
-4.0
+4.1
@@ -1,6 +1,7 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.3
 script:
  - xcodebuild -project SkeletonView.xcodeproj -target SkeletonView-iOS -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=11'
+  - xcodebuild -project SkeletonView.xcodeproj -target SkeletonView-tvOS -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV,OS=11'
  - xcodebuild -project SkeletonView.xcodeproj -target SkeletonViewExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=11'
 after_success:
@@ -1,6 +1,31 @@
 # Change Log
 All notable changes to this project will be documented in this file

+## [Hotfix (1.1.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.1.1)
+
+### Bug fixes
+- Now yes, solved issue [#39](https://github.com/Juanpe/SkeletonView/issues/39)
+
+## [Needed (1.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.1)
+
+### New
+- Now ```SkeletonView```supports **UICollectionViews**! 🎉.  (thanks @Renatdz)
+
+### Bug fixes
+- Solved issue [#39](https://github.com/Juanpe/SkeletonView/issues/39). Gradient animation did not work when app becomes active.
+
+
+## [Resizable (1.0.5)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.5)
+
+### New
+- Now you can use table views with resizable cells.
+
+### Bug fixes
+- Solved issues.
+ [#17](https://github.com/Juanpe/SkeletonView/issues/17),
+ [#30](https://github.com/Juanpe/SkeletonView/issues/30),
+ [#34](https://github.com/Juanpe/SkeletonView/issues/34).
+
 ## [Filled or not (1.0.4)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.4)

 ### New
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
    <device id="retina4_7" orientation="portrait">
        <adaptation id="fullscreen"/>
    </device>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -19,7 +19,7 @@
                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="120" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="UCB-SP-lQk">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="UCB-SP-lQk">
                                <rect key="frame" x="0.0" y="263" width="375" height="264"/>
                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                <color key="separatorColor" red="0.1061807256" green="0.84678786989999999" blue="0.031482450150000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
@@ -207,7 +207,7 @@
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="-482" y="-6"/>
+            <point key="canvasLocation" x="-897" y="-376"/>
        </scene>
    </scenes>
    <resources>
@@ -0,0 +1,11 @@
+//
+//  Constants.swift
+//  SkeletonView-iOS
+//
+//  Created by Renato Mendes on 28/11/2017.
+//  Copyright © 2017 SkeletonView. All rights reserved.
+//
+
+import UIKit
+
+let colors = [(UIColor.turquoise,"turquoise"), (UIColor.emerald,"emerald"), (UIColor.peterRiver,"peterRiver"), (UIColor.amethyst,"amethyst"),(UIColor.wetAsphalt,"wetAsphalt"), (UIColor.nephritis,"nephritis"), (UIColor.belizeHole,"belizeHole"), (UIColor.wisteria,"wisteria"), (UIColor.midnightBlue,"midnightBlue"), (UIColor.sunFlower,"sunFlower"), (UIColor.carrot,"carrot"), (UIColor.alizarin,"alizarin"),(UIColor.clouds,"clouds"), (UIColor.concrete,"concrete"), (UIColor.flatOrange,"flatOrange"), (UIColor.pumpkin,"pumpkin"), (UIColor.pomegranate,"pomegranate"), (UIColor.silver,"silver"), (UIColor.asbestos,"asbestos")]
@@ -9,8 +9,6 @@
 import UIKit
 import SkeletonView

-let colors = [(UIColor.turquoise,"turquoise"), (UIColor.emerald,"emerald"), (UIColor.peterRiver,"peterRiver"), (UIColor.amethyst,"amethyst"),(UIColor.wetAsphalt,"wetAsphalt"), (UIColor.nephritis,"nephritis"), (UIColor.belizeHole,"belizeHole"), (UIColor.wisteria,"wisteria"), (UIColor.midnightBlue,"midnightBlue"), (UIColor.sunFlower,"sunFlower"), (UIColor.carrot,"carrot"), (UIColor.alizarin,"alizarin"),(UIColor.clouds,"clouds"), (UIColor.concrete,"concrete"), (UIColor.flatOrange,"flatOrange"), (UIColor.pumpkin,"pumpkin"), (UIColor.pomegranate,"pomegranate"), (UIColor.silver,"silver"), (UIColor.asbestos,"asbestos")]
-
 class ViewController: UIViewController {
    
    @IBOutlet weak var tableview: UITableView! {
@@ -42,6 +40,11 @@ class ViewController: UIViewController {
        return skeletonTypeSelector.selectedSegmentIndex == 0 ? .solid : .gradient
    }
    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        tableview.isSkeletonable = true
+    }
+    
    override func viewDidAppear(_ animated: Bool) {
        super.viewDidAppear(animated)
        view.showAnimatedSkeleton()
@@ -4,13 +4,16 @@
    <a href="https://travis-ci.org/Juanpe/SkeletonView">
      <img src="https://img.shields.io/travis/Juanpe/SkeletonView.svg">
    </a>
-    <img src="https://img.shields.io/badge/Swift-4.0-orange.svg" />
+    <img src="https://img.shields.io/badge/Swift-4.1-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>
    <a href="https://twitter.com/JuanpeCatalan">
        <img src="https://img.shields.io/badge/contact-@JuanpeCatalan-blue.svg?style=flat" alt="Twitter: @JuanpeCatalan" />
    </a>
@@ -60,7 +63,8 @@ Enjoy it! 🙂
 ### 📋 Supported OS & SDK Versions

 * iOS 9.0+
-* Swift 4 (Swift 3 compatible)
+* tvOS 9.0+
+* Swift 4

 ### 🔮 Example

@@ -152,7 +156,9 @@ avatarImageView.isSkeletonable = true

 ### 🌿 Collections

- Currently, ```SkeletonView``` only is compatible with ```UITableView```. We are working hard to support ```UICollectionView``` too 💪🏼
+ Now, ```SkeletonView``` is compatible with ```UITableView``` and ```UICollectionView```.
+
+###### UITableView

 If you want to show the skeleton in a ```UITableView```, you need to conform to ```SkeletonTableViewDataSource``` protocol.

@@ -193,6 +199,20 @@ 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
+
+For ```UICollectionView```, you need to conform to ```SkeletonCollectionViewDataSource``` protocol.
+
+``` swift
+public protocol SkeletonCollectionViewDataSource: UICollectionViewDataSource {
+    func numSections(in collectionSkeletonView: UICollectionView) -> Int
+    func collectionSkeletonView(_ skeletonView: UICollectionView, numberOfItemsInSection section: Int) -> Int
+    func collectionSkeletonView(_ skeletonView: UICollectionView, cellIdentifierForItemAt indexPath: IndexPath) -> ReusableCellIdentifier
+}
+```
+
+The rest of the process is the same as ```UITableView```
+
 ### 📰 Multiline text


@@ -312,7 +332,8 @@ Coming soon...😅
 * [x] Set the filling percent of the last line in multiline elements
 * [x] Add more gradient animations
 * [x] Supported resizable cells
-* [ ] CollectionView compatible
+* [x] CollectionView compatible
+* [x] tvOS compatible
 * [ ] Add recovery state
 * [ ] Custom collections compatible
 * [ ] Add animations when it shows/hides the skeletons
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = "SkeletonView"
-  s.version      = "1.0.5"
+  s.version      = "1.2"
  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.
@@ -11,6 +11,7 @@ Pod::Spec.new do |s|
  s.author             = { "Juanpe Catalán" => "juanpecm@gmail.com" }
  s.social_media_url   = "https://twitter.com/JuanpeCatalan"
  s.ios.deployment_target = "9.0"
+  s.tvos.deployment_target = "9.0"
  s.source       = { :git => "https://github.com/Juanpe/SkeletonView.git", :tag => s.version.to_s }
  s.source_files  = "Sources/**/*"
 end
@@ -7,14 +7,43 @@
 	objects = {

 /* Begin PBXBuildFile section */
+		17DD0E08207FB28900C56334 /* CollectionSkeletonProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F899EC1FAB9F04002E8FDA /* CollectionSkeletonProtocol.swift */; };
+		17DD0E09207FB28900C56334 /* SkeletonCollectionDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F899EA1FAB9DA3002E8FDA /* SkeletonCollectionDataSource.swift */; };
+		17DD0E0A207FB28900C56334 /* SkeletonCollectionViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E381FB1078E00EE67C5 /* SkeletonCollectionViewProtocols.swift */; };
+		17DD0E0B207FB28900C56334 /* SkeletonTableViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E361FB1076E00EE67C5 /* SkeletonTableViewProtocols.swift */; };
+		17DD0E0C207FB28900C56334 /* UICollectionView+CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54CF5E32024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift */; };
+		17DD0E0D207FB28900C56334 /* UITableView+CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54CF5E22024CEAF00330B0D /* UITableView+CollectionSkeleton.swift */; };
+		17DD0E0E207FB28900C56334 /* UIView+CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54CF5E12024CEAF00330B0D /* UIView+CollectionSkeleton.swift */; };
+		17DD0E0F207FB28C00C56334 /* CALayer+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F622421FAC81FD007C062A /* CALayer+Extensions.swift */; };
+		17DD0E10207FB28C00C56334 /* UIColor+Skeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F622401FAC6E31007C062A /* UIColor+Skeleton.swift */; };
+		17DD0E11207FB28C00C56334 /* UIView+Frame.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E2D1FB0E5E400EE67C5 /* UIView+Frame.swift */; };
+		17DD0E12207FB28C00C56334 /* UIView+IBInspectable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F899CF1FAA6A4D002E8FDA /* UIView+IBInspectable.swift */; };
+		17DD0E13207FB28C00C56334 /* UIView+UIApplicationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F587FB85202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift */; };
+		17DD0E14207FB28F00C56334 /* SkeletonAnimationBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51DE1081FBF70A70037919A /* SkeletonAnimationBuilder.swift */; };
+		17DD0E15207FB28F00C56334 /* SkeletonDefaultConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E2F1FB0EC9D00EE67C5 /* SkeletonDefaultConfig.swift */; };
+		17DD0E16207FB28F00C56334 /* SkeletonGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E2B1FAF6BC900EE67C5 /* SkeletonGradient.swift */; };
+		17DD0E17207FB28F00C56334 /* SkeletonLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F899E81FAB9D2B002E8FDA /* SkeletonLayer.swift */; };
+		17DD0E18207FB28F00C56334 /* SkeletonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8933C7841EB5B820000D00A4 /* SkeletonView.swift */; };
+		17DD0E19207FB28F00C56334 /* SkeletonFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = F587FB83202CBFC8002DB5FE /* SkeletonFlow.swift */; };
+		17DD0E1C207FB32100C56334 /* AssociationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F899D11FAB9630002E8FDA /* AssociationPolicy.swift */; };
+		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 */; };
+		88DEA97F1FCDBD78006C80EF /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88DEA97D1FCDBD1F006C80EF /* Constants.swift */; };
 		8933C7851EB5B820000D00A4 /* SkeletonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8933C7841EB5B820000D00A4 /* SkeletonView.swift */; };
 		F51DE1091FBF70A70037919A /* SkeletonAnimationBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51DE1081FBF70A70037919A /* SkeletonAnimationBuilder.swift */; };
+		F51DF871206E91B300D23301 /* SkeletonReusableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51DF870206E91B300D23301 /* SkeletonReusableCell.swift */; };
+		F51DF873206E91FB00D23301 /* GenericCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51DF872206E91FB00D23301 /* GenericCollectionView.swift */; };
+		F51DF879206E9F5500D23301 /* SkeletonCollectionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51DF878206E9F5500D23301 /* SkeletonCollectionDelegate.swift */; };
+		F51ED28320973CBB008B2434 /* SkeletonCollectionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51DF878206E9F5500D23301 /* SkeletonCollectionDelegate.swift */; };
+		F51ED28420973CC6008B2434 /* GenericCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51DF872206E91FB00D23301 /* GenericCollectionView.swift */; };
+		F51ED28520973CC9008B2434 /* SkeletonReusableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F51DF870206E91B300D23301 /* SkeletonReusableCell.swift */; };
 		F5307E2C1FAF6BC900EE67C5 /* SkeletonGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E2B1FAF6BC900EE67C5 /* SkeletonGradient.swift */; };
 		F5307E2E1FB0E5E400EE67C5 /* UIView+Frame.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E2D1FB0E5E400EE67C5 /* UIView+Frame.swift */; };
 		F5307E301FB0EC9D00EE67C5 /* SkeletonDefaultConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E2F1FB0EC9D00EE67C5 /* SkeletonDefaultConfig.swift */; };
 		F5307E321FB0F42F00EE67C5 /* RecursiveProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E311FB0F42F00EE67C5 /* RecursiveProtocol.swift */; };
-		F5307E371FB1076E00EE67C5 /* SkeletonUITableViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E361FB1076E00EE67C5 /* SkeletonUITableViewDataSource.swift */; };
-		F5307E391FB1078E00EE67C5 /* SkeletonUICollectionViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E381FB1078E00EE67C5 /* SkeletonUICollectionViewDataSource.swift */; };
+		F5307E371FB1076E00EE67C5 /* SkeletonTableViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E361FB1076E00EE67C5 /* SkeletonTableViewProtocols.swift */; };
+		F5307E391FB1078E00EE67C5 /* SkeletonCollectionViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E381FB1078E00EE67C5 /* SkeletonCollectionViewProtocols.swift */; };
 		F5307E3B1FB123C100EE67C5 /* ContainsMultilineText.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E3A1FB123C100EE67C5 /* ContainsMultilineText.swift */; };
 		F5307E411FB3B84500EE67C5 /* SkeletonView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* SkeletonView.framework */; };
 		F5307E421FB3B84500EE67C5 /* SkeletonView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* SkeletonView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -22,6 +51,8 @@
 		F54CF5E52024CEB000330B0D /* UITableView+CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54CF5E22024CEAF00330B0D /* UITableView+CollectionSkeleton.swift */; };
 		F54CF5E62024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54CF5E32024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift */; };
 		F56B94461FAE20AF0095662F /* PrepareForSkeletonProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F56B94451FAE20AF0095662F /* PrepareForSkeletonProtocol.swift */; };
+		F587FB84202CBFC8002DB5FE /* SkeletonFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = F587FB83202CBFC8002DB5FE /* SkeletonFlow.swift */; };
+		F587FB86202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F587FB85202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift */; };
 		F5F622411FAC6E31007C062A /* UIColor+Skeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F622401FAC6E31007C062A /* UIColor+Skeleton.swift */; };
 		F5F622431FAC81FD007C062A /* CALayer+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F622421FAC81FD007C062A /* CALayer+Extensions.swift */; };
 		F5F622451FACA338007C062A /* Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5F622441FACA338007C062A /* Cell.swift */; };
@@ -62,21 +93,29 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
+		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>"; };
 		52D6D97C1BEFF229002C0205 /* SkeletonView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SkeletonView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		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>"; };
-		AD2FAA261CD0B6D800659CF4 /* SkeletonView.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SkeletonView.plist; sourceTree = "<group>"; };
 		F51DE1081FBF70A70037919A /* SkeletonAnimationBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonAnimationBuilder.swift; sourceTree = "<group>"; };
+		F51DF870206E91B300D23301 /* SkeletonReusableCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonReusableCell.swift; sourceTree = "<group>"; };
+		F51DF872206E91FB00D23301 /* GenericCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericCollectionView.swift; sourceTree = "<group>"; };
+		F51DF878206E9F5500D23301 /* SkeletonCollectionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonCollectionDelegate.swift; sourceTree = "<group>"; };
 		F5307E2B1FAF6BC900EE67C5 /* SkeletonGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonGradient.swift; sourceTree = "<group>"; };
 		F5307E2D1FB0E5E400EE67C5 /* UIView+Frame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Frame.swift"; sourceTree = "<group>"; };
 		F5307E2F1FB0EC9D00EE67C5 /* SkeletonDefaultConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonDefaultConfig.swift; sourceTree = "<group>"; };
 		F5307E311FB0F42F00EE67C5 /* RecursiveProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecursiveProtocol.swift; sourceTree = "<group>"; };
-		F5307E361FB1076E00EE67C5 /* SkeletonUITableViewDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonUITableViewDataSource.swift; sourceTree = "<group>"; };
-		F5307E381FB1078E00EE67C5 /* SkeletonUICollectionViewDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonUICollectionViewDataSource.swift; sourceTree = "<group>"; };
+		F5307E361FB1076E00EE67C5 /* SkeletonTableViewProtocols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonTableViewProtocols.swift; sourceTree = "<group>"; };
+		F5307E381FB1078E00EE67C5 /* SkeletonCollectionViewProtocols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonCollectionViewProtocols.swift; sourceTree = "<group>"; };
 		F5307E3A1FB123C100EE67C5 /* ContainsMultilineText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainsMultilineText.swift; sourceTree = "<group>"; };
 		F54CF5E12024CEAF00330B0D /* UIView+CollectionSkeleton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+CollectionSkeleton.swift"; sourceTree = "<group>"; };
 		F54CF5E22024CEAF00330B0D /* UITableView+CollectionSkeleton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+CollectionSkeleton.swift"; sourceTree = "<group>"; };
 		F54CF5E32024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UICollectionView+CollectionSkeleton.swift"; sourceTree = "<group>"; };
 		F56B94451FAE20AF0095662F /* PrepareForSkeletonProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrepareForSkeletonProtocol.swift; sourceTree = "<group>"; };
+		F587FB83202CBFC8002DB5FE /* SkeletonFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonFlow.swift; sourceTree = "<group>"; };
+		F587FB85202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+UIApplicationDelegate.swift"; sourceTree = "<group>"; };
 		F5F622401FAC6E31007C062A /* UIColor+Skeleton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Skeleton.swift"; sourceTree = "<group>"; };
 		F5F622421FAC81FD007C062A /* CALayer+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+Extensions.swift"; sourceTree = "<group>"; };
 		F5F622441FACA338007C062A /* Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cell.swift; sourceTree = "<group>"; };
@@ -95,6 +134,13 @@
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
+		17DD0DFC207FB27400C56334 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		52D6D9781BEFF229002C0205 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -129,6 +175,7 @@
 			children = (
 				52D6D97C1BEFF229002C0205 /* SkeletonView.framework */,
 				F5F899F21FABA607002E8FDA /* SkeletonViewExample.app */,
+				17DD0E00207FB27400C56334 /* SkeletonView.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -153,6 +200,7 @@
 				F5307E2B1FAF6BC900EE67C5 /* SkeletonGradient.swift */,
 				F5F899E81FAB9D2B002E8FDA /* SkeletonLayer.swift */,
 				8933C7841EB5B820000D00A4 /* SkeletonView.swift */,
+				F587FB83202CBFC8002DB5FE /* SkeletonFlow.swift */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -160,20 +208,48 @@
 		DD7502721C68FC1B006590AF /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				AD2FAA261CD0B6D800659CF4 /* SkeletonView.plist */,
+				17DD0E1B207FB2C200C56334 /* SkeletonView-iOS.plist */,
+				17DD0E1A207FB2C200C56334 /* SkeletonView-tvOS.plist */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		F51DF874206E94D300D23301 /* CollectionViews */ = {
+			isa = PBXGroup;
+			children = (
+				F54CF5E32024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift */,
+				F5307E381FB1078E00EE67C5 /* SkeletonCollectionViewProtocols.swift */,
+			);
+			path = CollectionViews;
+			sourceTree = "<group>";
+		};
+		F51DF875206E94DA00D23301 /* TableViews */ = {
+			isa = PBXGroup;
+			children = (
+				F54CF5E22024CEAF00330B0D /* UITableView+CollectionSkeleton.swift */,
+				F5307E361FB1076E00EE67C5 /* SkeletonTableViewProtocols.swift */,
+			);
+			path = TableViews;
+			sourceTree = "<group>";
+		};
+		F51DF877206E950000D23301 /* Generics */ = {
+			isa = PBXGroup;
+			children = (
+				F51DF872206E91FB00D23301 /* GenericCollectionView.swift */,
+				F51DF870206E91B300D23301 /* SkeletonReusableCell.swift */,
+			);
+			path = Generics;
+			sourceTree = "<group>";
+		};
 		F5307E331FB1068500EE67C5 /* Collections */ = {
 			isa = PBXGroup;
 			children = (
+				F51DF877206E950000D23301 /* Generics */,
+				F51DF875206E94DA00D23301 /* TableViews */,
+				F51DF874206E94D300D23301 /* CollectionViews */,
 				F5F899EC1FAB9F04002E8FDA /* CollectionSkeletonProtocol.swift */,
 				F5F899EA1FAB9DA3002E8FDA /* SkeletonCollectionDataSource.swift */,
-				F5307E381FB1078E00EE67C5 /* SkeletonUICollectionViewDataSource.swift */,
-				F5307E361FB1076E00EE67C5 /* SkeletonUITableViewDataSource.swift */,
-				F54CF5E32024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift */,
-				F54CF5E22024CEAF00330B0D /* UITableView+CollectionSkeleton.swift */,
+				F51DF878206E9F5500D23301 /* SkeletonCollectionDelegate.swift */,
 				F54CF5E12024CEAF00330B0D /* UIView+CollectionSkeleton.swift */,
 			);
 			path = Collections;
@@ -186,6 +262,7 @@
 				F5F622401FAC6E31007C062A /* UIColor+Skeleton.swift */,
 				F5307E2D1FB0E5E400EE67C5 /* UIView+Frame.swift */,
 				F5F899CF1FAA6A4D002E8FDA /* UIView+IBInspectable.swift */,
+				F587FB85202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -205,6 +282,7 @@
 			isa = PBXGroup;
 			children = (
 				F5F899F41FABA607002E8FDA /* AppDelegate.swift */,
+				88DEA97D1FCDBD1F006C80EF /* Constants.swift */,
 				F5F899F61FABA607002E8FDA /* ViewController.swift */,
 				F5F622441FACA338007C062A /* Cell.swift */,
 				F5F899F81FABA607002E8FDA /* Main.storyboard */,
@@ -232,6 +310,13 @@
 /* End PBXGroup section */

 /* Begin PBXHeadersBuildPhase section */
+		17DD0DFD207FB27400C56334 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		52D6D9791BEFF229002C0205 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -242,6 +327,24 @@
 /* End PBXHeadersBuildPhase section */

 /* Begin PBXNativeTarget section */
+		17DD0DFF207FB27400C56334 /* SkeletonView-tvOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 17DD0E07207FB27400C56334 /* Build configuration list for PBXNativeTarget "SkeletonView-tvOS" */;
+			buildPhases = (
+				17DD0DFB207FB27400C56334 /* Sources */,
+				17DD0DFC207FB27400C56334 /* Frameworks */,
+				17DD0DFD207FB27400C56334 /* Headers */,
+				17DD0DFE207FB27400C56334 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "SkeletonView-tvOS";
+			productName = "SkeletonView-tvOS";
+			productReference = 17DD0E00207FB27400C56334 /* SkeletonView.framework */;
+			productType = "com.apple.product-type.framework";
+		};
 		52D6D97B1BEFF229002C0205 /* SkeletonView-iOS */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 52D6D9901BEFF229002C0205 /* Build configuration list for PBXNativeTarget "SkeletonView-iOS" */;
@@ -286,17 +389,21 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0910;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = SkeletonView;
 				TargetAttributes = {
+					17DD0DFF207FB27400C56334 = {
+						CreatedOnToolsVersion = 9.3;
+						ProvisioningStyle = Automatic;
+					};
 					52D6D97B1BEFF229002C0205 = {
 						CreatedOnToolsVersion = 7.1;
-						DevelopmentTeam = PTS5FAP7XL;
+						DevelopmentTeam = KWEMDK92F4;
 						LastSwiftMigration = 0800;
 					};
 					F5F899F11FABA607002E8FDA = {
 						CreatedOnToolsVersion = 9.1;
-						DevelopmentTeam = PTS5FAP7XL;
+						DevelopmentTeam = KWEMDK92F4;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -315,12 +422,20 @@
 			projectRoot = "";
 			targets = (
 				52D6D97B1BEFF229002C0205 /* SkeletonView-iOS */,
+				17DD0DFF207FB27400C56334 /* SkeletonView-tvOS */,
 				F5F899F11FABA607002E8FDA /* SkeletonViewExample */,
 			);
 		};
 /* End PBXProject section */

 /* Begin PBXResourcesBuildPhase section */
+		17DD0DFE207FB27400C56334 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		52D6D97A1BEFF229002C0205 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -341,13 +456,45 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
+		17DD0DFB207FB27400C56334 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				17DD0E1F207FB32100C56334 /* RecursiveProtocol.swift in Sources */,
+				17DD0E1E207FB32100C56334 /* PrepareForSkeletonProtocol.swift in Sources */,
+				F51ED28520973CC9008B2434 /* SkeletonReusableCell.swift in Sources */,
+				17DD0E17207FB28F00C56334 /* SkeletonLayer.swift in Sources */,
+				17DD0E08207FB28900C56334 /* CollectionSkeletonProtocol.swift in Sources */,
+				17DD0E0B207FB28900C56334 /* SkeletonTableViewProtocols.swift in Sources */,
+				17DD0E0D207FB28900C56334 /* UITableView+CollectionSkeleton.swift in Sources */,
+				17DD0E0E207FB28900C56334 /* UIView+CollectionSkeleton.swift in Sources */,
+				F51ED28320973CBB008B2434 /* SkeletonCollectionDelegate.swift in Sources */,
+				17DD0E18207FB28F00C56334 /* SkeletonView.swift in Sources */,
+				17DD0E19207FB28F00C56334 /* SkeletonFlow.swift in Sources */,
+				17DD0E09207FB28900C56334 /* SkeletonCollectionDataSource.swift in Sources */,
+				17DD0E0C207FB28900C56334 /* UICollectionView+CollectionSkeleton.swift in Sources */,
+				17DD0E13207FB28C00C56334 /* UIView+UIApplicationDelegate.swift in Sources */,
+				17DD0E12207FB28C00C56334 /* UIView+IBInspectable.swift in Sources */,
+				17DD0E14207FB28F00C56334 /* SkeletonAnimationBuilder.swift in Sources */,
+				17DD0E11207FB28C00C56334 /* UIView+Frame.swift in Sources */,
+				17DD0E15207FB28F00C56334 /* SkeletonDefaultConfig.swift in Sources */,
+				17DD0E10207FB28C00C56334 /* UIColor+Skeleton.swift in Sources */,
+				F51ED28420973CC6008B2434 /* GenericCollectionView.swift in Sources */,
+				17DD0E0A207FB28900C56334 /* SkeletonCollectionViewProtocols.swift in Sources */,
+				17DD0E1C207FB32100C56334 /* AssociationPolicy.swift in Sources */,
+				17DD0E1D207FB32100C56334 /* ContainsMultilineText.swift in Sources */,
+				17DD0E0F207FB28C00C56334 /* CALayer+Extensions.swift in Sources */,
+				17DD0E16207FB28F00C56334 /* SkeletonGradient.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		52D6D9771BEFF229002C0205 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				F5F899D01FAA6A4D002E8FDA /* UIView+IBInspectable.swift in Sources */,
 				F54CF5E42024CEB000330B0D /* UIView+CollectionSkeleton.swift in Sources */,
-				F5307E371FB1076E00EE67C5 /* SkeletonUITableViewDataSource.swift in Sources */,
+				F5307E371FB1076E00EE67C5 /* SkeletonTableViewProtocols.swift in Sources */,
 				8933C7851EB5B820000D00A4 /* SkeletonView.swift in Sources */,
 				F5307E301FB0EC9D00EE67C5 /* SkeletonDefaultConfig.swift in Sources */,
 				F54CF5E52024CEB000330B0D /* UITableView+CollectionSkeleton.swift in Sources */,
@@ -355,15 +502,20 @@
 				F5F622431FAC81FD007C062A /* CALayer+Extensions.swift in Sources */,
 				F5F899ED1FAB9F04002E8FDA /* CollectionSkeletonProtocol.swift in Sources */,
 				F5307E2C1FAF6BC900EE67C5 /* SkeletonGradient.swift in Sources */,
+				F587FB86202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift in Sources */,
 				F5F899EB1FAB9DA3002E8FDA /* SkeletonCollectionDataSource.swift in Sources */,
 				F5F622411FAC6E31007C062A /* UIColor+Skeleton.swift in Sources */,
+				F587FB84202CBFC8002DB5FE /* SkeletonFlow.swift in Sources */,
 				F5F899D21FAB9630002E8FDA /* AssociationPolicy.swift in Sources */,
 				F54CF5E62024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift in Sources */,
 				F56B94461FAE20AF0095662F /* PrepareForSkeletonProtocol.swift in Sources */,
-				F5307E391FB1078E00EE67C5 /* SkeletonUICollectionViewDataSource.swift in Sources */,
+				F5307E391FB1078E00EE67C5 /* SkeletonCollectionViewProtocols.swift in Sources */,
+				F51DF873206E91FB00D23301 /* GenericCollectionView.swift in Sources */,
 				F5307E3B1FB123C100EE67C5 /* ContainsMultilineText.swift in Sources */,
 				F5F899E91FAB9D2B002E8FDA /* SkeletonLayer.swift in Sources */,
 				F5307E2E1FB0E5E400EE67C5 /* UIView+Frame.swift in Sources */,
+				F51DF871206E91B300D23301 /* SkeletonReusableCell.swift in Sources */,
+				F51DF879206E9F5500D23301 /* SkeletonCollectionDelegate.swift in Sources */,
 				F51DE1091FBF70A70037919A /* SkeletonAnimationBuilder.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -375,6 +527,7 @@
 				F5F899F71FABA607002E8FDA /* ViewController.swift in Sources */,
 				F5F899F51FABA607002E8FDA /* AppDelegate.swift in Sources */,
 				F5F622451FACA338007C062A /* Cell.swift in Sources */,
+				88DEA97F1FCDBD78006C80EF /* Constants.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -408,6 +561,70 @@
 /* End PBXVariantGroup section */

 /* Begin XCBuildConfiguration section */
+		17DD0E05207FB27400C56334 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_STYLE = Automatic;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = "Configs/SkeletonView-tvOS.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.SkeletonView.SkeletonView-tvOS";
+				PRODUCT_NAME = SkeletonView;
+				SDKROOT = appletvos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = 3;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+			};
+			name = Debug;
+		};
+		17DD0E06207FB27400C56334 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_STYLE = Automatic;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				INFOPLIST_FILE = "Configs/SkeletonView-tvOS.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.SkeletonView.SkeletonView-tvOS";
+				PRODUCT_NAME = SkeletonView;
+				SDKROOT = appletvos;
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
+				TARGETED_DEVICE_FAMILY = 3;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
+			};
+			name = Release;
+		};
 		52D6D98E1BEFF229002C0205 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -420,12 +637,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -477,12 +696,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -523,11 +744,11 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = PTS5FAP7XL;
+				DEVELOPMENT_TEAM = KWEMDK92F4;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = Configs/SkeletonView.plist;
+				INFOPLIST_FILE = "Configs/SkeletonView-iOS.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -548,11 +769,11 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = PTS5FAP7XL;
+				DEVELOPMENT_TEAM = KWEMDK92F4;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = Configs/SkeletonView.plist;
+				INFOPLIST_FILE = "Configs/SkeletonView-iOS.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -576,7 +797,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = PTS5FAP7XL;
+				DEVELOPMENT_TEAM = KWEMDK92F4;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "$(SRCROOT)/Configs/SkeletonViewExampleInfo.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -601,7 +822,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = PTS5FAP7XL;
+				DEVELOPMENT_TEAM = KWEMDK92F4;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "$(SRCROOT)/Configs/SkeletonViewExampleInfo.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -617,6 +838,15 @@
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
+		17DD0E07207FB27400C56334 /* Build configuration list for PBXNativeTarget "SkeletonView-tvOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				17DD0E05207FB27400C56334 /* Debug */,
+				17DD0E06207FB27400C56334 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		52D6D9761BEFF229002C0205 /* Build configuration list for PBXProject "SkeletonView" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0910"
+   LastUpgradeVersion = "0930"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
@@ -37,7 +36,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0930"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "17DD0DFF207FB27400C56334"
+               BuildableName = "SkeletonView.framework"
+               BlueprintName = "SkeletonView-tvOS"
+               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>
+      <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">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "17DD0DFF207FB27400C56334"
+            BuildableName = "SkeletonView.framework"
+            BlueprintName = "SkeletonView-tvOS"
+            ReferencedContainer = "container:SkeletonView.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "17DD0DFF207FB27400C56334"
+            BuildableName = "SkeletonView.framework"
+            BlueprintName = "SkeletonView-tvOS"
+            ReferencedContainer = "container:SkeletonView.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
@@ -8,25 +8,26 @@

 import UIKit

-enum DataSourceAssociatedKeys {
+enum CollectionAssociatedKeys {
    static var dummyDataSource = "dummyDataSource"
+    static var dummyDelegate = "dummyDelegate"
 }

 protocol CollectionSkeleton {
    var skeletonDataSource: SkeletonCollectionDataSource? { get set }
+    var skeletonDelegate: SkeletonCollectionDelegate? { get set }
    var estimatedNumberOfRows: Int { get }
    
    func addDummyDataSource()
    func removeDummyDataSource(reloadAfter: Bool)
-    func disableScrolling()
-    func enableScrolling()
+    func disableUserInteraction()
+    func enableUserInteraction()
 }

 extension CollectionSkeleton where Self: UIScrollView {
    var estimatedNumberOfRows: Int { return 0 }
    func addDummyDataSource() {}
    func removeDummyDataSource(reloadAfter: Bool) {}
-    func disableScrolling() { isScrollEnabled = false }
-    func enableScrolling() { isScrollEnabled = true }
+    func disableUserInteraction() { isUserInteractionEnabled = false }
+    func enableUserInteraction() { isUserInteractionEnabled = true }
 }
-
@@ -0,0 +1,28 @@
+//
+//  SkeletonCollectionViewProtocols.swift
+//  SkeletonView-iOS
+//
+//  Created by Juanpe Catalán on 06/11/2017.
+//  Copyright © 2017 SkeletonView. All rights reserved.
+//
+
+import UIKit
+
+
+public protocol SkeletonCollectionViewDataSource: UICollectionViewDataSource {
+    func numSections(in collectionSkeletonView: UICollectionView) -> Int
+    func collectionSkeletonView(_ skeletonView: UICollectionView, numberOfItemsInSection section: Int) -> Int
+    func collectionSkeletonView(_ skeletonView: UICollectionView, cellIdentifierForItemAt indexPath: IndexPath) -> ReusableCellIdentifier
+}
+
+public extension SkeletonCollectionViewDataSource {
+    
+    func collectionSkeletonView(_ skeletonView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return skeletonView.estimatedNumberOfRows
+    }
+    
+    func numSections(in collectionSkeletonView: UICollectionView) -> Int { return 1 }
+}
+
+public protocol SkeletonCollectionViewDelegate: UICollectionViewDelegate { }
+
@@ -0,0 +1,54 @@
+//
+//  UICollectionView+CollectionSkeleton.swift
+//  SkeletonView-iOS
+//
+//  Created by Juanpe Catalán on 02/02/2018.
+//  Copyright © 2018 SkeletonView. All rights reserved.
+//
+
+import UIKit
+
+extension UICollectionView: CollectionSkeleton {
+    
+    var estimatedNumberOfRows: Int {
+        guard let flowlayout = collectionViewLayout as? UICollectionViewFlowLayout else { return 0 }
+        return Int(ceil(frame.height/flowlayout.itemSize.height))
+    }
+    
+    var skeletonDataSource: SkeletonCollectionDataSource? {
+        get { return objc_getAssociatedObject(self, &CollectionAssociatedKeys.dummyDataSource) as? SkeletonCollectionDataSource }
+        set {
+            objc_setAssociatedObject(self, &CollectionAssociatedKeys.dummyDataSource, newValue, AssociationPolicy.retain.objc)
+            self.dataSource = newValue
+        }
+    }
+    
+    var skeletonDelegate: SkeletonCollectionDelegate? {
+        get { return objc_getAssociatedObject(self, &CollectionAssociatedKeys.dummyDelegate) as? SkeletonCollectionDelegate }
+        set {
+            objc_setAssociatedObject(self, &CollectionAssociatedKeys.dummyDelegate, newValue, AssociationPolicy.retain.objc)
+            self.delegate = newValue
+        }
+    }
+    
+    func addDummyDataSource() {
+        guard let originalDataSource = self.dataSource as? SkeletonCollectionViewDataSource,
+            !(originalDataSource is SkeletonCollectionDataSource)
+            else { return }
+        
+        let dataSource = SkeletonCollectionDataSource(collectionViewDataSource: originalDataSource, rowHeight: 0.0)
+        self.skeletonDataSource = dataSource
+        reloadData()
+    }
+    
+    func removeDummyDataSource(reloadAfter: Bool) {
+        guard let dataSource = self.dataSource as? SkeletonCollectionDataSource else { return }
+        self.skeletonDataSource = nil
+        self.dataSource = dataSource.originalCollectionViewDataSource
+        if reloadAfter { self.reloadData() }
+    }
+}
+
+extension UICollectionView: GenericCollectionView {
+    var scrollView: UIScrollView { return self }
+}
@@ -0,0 +1,13 @@
+//
+//  GenericCollectionView.swift
+//  SkeletonView-iOS
+//
+//  Created by Juanpe Catalán on 30/03/2018.
+//  Copyright © 2018 SkeletonView. All rights reserved.
+//
+
+import UIKit
+
+protocol GenericCollectionView {
+    var scrollView: UIScrollView { get }
+}
@@ -0,0 +1,15 @@
+//
+//  SkeletonReusableCell.swift
+//  SkeletonView-iOS
+//
+//  Created by Juanpe Catalán on 30/03/2018.
+//  Copyright © 2018 SkeletonView. All rights reserved.
+//
+
+import UIKit
+
+public protocol SkeletonReusableCell { }
+
+extension UITableViewCell: SkeletonReusableCell { }
+
+extension UICollectionViewCell: SkeletonReusableCell { }
@@ -13,10 +13,10 @@ public typealias ReusableCellIdentifier = String
 class SkeletonCollectionDataSource: NSObject {
    
    weak var originalTableViewDataSource: SkeletonTableViewDataSource?
-    weak var originalCollectionViewDataSource: UICollectionViewDataSource?
+    weak var originalCollectionViewDataSource: SkeletonCollectionViewDataSource?
    var rowHeight: CGFloat = 0.0
    
-    convenience init(tableViewDataSource: SkeletonTableViewDataSource? = nil, collectionViewDataSource: UICollectionViewDataSource? = nil, rowHeight: CGFloat = 0.0) {
+    convenience init(tableViewDataSource: SkeletonTableViewDataSource? = nil, collectionViewDataSource: SkeletonCollectionViewDataSource? = nil, rowHeight: CGFloat = 0.0) {
        self.init()
        self.originalTableViewDataSource = tableViewDataSource
        self.originalCollectionViewDataSource = collectionViewDataSource
@@ -42,18 +42,20 @@ extension SkeletonCollectionDataSource: UITableViewDataSource {
    }
 }

-// MARK: - [WIP] UICollectionViewDataSource
+// MARK: - UICollectionViewDataSource
 extension SkeletonCollectionDataSource: UICollectionViewDataSource {
    
    func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return 1
+        return originalCollectionViewDataSource?.numSections(in: collectionView) ?? 0
    }
    
    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return 4
+        return originalCollectionViewDataSource?.collectionSkeletonView(collectionView, numberOfItemsInSection: section) ?? 0
    }
    
    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        return UICollectionViewCell()
+        let cellIdentifier = originalCollectionViewDataSource?.collectionSkeletonView(collectionView, cellIdentifierForItemAt: indexPath) ?? ""
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: cellIdentifier, for: indexPath)
+        return cell
    }
 }
@@ -0,0 +1,26 @@
+//
+//  SkeletonCollectionDelegate.swift
+//  SkeletonView-iOS
+//
+//  Created by Juanpe Catalán on 30/03/2018.
+//  Copyright © 2018 SkeletonView. All rights reserved.
+//
+
+import UIKit
+
+class SkeletonCollectionDelegate: NSObject {
+    
+    weak var originalTableViewDelegate: SkeletonTableViewDelegate?
+    weak var originalCollectionViewDelegate: SkeletonCollectionViewDelegate?
+    
+    init(tableViewDelegate: SkeletonTableViewDelegate? = nil, collectionViewDelegate: SkeletonCollectionViewDelegate? = nil) {
+        self.originalTableViewDelegate = tableViewDelegate
+        self.originalCollectionViewDelegate = collectionViewDelegate
+    }
+}
+
+// MARK: - UITableViewDataSource
+extension SkeletonCollectionDelegate: UITableViewDelegate { }
+
+// MARK: - UICollectionViewDataSource
+extension SkeletonCollectionDelegate: UICollectionViewDelegate { }
@@ -1,12 +0,0 @@
-//
-//  SkeletonUICollectionViewDataSource.swift
-//  SkeletonView-iOS
-//
-//  Created by Juanpe Catalán on 06/11/2017.
-//  Copyright © 2017 SkeletonView. All rights reserved.
-//
-
-import UIKit
-
-// Work in progress
-protocol SkeletonUICollectionViewDataSource: UICollectionViewDataSource {}
@@ -1,5 +1,5 @@
 //
-//  SkeletonUITableViewDataSource.swift
+//  SkeletonTableViewProtocols.swift
 //  SkeletonView-iOS
 //
 //  Created by Juanpe Catalán on 06/11/2017.
@@ -22,3 +22,6 @@ public extension SkeletonTableViewDataSource {
    
    func numSections(in collectionSkeletonView: UITableView) -> Int { return 1 }
 }
+
+public protocol SkeletonTableViewDelegate: UITableViewDelegate {
+}
@@ -15,13 +15,21 @@ extension UITableView: CollectionSkeleton {
    }
    
    var skeletonDataSource: SkeletonCollectionDataSource? {
-        get { return objc_getAssociatedObject(self, &DataSourceAssociatedKeys.dummyDataSource) as? SkeletonCollectionDataSource }
+        get { return objc_getAssociatedObject(self, &CollectionAssociatedKeys.dummyDataSource) as? SkeletonCollectionDataSource }
        set {
-            objc_setAssociatedObject(self, &DataSourceAssociatedKeys.dummyDataSource, newValue, AssociationPolicy.retain.objc)
+            objc_setAssociatedObject(self, &CollectionAssociatedKeys.dummyDataSource, newValue, AssociationPolicy.retain.objc)
            self.dataSource = newValue
        }
    }
    
+    var skeletonDelegate: SkeletonCollectionDelegate? {
+        get { return objc_getAssociatedObject(self, &CollectionAssociatedKeys.dummyDelegate) as? SkeletonCollectionDelegate }
+        set {
+            objc_setAssociatedObject(self, &CollectionAssociatedKeys.dummyDelegate, newValue, AssociationPolicy.retain.objc)
+            self.delegate = newValue
+        }
+    }
+    
    func addDummyDataSource() {
        guard let originalDataSource = self.dataSource as? SkeletonTableViewDataSource,
            !(originalDataSource is SkeletonCollectionDataSource)
@@ -38,7 +46,7 @@ extension UITableView: CollectionSkeleton {
        self.dataSource = dataSource.originalTableViewDataSource
        if reloadAfter { self.reloadData() }
    }
-    
+
    private func restoreRowHeight() {
        guard let dataSource = self.dataSource as? SkeletonCollectionDataSource else { return }
        rowHeight = dataSource.rowHeight
@@ -50,3 +58,6 @@ extension UITableView: CollectionSkeleton {
        return estimatedRowHeight
    }
 }
+
+
+
@@ -1,17 +0,0 @@
-//
-//  UICollectionView+CollectionSkeleton.swift
-//  SkeletonView-iOS
-//
-//  Created by Juanpe Catalán on 02/02/2018.
-//  Copyright © 2018 SkeletonView. All rights reserved.
-//
-
-import UIKit
-
-extension UICollectionView: CollectionSkeleton {
-    
-    var skeletonDataSource: SkeletonCollectionDataSource? {
-        get { return objc_getAssociatedObject(self, &DataSourceAssociatedKeys.dummyDataSource) as? SkeletonCollectionDataSource }
-        set { objc_setAssociatedObject(self, &DataSourceAssociatedKeys.dummyDataSource, newValue, AssociationPolicy.retain.objc) }
-    }
-}
@@ -12,12 +12,12 @@ extension UIView {
    func addDummyDataSourceIfNeeded() {
        guard let collection = self as? CollectionSkeleton else { return }
        collection.addDummyDataSource()
-        collection.disableScrolling()
+        collection.disableUserInteraction()
    }
    
    func removeDummyDataSourceIfNeeded(reloadAfter reload: Bool = true) {
        guard let collection = self as? CollectionSkeleton else { return }
        collection.removeDummyDataSource(reloadAfter: reload)
-        collection.enableScrolling()
+        collection.enableUserInteraction()
    }
 }
@@ -74,12 +74,12 @@ public extension CALayer {
    
    var sliding: CAAnimation {
        let startPointAnim = CABasicAnimation(keyPath: #keyPath(CAGradientLayer.startPoint))
-        startPointAnim.fromValue = NSValue(cgPoint:CGPoint(x: -1, y: 0.5))
-        startPointAnim.toValue = NSValue(cgPoint:CGPoint(x:1, y: 0.5))
+        startPointAnim.fromValue = CGPoint(x: -1, y: 0.5)
+        startPointAnim.toValue = CGPoint(x:1, y: 0.5)
        
        let endPointAnim = CABasicAnimation(keyPath: #keyPath(CAGradientLayer.endPoint))
-        endPointAnim.fromValue = NSValue(cgPoint:CGPoint(x: 0, y: 0.5))
-        endPointAnim.toValue = NSValue(cgPoint:CGPoint(x:2, y: 0.5))
+        endPointAnim.fromValue = CGPoint(x: 0, y: 0.5)
+        endPointAnim.toValue = CGPoint(x:2, y: 0.5)
        
        let animGroup = CAAnimationGroup()
        animGroup.animations = [startPointAnim, endPointAnim]
@@ -12,6 +12,8 @@ private enum AssociatedKeys {
    static var skeletonable = "skeletonable"
    static var status = "status"
    static var skeletonLayer = "layer"
+    static var flowDelegate = "flowDelegate"
+    static var isSkeletonAnimated = "isSkeletonAnimated"
 }

 public extension UIView {
@@ -34,6 +36,11 @@ extension UIView {
        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) }
@@ -43,6 +50,11 @@ extension UIView {
        get { return objc_getAssociatedObject(self, &AssociatedKeys.status) as? Status ?? .off }
        set { objc_setAssociatedObject(self, &AssociatedKeys.status, 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 }
@@ -0,0 +1,38 @@
+//
+//  UIView+UIApplicationDelegate.swift
+//  SkeletonView-iOS
+//
+//  Created by Juanpe Catalán on 08/02/2018.
+//  Copyright © 2018 SkeletonView. All rights reserved.
+//
+
+import UIKit
+
+extension UIView {
+    
+    enum Constants {
+        static let becomeActiveNotification = NSNotification.Name.UIApplicationDidBecomeActive
+        static let enterForegroundNotification = NSNotification.Name.UIApplicationDidEnterBackground
+        static let needAnimatedSkeletonKey = "needAnimateSkeleton"
+    }
+    
+    func addAppNotificationsObservers() {
+        NotificationCenter.default.addObserver(self, selector: #selector(appDidBecomeActive), name: Constants.becomeActiveNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(appDidEnterBackground), name: Constants.enterForegroundNotification, object: nil)
+    }
+    
+    func removeAppNoticationsObserver() {
+        NotificationCenter.default.removeObserver(self, name: Constants.becomeActiveNotification, object: nil)
+        NotificationCenter.default.removeObserver(self, name: Constants.enterForegroundNotification, object: nil)
+    }
+    
+    @objc func appDidBecomeActive() {
+        if UserDefaults.standard.bool(forKey: Constants.needAnimatedSkeletonKey) {
+            startSkeletonAnimation()
+        }
+    }
+    
+    @objc func appDidEnterBackground() {
+        UserDefaults.standard.set((isSkeletonActive && skeletonIsAnimated), forKey: Constants.needAnimatedSkeletonKey)
+    }
+}
@@ -66,12 +66,12 @@ public class SkeletonAnimationBuilder {
        return { layer in
            
            let startPointAnim = CABasicAnimation(keyPath: #keyPath(CAGradientLayer.startPoint))
-            startPointAnim.fromValue = NSValue(cgPoint: direction.startPoint.from)
-            startPointAnim.toValue = NSValue(cgPoint: direction.startPoint.to)
+            startPointAnim.fromValue = direction.startPoint.from
+            startPointAnim.toValue = direction.startPoint.to
            
            let endPointAnim = CABasicAnimation(keyPath: #keyPath(CAGradientLayer.endPoint))
-            endPointAnim.fromValue = NSValue(cgPoint: direction.endPoint.from)
-            endPointAnim.toValue = NSValue(cgPoint: direction.endPoint.to)
+            endPointAnim.fromValue = direction.endPoint.from
+            endPointAnim.toValue = direction.endPoint.to
            
            let animGroup = CAAnimationGroup()
            animGroup.animations = [startPointAnim, endPointAnim]
@@ -0,0 +1,26 @@
+//
+//  SkeletonFlow.swift
+//  SkeletonView-iOS
+//
+//  Created by Juanpe Catalán on 08/02/2018.
+//  Copyright © 2018 SkeletonView. All rights reserved.
+//
+
+import UIKit
+
+protocol SkeletonFlowDelegate {
+    func willBeginShowingSkeletons(withRootView rootView: UIView)
+    func willBeginHidingSkeletons(withRootView rootView: UIView)
+}
+
+class SkeletonFlowHandler: SkeletonFlowDelegate {
+    
+    func willBeginShowingSkeletons(withRootView rootView: UIView) {
+        rootView.addAppNotificationsObservers()
+    }
+    
+    func willBeginHidingSkeletons(withRootView rootView: UIView) {
+        rootView.removeAppNoticationsObserver()
+        rootView.flowDelegate = nil
+    }
+}
@@ -10,7 +10,7 @@ import UIKit

 class SkeletonLayerFactory {
    
-    func makeLayer(withType type: SkeletonType, usingColors colors: [UIColor], andHolder holder: UIView) -> SkeletonLayer {
+    func makeSkeletonLayer(withType type: SkeletonType, usingColors colors: [UIColor], andHolder holder: UIView) -> SkeletonLayer {
        return SkeletonLayer(withType: type, usingColors: colors, andSkeletonHolder: holder)
    }
    
@@ -27,16 +27,12 @@ public extension UIView {
    }
    
    func hideSkeleton(reloadDataAfter reload: Bool = true) {
-        removeDummyDataSourceIfNeeded(reloadAfter: reload)
-        isUserInteractionEnabled = true
-        recursiveSearch(inArray: subviewsSkeletonables,
-                        leafBlock: { removeSkeletonLayer() },
-                        recursiveBlock: {
-                            $0.hideSkeleton(reloadDataAfter: reload)
-                        })
+        flowDelegate?.willBeginHidingSkeletons(withRootView: self)
+        recursiveHideSkeleton(reloadDataAfter: reload)
    }
    
    func startSkeletonAnimation(_ anim: SkeletonLayerAnimation? = nil) {
+        skeletonIsAnimated = true
        recursiveSearch(inArray: subviewsSkeletonables,
                        leafBlock:  startSkeletonLayerAnimationBlock(anim)) {
                            $0.startSkeletonAnimation(anim)
@@ -44,6 +40,7 @@ public extension UIView {
    }

    func stopSkeletonAnimation() {
+        skeletonIsAnimated = false
        recursiveSearch(inArray: subviewsSkeletonables,
                        leafBlock: stopSkeletonLayerAnimationBlock) {
                            $0.stopSkeletonAnimation()
@@ -54,6 +51,13 @@ public extension UIView {
 extension UIView {
    
    func showSkeleton(withType type: SkeletonType = .solid, usingColors colors: [UIColor], animated: Bool = false, animation: SkeletonLayerAnimation? = nil) {
+        skeletonIsAnimated = animated
+        flowDelegate = SkeletonFlowHandler()
+        flowDelegate?.willBeginShowingSkeletons(withRootView: self)
+        recursiveShowSkeleton(withType: type, usingColors: colors, animated: animated, animation: animation)
+    }
+    
+    fileprivate func recursiveShowSkeleton(withType type: SkeletonType = .solid, usingColors colors: [UIColor], animated: Bool = false, animation: SkeletonLayerAnimation? = nil) {
        addDummyDataSourceIfNeeded()
        recursiveSearch(inArray: subviewsSkeletonables,
                        leafBlock: {
@@ -61,9 +65,20 @@ extension UIView {
                            isUserInteractionEnabled = false
                            (self as? PrepareForSkeleton)?.prepareViewForSkeleton()
                            addSkeletonLayer(withType: type, usingColors: colors, animated: animated, animation: animation)
-                        }) {
-                            $0.showSkeleton(withType: type, usingColors: colors, animated: animated, animation: animation)
-                        }
+        }) {
+            $0.recursiveShowSkeleton(withType: type, usingColors: colors, animated: animated, animation: animation)
+        }
+    }
+    
+    fileprivate func recursiveHideSkeleton(reloadDataAfter reload: Bool = true) {
+        removeDummyDataSourceIfNeeded()
+        isUserInteractionEnabled = true
+        recursiveSearch(inArray: subviewsSkeletonables,
+                        leafBlock: {
+                            removeSkeletonLayer()
+                        }, recursiveBlock: {
+                            $0.recursiveHideSkeleton(reloadDataAfter: reload)
+                        })
    }
    
    fileprivate func startSkeletonLayerAnimationBlock(_ anim: SkeletonLayerAnimation? = nil) -> VoidBlock {
@@ -99,6 +114,18 @@ extension UITableViewCell {
    }
 }

+extension UICollectionView {
+    override var subviewsSkeletonables: [UIView] {
+        return subviews.filter { $0.isSkeletonable }
+    }
+}
+
+extension UICollectionViewCell {
+    override var subviewsSkeletonables: [UIView] {
+        return contentView.subviews.filter { $0.isSkeletonable }
+    }
+}
+
 extension UIStackView {
    override var subviewsSkeletonables: [UIView] {
        return arrangedSubviews.filter { $0.isSkeletonable }
@@ -108,7 +135,7 @@ extension UIStackView {
 extension UIView {
    
    func addSkeletonLayer(withType type: SkeletonType, usingColors colors: [UIColor], gradientDirection direction: GradientDirection? = nil, animated: Bool, animation: SkeletonLayerAnimation? = nil) {
-        self.skeletonLayer = SkeletonLayerFactory().makeLayer(withType: type, usingColors: colors, andHolder: self)
+        self.skeletonLayer = SkeletonLayerFactory().makeSkeletonLayer(withType: type, usingColors: colors, andHolder: self)
        layer.insertSublayer(skeletonLayer!.contentLayer, at: UInt32.max)
        if animated { skeletonLayer!.start(animation) }
        status = .on
Author	SHA1	Message	Date
Juanpe Catalán	0995f0d9c9	fix: Add some missing files to tvOS framework	2018-04-30 14:00:37 +02:00
Juanpe Catalán	1e7be16ccb	feat: Bump version to 1.2	2018-04-30 13:58:13 +02:00
Juanpe Catalán	c1b96b7838	feat: Update README file	2018-04-30 13:53:35 +02:00
Juanpe Catalán	d856c5b670	feat: Travis: Bump to Xcode 9.3	2018-04-30 13:53:18 +02:00
Juanpe Catalán	2af1fd28b7	Merge branch 'master' of https://github.com/Juanpe/SkeletonView	2018-04-30 13:49:36 +02:00
Juanpe Catalán	9806ec9eac	feat: Remove gitignore contraints	2018-04-30 13:49:32 +02:00
Juanpe Catalán	55372f0c8f	feat: Update project for Xcode 9.3 and Swift 4.1	2018-04-30 13:46:21 +02:00
Juanpe Catalán	331f949807	Merge pull request #53 from mihai8804858/tvos-support feat: Add support for tvOS	2018-04-30 13:39:44 +02:00
Juanpe Catalán	6604c64b03	feat: Add dummy delegate	2018-04-30 13:38:43 +02:00
Juanpe Catalán	9306f69b78	feat: Update gitignore	2018-04-30 13:36:37 +02:00
Mihai Seremet	30f4cbcc7a	Add support for tvOS	2018-04-16 14:36:40 +03:00
Juanpe Catalán	7e2849e26b	fix: Issue #46	2018-03-30 14:31:05 +02:00
Juanpe Catalán	6f628a3382	feat: Add total downloads in README file	2018-03-30 13:55:54 +02:00
Juanpe Catalán	793c79f3e2	Merge branch 'master' of https://github.com/Juanpe/SkeletonView	2018-02-14 20:35:35 +01:00
Juanpe Catalán	20c2fe7e98	fix: Problem when app enter in foreground	2018-02-14 20:35:09 +01:00
Juanpe Catalán	b3a6fca8fa	Update CHANGELOG.md	2018-02-14 09:41:10 +01:00
Juanpe Catalán	5bcf7f114e	feat: Update CHANGELOG file	2018-02-14 09:25:42 +01:00
Juanpe Catalán	145982894a	feat: Update example with UITableView with automatic dimension	2018-02-14 09:23:09 +01:00
Juanpe Catalán	e89de65a2b	fix: Problem setting skeletonIsAnimated property	2018-02-12 19:11:07 +01:00
Juanpe Catalán	34b9122e0a	feat: Update CHANGELOG file	2018-02-09 00:56:55 +01:00
Juanpe Catalán	9613f36f19	feat: Bump version	2018-02-09 00:48:32 +01:00
Juanpe Catalán	38b42f8713	fix: Typo in CHANGELOG file	2018-02-09 00:42:30 +01:00
Juanpe Catalán	4c3c996816	feat: Update README file	2018-02-09 00:41:04 +01:00
Juanpe Catalán	3284db700c	feat: Update CHANGELOG file	2018-02-09 00:40:26 +01:00
Juanpe Catalán	7958826036	feat: Update CHANGELOG file	2018-02-09 00:38:45 +01:00
Juanpe Catalán	fb1a5e3b8e	fix: Bug when app become active #39	2018-02-08 22:04:39 +01:00
Juanpe Catalán	fcae5ac799	feat: Add UIApplication notifications observers feat: Create SkeletonFlow	2018-02-08 21:46:24 +01:00
Juanpe Catalán	9063a5bc9f	Merge pull request #10 from fanticqq/NsData_wrapping_deleted feat: Removed wrapping structs to NSValue	2018-02-08 18:18:04 +01:00
Juanpe Catalán	605b1e368f	Merge pull request #25 from Renatdz/master feat: Add support for collection views	2018-02-08 16:45:32 +01:00
Renato Mendes	6e769ed0d4	Resolves the conflict caused by some changes to the CollectionSkeletonProtocol scope, and changes the collectionView feature to the new architecture	2018-02-06 20:22:33 -02:00
Juanpe Catalán	e880c00815	feat: Change signature of “makeLayer” method	2018-02-06 10:55:17 +01:00
Juanpe Catalán	75ec8bc1f1	feat: Update CHANGELOG file	2018-02-02 18:13:27 +01:00
Renato Mendes	e3e8d5b51a	Remove unnecessary prints	2018-01-05 11:30:23 -02:00
Renato Mendes	ad511ee64c	Add support to the collectionView, the visible cells are zero when we're adding the skeleton, we fix it by replacing the visible cells with subviews.	2017-12-12 14:42:14 -02:00
Renato Mendes	86bb15bc25	Missing file	2017-11-28 16:45:43 -02:00
Renato Mendes	c49e4505c8	Adjusts to add CollectionView to SkeletonView	2017-11-28 16:45:11 -02:00
Igor Zarubin	13b041b5f1	Removed wrapping to NSValue of from/to CABasicAnimation parameters because it not necessary in Swift	2017-11-19 00:21:38 +03:00
@@ -1 +1 @@
 .0
 .1