Merge pull request #267 from Juanpe/develop

v1.8.6
Juanpe · Feb 21, 2020 · 0d5c0a2 · 0d5c0a2
2 parents b87a6e1 + 440e5ba
commit 0d5c0a2
Show file tree

Hide file tree

Showing 17 changed files with 247 additions and 102 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Swift Build
+name: build
 
 on:
   push:
@@ -13,5 +13,8 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
-    - name: swift build
-      run: swift build -v
+    - name: xcodebuild
+      run: |
+        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'
+        xcodebuild -project SkeletonView.xcodeproj -target SkeletonViewExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=12'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,175 +1,188 @@
 # Change Log
 All notable changes to this project will be documented in this file
 
-## MASTER
+### Next version
 
-#### New
+#### 🙌 New
 
-#### Improvements
+#### 🔬Improvements
+
+#### 🩹 Bug fixes
+
+### 📦 [1.8.6](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.6)
+
+#### 🔬Improvements
 * [**242**](https://github.com/Juanpe/SkeletonView/pull/242): Offscreen table view layout issue fixed - [@Cacodemon](https://github.com/Cacodemon)
+* [**261**](https://github.com/Juanpe/SkeletonView/pull/261): Fixes removing skeleton layers from table header footer sections - [@darkside999](https://github.com/darkside999)
+* [**263**](https://github.com/Juanpe/SkeletonView/pull/263): Feature/set cross dissolve transitions as default - [@Juanpe](https://github.com/Juanpe)
+* [**264**](https://github.com/Juanpe/SkeletonView/pull/264): not replace original datasource is running XCTests - [@Juanpe](https://github.com/Juanpe)
+* [**265**](https://github.com/Juanpe/SkeletonView/pull/265): call original traitCollectionDidChange method - [@Juanpe](https://github.com/Juanpe)
+
+#### 🩹 Bug fixes
+* [**260**](https://github.com/Juanpe/SkeletonView/issues/260): Don't hide skeleton layers on TableViewHeaderFooterView
+* [**257**](https://github.com/Juanpe/SkeletonView/issues/257): Unit test problem when using SkeletonView
 
-#### Bug fixes
 
-## [1.8.3](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.3)
+### 📦 [1.8.3](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.3)
 
 - Support for iOS 13 dark mode. (thanks @Wilsonator5000)
 
-## [1.8.2](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.2)
+### 📦 [1.8.2](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.2)
 
-### New
+#### 🙌 New
 - Add ability to customize line spacing per label. (thanks @gshahbazian) 
 
-## [LayoutSkeleton (1.8.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.1)
+### 📦 [LayoutSkeleton (1.8.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.1)
 
-### Improvements
+#### 🔬Improvements
 - Fix completion call in .none transition style while hide skeletons. (thanks @aadudyrev)
 
-### New
+#### 🙌 New
 - Swizzle `layoutSubviews` method. 
 
-### Improvements
+#### 🔬Improvements
 - Fix completion call in .none transition style while hiding skeletons. (thanks @aadudyrev)
 - Swift format.
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Update layout subviews when the original method is called.
    - Issues: [#88, #149]
 
-## [Transitions (1.8)](https://github.com/Juanpe/SkeletonView/releases/tag/1.8)
+### 📦 [Transitions (1.8)](https://github.com/Juanpe/SkeletonView/releases/tag/1.8)
 
-### New
+#### 🙌 New
 
 - Adding swift news to mentioned section (thanks @osterbergmarcus).
 - Create `SkeletonTransitionStyle`. Now, you can animate transition when you show or hide skeletons. (thanks @pontusjacobsson)
 
-### Improvements
+#### 🔬Improvements
 - Refactor some methods.
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issues.
  [#175](https://github.com/Juanpe/SkeletonView/issues/175) Swift Package Manager version format
 
-## [Layout update (1.7)](https://github.com/Juanpe/SkeletonView/releases/tag/1.7)
+### 📦 [Layout update (1.7)](https://github.com/Juanpe/SkeletonView/releases/tag/1.7)
 
-### New
+#### 🙌 New
 
 - Allow updating skeleton layout to recalculate skeleton bounds: `layoutSkeletonIfNeeded`. See the examples to know how to use it. (thanks @eduardbosch)
 
-### Improvements
+#### 🔬Improvements
 
 - Allow updating skeleton layers without recreating them: `updateSkeleton`, `updateGradientSkeleton`, `updateAnimatedSkeleton`, `updateAnimatedGradientSkeleton`. (thanks @eduardbosch)
 
-## [Debug (1.4)](https://github.com/Juanpe/SkeletonView/releases/tag/1.4)
+### 📦 [Debug (1.4)](https://github.com/Juanpe/SkeletonView/releases/tag/1.4)
 
-### New
+#### 🙌 New
 
 - Create `skeletonDescription` print a skeleton representation of the view.
 - Create `SKELETON_DEBUG` environment variable, in order to print the view hierarchy when the skeleton appears.
 
-### Improvements
+#### 🔬Improvements
 - Add two new methods to `SkeletonFlowDelegate` protocol. Now you can know when the skeleton did show and when it did hide.
 - `Recursive` protocol
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#86](https://github.com/Juanpe/SkeletonView/issues/86) (thanks @reececomo)
 
-## [Custom defaults (1.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.3)
+### 📦 [Custom defaults (1.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.3)
 
-### New
+#### 🙌 New
 
 - Default values customizables. Now you can set the default values of Skeleton appearance.(thanks @reececomo)
   - issues: [[#50](https://github.com/Juanpe/SkeletonView/issues/50), [#83](https://github.com/Juanpe/SkeletonView/issues/83)]
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#41](https://github.com/Juanpe/SkeletonView/issues/41). Now, Skeleton works if UICollectionView cell's Nib is registered in code. (thanks @kjoneandrei)
 
-## [Typo (1.2.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.3)
+### 📦 [Typo (1.2.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.3)
 
-### Fixes
+####  Fixes
 
 - Fix typo in `SkeletonTableViewDataSource` protocol
 
-### Improvements
+#### 🔬Improvements
 
 - Now it takes in account the `UIStackView` to calculate the `SkeletonLayer` bounds (thanks @giantramen)
 
-## [New face (1.2.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.2)
+### 📦 [New face (1.2.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.2)
 
-### New
+#### 🙌 New
 
 - Rebranding
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#23](https://github.com/Juanpe/SkeletonView/issues/23). Problem with UIStackView. (thanks @giantramen)
 
-## [State (1.2.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.1)
+### 📦 [State (1.2.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.1)
 
-### New
+#### 🙌 New
 
 - You can set the corner radius multiline elements (thanks @B4V4-G)
 - Save view state when skeleton appears and recovery when it is hidden (@juanpe)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#51](https://github.com/Juanpe/SkeletonView/issues/51). Support inspectable properties when using Carthage. (thanks @eduardbosch)
 
-## [On TV (1.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2)
+### 📦 [On TV (1.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2)
 
-### New
+#### 🙌 New
 - Now ```SkeletonView``` is **tvOS** compatible! 🎉.  (thanks @mihai8804858)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#46](https://github.com/Juanpe/SkeletonView/issues/46). It crashes the application when tap on it, didSelect called and crash.
 
 
-## [Hotfix (1.1.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.1.1)
+### 📦 [Hotfix (1.1.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.1.1)
 
-### Bug fixes
+#### 🩹 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)
+### 📦 [Needed (1.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.1)
 
-### New
+#### 🙌 New
 - Now ```SkeletonView```supports **UICollectionViews**! 🎉.  (thanks @Renatdz)
 
-### Bug fixes
+#### 🩹 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)
+### 📦 [Resizable (1.0.5)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.5)
 
-### New
+#### 🙌 New
 - Now you can use table views with resizable cells.
 
-### Bug fixes
+#### 🩹 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)
+### 📦 [Filled or not (1.0.4)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.4)
 
-### New
+#### 🙌 New
 - You can set the filling percent of the last line in multiline elements (thanks @jontelang!)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#14](https://github.com/Juanpe/SkeletonView/issues/14). You could edit text views with skeleton active.
 
-## [In all directions (1.0.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.3)
+### 📦 [In all directions (1.0.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.3)
 
-### New
+#### 🙌 New
 - Create ```SkeletonAnimationBuilder```, to facilitate the creation of layer animations.
 ```GradientDirection``` enum.
 
-## [Retro (1.0.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.2)
+### 📦 [Retro (1.0.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.2)
 
-### New
+#### 🙌 New
 - Change some private keywords, to be Swift 3 compatible
 
-## [Early bird bug (1.0.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.2)
+### 📦 [Early bird bug (1.0.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.2)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - It was not removing the skeleton layer
 
-## [Starter (1.0)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0)
+### 📦 [Starter (1.0)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0)
 
 - First release
diff --git a/Example/CollectionView/Main.storyboard b/Example/CollectionView/Main.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="irH-dz-xqL">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="irH-dz-xqL">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,7 +17,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eHI-ka-8vS">
-                                <rect key="frame" x="0.0" y="20" width="375" height="243"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="243"/>
                                 <subviews>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="obr-b6-dib">
                                         <rect key="frame" x="45" y="142" width="287" height="78"/>
@@ -66,7 +64,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="HKL-L0-T2w">
-                                <rect key="frame" x="0.0" y="263" width="375" height="244"/>
+                                <rect key="frame" x="0.0" y="243" width="375" height="264"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="mGU-kn-rfE">
                                     <size key="itemSize" width="50" height="50"/>
@@ -83,7 +81,7 @@
                                 <rect key="frame" x="0.0" y="507" width="375" height="160"/>
                                 <subviews>
                                     <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="fMR-vj-7de">
-                                        <rect key="frame" x="20" y="22.5" width="135" height="29"/>
+                                        <rect key="frame" x="20" y="21" width="145" height="32"/>
                                         <segments>
                                             <segment title="Solid"/>
                                             <segment title="Gradient"/>
@@ -135,14 +133,14 @@
                                             <action selector="showOrHideSkeleton:" destination="irH-dz-xqL" eventType="touchUpInside" id="lHc-k2-OgV"/>
                                         </connections>
                                     </button>
-                                    <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="5" stepValue="0.25" translatesAutoresizingMaskIntoConstraints="NO" id="3mz-9M-e7Q">
-                                        <rect key="frame" x="263" y="126" width="94" height="29"/>
+                                    <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.25" maximumValue="5" stepValue="0.25" translatesAutoresizingMaskIntoConstraints="NO" id="3mz-9M-e7Q">
+                                        <rect key="frame" x="263" y="123" width="94" height="32"/>
                                         <connections>
                                             <action selector="transitionDurationStepperAction:" destination="irH-dz-xqL" eventType="valueChanged" id="Ll0-Pr-d0V"/>
                                         </connections>
                                     </stepper>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fade Duration: 0 sec" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5gN-Jz-44y">
-                                        <rect key="frame" x="113.5" y="131.5" width="141.5" height="18"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fade Duration: 0.25 sec" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5gN-Jz-44y">
+                                        <rect key="frame" x="92.5" y="130" width="162.5" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>

diff --git a/Example/CollectionView/ViewController.swift b/Example/CollectionView/ViewController.swift
@@ -45,6 +45,7 @@ class ViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        transitionDurationStepper.value = 0.25
         collectionView.prepareSkeleton(completion: { done in
             self.view.showAnimatedSkeleton()
         })