UnSwizzle methods when SkeletonView is hidden (#381)

* Add InputAccessoryView to textField

* Add method to removeOnce Add unSwizzleMethods that are called when recursiveHideSkeleton

Co-authored-by: Alexandros Lykesas <alexandros.lykesas@untis.at>

.github/workflows/pod_lib_lint.yml

@@ -0,0 +1,14 @@
+name: Pod lint
+on: [workflow_dispatch]
+        
+jobs:
+  pod_lib_lint:
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+   
+      - env:
+          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+        run: |
+          set -eo pipefail
+          pod lib lint --allow-warnings         

.github/workflows/release.yml

@@ -1,53 +1,38 @@
 name: Release
-on: 
-  workflow_dispatch:
-    inputs:
-      release_version:
-        description: "Release version"
-        required: true
-        default: ""
+on: [workflow_dispatch]
         
 jobs:
-    bump_pod_version:
-        runs-on: ubuntu-latest
-        steps:
-          - uses: actions/checkout@v2
-          - name: setup fastlane
-            run: brew install fastlane
-          - name: bump version
-            run: fastlane bump_version next_version:${{ github.event.inputs.release_version }}
-    
-    commit_changes:
-      needs: bump_pod_version
-      runs-on: ubuntu-latest
-      steps:
-        - uses: actions/checkout@v2
-        - name: commit changes
-          uses: stefanzweifel/git-auto-commit-action@v4
-          with:
-            branch: 'main'
-            commit_message: 'Bump version ${{ github.event.inputs.release_version }}'
-          env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    
-    create_release:
-        runs-on: ubuntu-latest
-        needs: commit_changes
-        steps:
-            - uses: actions/checkout@v2
-            - name: publish release
-              uses: release-drafter/release-drafter@v5
-              with: 
-                publish: true
-              env:
-                 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                 
-    pod_trunk_push: 
-        runs-on: macOS-latest
-        needs: create_release
-        steps:
-          - uses: actions/checkout@v2
-          - name: publish pod
-            env:
-              COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
-            run: pod trunk push SkeletonView.podspec --allow-warnings --verbose
+  release_version:
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+          
+      - name: Setup fastlane
+        run: brew install fastlane
+            
+      - name: Publish release
+        id: publish_release
+        uses: release-drafter/release-drafter@v5
+        with: 
+          publish: true
+        env:
+           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update podspec 
+        run: fastlane bump_version next_version:${{ steps.publish_release.outputs.tag_name }}
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: 'main'
+          commit_message: 'Bump version ${{ steps.publish_release.outputs.tag_name }}'
+        env:
+         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}      
+
+      - name: Deploy to Cocoapods
+        env:
+          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+        run: |
+          set -eo pipefail
+          pod lib lint --allow-warnings
+          pod trunk push --allow-warnings           

Example/TableView/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Va7-1y-Tel">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Va7-1y-Tel">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -155,6 +155,7 @@
                                         <connections>
                                             <outlet property="avatar" destination="oiE-tt-nc2" id="Dkh-R5-Qhu"/>
                                             <outlet property="label1" destination="VhU-1t-AaI" id="kUW-HV-KrD"/>
+                                            <outlet property="textField" destination="dha-bH-Ipf" id="OHI-6P-tuU"/>
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>

Example/TableView/Cell.swift

@@ -9,11 +9,25 @@
 import UIKit
 
 class Cell: UITableViewCell {
-    
+
     @IBOutlet weak var avatar: UIImageView!
     @IBOutlet weak var label1: UILabel!
-    
+    @IBOutlet weak var textField: UITextField!
+
     override func awakeFromNib() {
         super.awakeFromNib()
+        setUpInputAccessoryView()
+    }
+
+    func setUpInputAccessoryView() {
+        let bar = UIToolbar()
+        let reset = UIBarButtonItem(title: "InputAccessoryView", style: .plain, target: self, action: #selector(resetTapped))
+        bar.items = [reset]
+        bar.sizeToFit()
+        textField.inputAccessoryView = bar
+    }
+
+    @objc func resetTapped() {
+
     }
 }

SkeletonView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SkeletonView"
-  s.version      = "1.12.0"
+  s.version      = "1.13.0"
   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.

Sources/Extensions/UIView+Extension.swift

@@ -49,4 +49,8 @@ extension UIView {
         get { return ao_get(pkey: &ViewAssociatedKeys.isSkeletonAnimated) as? Bool ?? false }
         set { ao_set(newValue, pkey: &ViewAssociatedKeys.isSkeletonAnimated) }
     }
+    
+    var isSuperviewAStackView: Bool {
+        superview is UIStackView
+    }
 }

Sources/Helpers/AssociationPolicy.swift

@@ -17,7 +17,7 @@ enum AssociationPolicy: UInt {
     }
 }
 
-protocol AssociatedObjects: class { }
+protocol AssociatedObjects: AnyObject { }
 
 // transparent wrappers
 extension AssociatedObjects {

Sources/Helpers/PrepareForSkeletonProtocol.swift

@@ -28,7 +28,12 @@ extension UILabel {
     }
     
     func updateHeightConstraintsIfNeeded() {
-        guard numberOfLines > 1 else { return }
+        guard numberOfLines > 1 || numberOfLines == 0 else { return }
+        
+        // Workaround to simulate content when the label is contained in a `UIStackView`.
+        if isSuperviewAStackView, bounds.height == 0 {
+            text = "This is a placeholder text to simulate content because it's contained in a stack view in order to prevent that the content size will be zero."
+        }
         
         let desiredHeight = desiredHeightBasedOnNumberOfLines
         if desiredHeight > definedMaxHeight {

Sources/Helpers/Swizzling.swift

@@ -4,21 +4,28 @@ import Foundation
 
 extension DispatchQueue {
     private static var _onceTracker = [String]()
-    
+
     class func once(token: String, block: () -> Void) {
         objc_sync_enter(self); defer { objc_sync_exit(self) }
         guard !_onceTracker.contains(token) else { return }
-        
+
         _onceTracker.append(token)
         block()
     }
+
+    class func removeOnce(token: String, block: () -> Void) {
+        objc_sync_enter(self); defer { objc_sync_exit(self) }
+        guard let index = _onceTracker.firstIndex(of: token) else { return }
+        _onceTracker.remove(at: index)
+        block()
+    }
 }
 
 func swizzle(selector originalSelector: Selector, with swizzledSelector: Selector, inClass: AnyClass, usingClass: AnyClass) {
     guard let originalMethod = class_getInstanceMethod(inClass, originalSelector),
         let swizzledMethod = class_getInstanceMethod(usingClass, swizzledSelector)
         else { return }
-    
+
     if class_addMethod(inClass, swizzledSelector, method_getImplementation(originalMethod), method_getTypeEncoding(originalMethod)) {
         class_replaceMethod(inClass, originalSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod))
     } else {

Sources/SkeletonView.swift

@@ -190,6 +190,8 @@ extension UIView {
             isHidden = false
         }
         currentSkeletonConfig?.transition = transition
+        unSwizzleLayoutSubviews()
+        unSwizzleTraitCollectionDidChange()
         removeDummyDataSourceIfNeeded(reloadAfter: reload)
         subviewsSkeletonables.recursiveSearch(leafBlock: {
             recoverViewState(forced: false)
@@ -233,6 +235,17 @@ extension UIView {
         }
     }
 
+    private func unSwizzleLayoutSubviews() {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
+            DispatchQueue.removeOnce(token: "UIView.SkeletonView.swizzleLayoutSubviews") {
+                swizzle(selector: #selector(UIView.skeletonLayoutSubviews),
+                        with: #selector(UIView.layoutSubviews),
+                        inClass: UIView.self,
+                        usingClass: UIView.self)
+            }
+        }
+    }
+
     private func swizzleTraitCollectionDidChange() {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
             DispatchQueue.once(token: "UIView.SkeletonView.swizzleTraitCollectionDidChange") {
@@ -243,6 +256,17 @@ extension UIView {
             }
         }
     }
+
+    private func unSwizzleTraitCollectionDidChange() {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
+            DispatchQueue.removeOnce(token: "UIView.SkeletonView.swizzleTraitCollectionDidChange") {
+                swizzle(selector: #selector(UIView.skeletonTraitCollectionDidChange(_:)),
+                        with: #selector(UIView.traitCollectionDidChange(_:)),
+                        inClass: UIView.self,
+                        usingClass: UIView.self)
+            }
+        }
+    }
 }
 
 extension UIView {

fastlane/README.md

@@ -15,6 +15,11 @@ Install _fastlane_ using
 or alternatively using `brew install fastlane`
 
 # Available Actions
+### bump_version
+```
+fastlane bump_version
+```
+
 ### release_current
 ```
 fastlane release_current