Update stale.yml

* Fixed: UITextField placeholder text is visible while skeleton is showing #345
Setting placeholder to nil on prepareViewForSkeleton() method
Created RecoverableTextFieldState, which has textColor and placeholder properties, Added UITextField extension in Recoverable.swift, setting the values on recoverViewStage 'forced' is true

* Update PrepareForSkeletonProtocol.swift

.github/ISSUE_TEMPLATE/bug_report.md

@@ -19,8 +19,8 @@ Describe your issue here.
 - [ ] discussion
 
 ### Requirements (place an `x` in each of the `[ ]`)
-* [ ] I've read and understood the [Contributing guidelines](https://github.com/Juanpe/SkeletonView/blob/develop/CONTRIBUTING.md) and have done my best effort to follow them.
-* [ ] I've read and agree to the [Code of Conduct](https://github.com/Juanpe/SkeletonView/blob/develop/CODE_OF_CONDUCT.md).
+* [ ] I've read and understood the [Contributing guidelines](https://github.com/Juanpe/SkeletonView/blob/main/CONTRIBUTING.md) and have done my best effort to follow them.
+* [ ] I've read and agree to the [Code of Conduct](https://github.com/Juanpe/SkeletonView/blob/main/CODE_OF_CONDUCT.md).
 * [ ] I've searched for any related issues and avoided creating a duplicate issue.
 
 ---

.github/pull_request_template.md

@@ -3,5 +3,5 @@
 Describe the goal of this PR. Mention any related Issue numbers.
 
 ### Requirements (place an `x` in each of the `[ ]`)
-* [ ] I've read and understood the [Contributing guidelines](https://github.com/Juanpe/SkeletonView/blob/develop/CONTRIBUTING.md) and have done my best effort to follow them.
-* [ ] I've read and agree to the [Code of Conduct](https://github.com/Juanpe/SkeletonView/blob/develop/CODE_OF_CONDUCT.md).
+* [ ] I've read and understood the [Contributing guidelines](https://github.com/Juanpe/SkeletonView/blob/main/CONTRIBUTING.md) and have done my best effort to follow them.
+* [ ] I've read and agree to the [Code of Conduct](https://github.com/Juanpe/SkeletonView/blob/main/CODE_OF_CONDUCT.md).

.github/release-drafter.yml

@@ -24,10 +24,10 @@ version-resolver:
   major:
     labels:
       - 'breaking'
-      - 'feature'
   minor:
     labels:
       - '💡 enhancement'
+      - 'feature'
   patch:
     labels:
       - '🐞 bug'

.github/stale.yml

@@ -4,7 +4,7 @@ onlyLabels:
   - awaiting user input
 staleLabel: given up
 markComment: >
-  This issue has been automatically marked as stale because it has not had
+  🤖 This issue has been automatically marked as stale because it has not had
   recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
+  for your contributions 🙂
 closeComment: false

.github/workflows/main.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches: [develop]
+    branches: [main]
 
 jobs:
   build:

.github/workflows/release.yml

@@ -3,23 +3,13 @@ on:
   workflow_dispatch:
     inputs:
       release_version:
-        description: "Version"
+        description: "Release version"
         required: true
         default: ""
         
 jobs:
-    pod_lib_lint:
-        runs-on: macOS-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: Validate Pod
-              env:
-                COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
-              run: pod lib lint SkeletonView.podspec --allow-warnings
-    
     bump_pod_version:
         runs-on: ubuntu-latest
-        needs: pod_lib_lint
         steps:
           - uses: actions/checkout@v2
           - name: setup fastlane
@@ -31,31 +21,33 @@ jobs:
       needs: bump_pod_version
       runs-on: ubuntu-latest
       steps:
-        - name: Checkout repo
-          uses: actions/checkout@v2
-
-        - name: Commit changes
-          uses: EndBug/add-and-commit@v7
+        - uses: actions/checkout@v2
+        - name: commit changes
+          uses: stefanzweifel/git-auto-commit-action@v4
           with:
-            message: 'Bump version ${{ github.event.inputs.release_version }}'
+            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
-            - uses: release-drafter/release-drafter@v5
+            - name: publish release
+              uses: release-drafter/release-drafter@v5
               with: 
                 publish: true
               env:
                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                  
-    pod_trunk_repo: 
+    pod_trunk_push: 
         runs-on: macOS-latest
         needs: create_release
         steps:
-          - uses: actions/checkout@v1
-          - name: Publish Pod
+          - uses: actions/checkout@v2
+          - name: publish pod
             env:
               COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
-            run: pod trunk push SkeletonView.podspec
+            run: pod trunk push SkeletonView.podspec --allow-warnings --verbose

.github/workflows/release_notes.yml

@@ -3,7 +3,7 @@ name: Release Notes
 on:
   push:
     branches:
-      - develop
+      - main
 
 jobs:
   update_release_notes:

.github/workflows/validations.yml

@@ -2,7 +2,7 @@ name: Validations
 
 on: 
   pull_request_target:
-    branches: [develop]
+    branches: [main]
     types: [opened, reoneped, edited, synchronized]
 
 #  workflow_dispatch:

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Contributors Guide
 
 Interested in contributing? Awesome! Before you do though, please read our
-[Code of Conduct](https://github.com/Juanpe/SkeletonView/blob/develop/CODE_OF_CONDUCT.md). We take it very seriously, and expect that you will as
+[Code of Conduct](https://github.com/Juanpe/SkeletonView/blob/main/CODE_OF_CONDUCT.md). We take it very seriously, and expect that you will as
 well.
 
 There are many ways you can contribute! :heart:
@@ -45,7 +45,7 @@ If the contribution doesn't meet the above criteria, you may fail our automated
 3.  :herb: Create a new branch and check it out.
 4.  :crystal_ball: Make your changes and commit them locally.
 5.  :arrow_heading_up: Push your new branch to your fork. (e.g. `git push username fix-issue-300`).
-6.  :inbox_tray: Open a Pull Request on github.com from your new branch on your fork to `develop` in this
+6.  :inbox_tray: Open a Pull Request on github.com from your new branch on your fork to `main` in this
     repository.
 
 ## Developer's Certificate of Origin 1.1

Dangerfile.swift

@@ -3,16 +3,6 @@ import Danger
 let danger = Danger()
 let github = danger.github
 
-// Changelog entries are required for changes to library files.
-let allSourceFiles = danger.git.modifiedFiles + danger.git.createdFiles
-let noChangelogEntry = !allSourceFiles.contains("CHANGELOG.md")
-let sourceChanges = allSourceFiles.contains { $0.hasPrefix("Sources") }
-let isNotTrivial = !danger.github.pullRequest.title.contains("#trivial")
-
-if isNotTrivial && noChangelogEntry && sourceChanges {
-    fail("Any changes to library code should be reflected in the Changelog.")
-}
-
  // Make it more obvious that a PR is a work in progress and shouldn't be merged yet
 if danger.github.pullRequest.title.contains("WIP") {
     warn("PR is classed as Work in Progress")

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="17156" 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="17506" 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="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
         <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"/>
@@ -50,12 +50,9 @@
                                             <userDefinedRuntimeAttribute type="boolean" keyPath="isSkeletonable" value="YES"/>
                                         </userDefinedRuntimeAttributes>
                                     </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CJW-A4-Fb8">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CJW-A4-Fb8">
                                         <rect key="frame" x="166" y="27" width="166" height="12"/>
                                         <color key="backgroundColor" red="0.92156862750000001" green="0.16862745100000001" blue="0.54901960780000003" alpha="1" colorSpace="calibratedRGB"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" relation="lessThanOrEqual" constant="80" id="XAA-g8-NVH"/>
-                                        </constraints>
                                         <fontDescription key="fontDescription" type="system" pointSize="10"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -128,14 +125,25 @@
                                                         </userDefinedRuntimeAttribute>
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="placeholder" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dha-bH-Ipf">
+                                                    <rect key="frame" x="119" y="57" width="235" height="34"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="boolean" keyPath="isSkeletonable" value="YES"/>
+                                                    </userDefinedRuntimeAttributes>
+                                                </textField>
                                             </subviews>
                                             <constraints>
+                                                <constraint firstItem="dha-bH-Ipf" firstAttribute="top" secondItem="VhU-1t-AaI" secondAttribute="bottom" constant="8" symbolic="YES" id="1Ek-1L-ZVs"/>
                                                 <constraint firstItem="oiE-tt-nc2" firstAttribute="leading" secondItem="7IN-F3-Mr6" secondAttribute="leadingMargin" id="1be-ak-AH1"/>
                                                 <constraint firstAttribute="bottom" secondItem="oiE-tt-nc2" secondAttribute="bottom" constant="20" id="CKt-oA-eBI"/>
                                                 <constraint firstItem="oiE-tt-nc2" firstAttribute="top" secondItem="7IN-F3-Mr6" secondAttribute="topMargin" constant="7" id="EKn-ST-LDX"/>
                                                 <constraint firstAttribute="trailingMargin" secondItem="VhU-1t-AaI" secondAttribute="trailing" constant="5" id="I7C-Bq-mfK"/>
                                                 <constraint firstItem="VhU-1t-AaI" firstAttribute="leading" secondItem="oiE-tt-nc2" secondAttribute="trailing" constant="21" id="Ojr-Kz-1k6"/>
                                                 <constraint firstItem="VhU-1t-AaI" firstAttribute="top" secondItem="7IN-F3-Mr6" secondAttribute="topMargin" constant="18" id="ZW6-JY-S4c"/>
+                                                <constraint firstItem="dha-bH-Ipf" firstAttribute="trailing" secondItem="VhU-1t-AaI" secondAttribute="trailing" id="baX-Nw-8sB"/>
+                                                <constraint firstItem="dha-bH-Ipf" firstAttribute="leading" secondItem="VhU-1t-AaI" secondAttribute="leading" id="kzA-mV-IDt"/>
                                             </constraints>
                                             <userDefinedRuntimeAttributes>
                                                 <userDefinedRuntimeAttribute type="boolean" keyPath="isSkeletonable" value="YES"/>

README.md

@@ -19,7 +19,7 @@
   • <a href="#️-contributing">Contributing</a>
 </p>
 
-**🌎 README is available in other languages:  [🇪🇸](https://github.com/Juanpe/SkeletonView/blob/develop/README_es.md) . [🇨🇳](https://github.com/Juanpe/SkeletonView/blob/master/README_zh.md) . [🇧🇷](https://github.com/Juanpe/SkeletonView/blob/master/README_pt-br.md) . [🇰🇷](https://github.com/Juanpe/SkeletonView/blob/master/README_ko.md) . [🇫🇷](https://github.com/Juanpe/SkeletonView/blob/master/README_fr.md)**
+**🌎 README is available in other languages:  [🇪🇸](https://github.com/Juanpe/SkeletonView/blob/main/README_es.md) . [🇨🇳](https://github.com/Juanpe/SkeletonView/blob/master/README_zh.md) . [🇧🇷](https://github.com/Juanpe/SkeletonView/blob/master/README_pt-br.md) . [🇰🇷](https://github.com/Juanpe/SkeletonView/blob/master/README_ko.md) . [🇫🇷](https://github.com/Juanpe/SkeletonView/blob/master/README_fr.md)**
 
 Today almost all apps have async processes, such as API requests, long running processes, etc. While the processes are working, usually developers place a loading view to show users that something is going on.
 
@@ -531,7 +531,7 @@ This is an open source project, so feel free to contribute. How?
 
 See [all contributors](https://github.com/Juanpe/SkeletonView/graphs/contributors)
 
-For more information, please read the [contributing guidelines](https://github.com/Juanpe/SkeletonView/blob/develop/CONTRIBUTING.md).
+For more information, please read the [contributing guidelines](https://github.com/Juanpe/SkeletonView/blob/main/CONTRIBUTING.md).
 
 
 ## 📢 Mentions

README_es.md

@@ -27,6 +27,7 @@ Hoy en día, La mayoría de las apps tiene procesos asíncronos, como peticiones
 Enjoy it! 🙂
 
 ## 
+- [](#)
 - [🌟 Destacado](#-destacado)
 - [🎬 Videotutoriales](#-videotutoriales)
 - [📲 Instalación](#-instalación)
@@ -476,7 +477,7 @@ Esto es un proyecto open source, siéntete libre de contribuir. ¿Cómo?
 
 Échale un vistazo a [los que ya han contribuído](https://github.com/Juanpe/SkeletonView/graphs/contributors)
 
-Para más información, por favor, lee la [guía de contribución](https://github.com/Juanpe/SkeletonView/blob/develop/CONTRIBUTING.md).
+Para más información, por favor, lee la [guía de contribución](https://github.com/Juanpe/SkeletonView/blob/main/CONTRIBUTING.md).
 
 
 ## 📢 Menciones

SkeletonView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SkeletonView"
-  s.version      = "1.11.0"
+  s.version      = "1.12.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/Collections/CollectionSkeletonProtocol.swift

@@ -29,6 +29,14 @@ extension CollectionSkeleton where Self: UIScrollView {
     var estimatedNumberOfRows: Int { return 0 }
     func addDummyDataSource() {}
     func removeDummyDataSource(reloadAfter: Bool) {}
-    func disableUserInteraction() { isUserInteractionEnabled = false; isScrollEnabled = false }
-    func enableUserInteraction() { isUserInteractionEnabled = true; isScrollEnabled = true }
+
+    func disableUserInteraction() {
+        isUserInteractionEnabled = false
+        isScrollEnabled = false
+    }
+    
+    func enableUserInteraction() {
+        isUserInteractionEnabled = true
+        isScrollEnabled = true
+    }
 }

Sources/Extensions/CALayer+Extensions.swift

@@ -152,7 +152,8 @@ public extension CALayer {
     var pulse: CAAnimation {
         let pulseAnimation = CABasicAnimation(keyPath: #keyPath(CALayer.backgroundColor))
         pulseAnimation.fromValue = backgroundColor
-        //swiftlint:disable:next force_unwrapping
+        
+        // swiftlint:disable:next force_unwrapping
         pulseAnimation.toValue = UIColor(cgColor: backgroundColor!).complementaryColor.cgColor
         pulseAnimation.duration = 1
         pulseAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)

Sources/Helpers/AssociationPolicy.swift

@@ -2,7 +2,7 @@
 
 import Foundation
 
-//Partially copy/pasted from https://github.com/jameslintaylor/AssociatedObjects/blob/master/AssociatedObjects/AssociatedObjects.swift
+// Partially copy/pasted from https://github.com/jameslintaylor/AssociatedObjects/blob/master/AssociatedObjects/AssociatedObjects.swift
 enum AssociationPolicy: UInt {
     // raw values map to objc_AssociationPolicy's raw values
     case assign = 0

Sources/Helpers/PrepareForSkeletonProtocol.swift

@@ -10,9 +10,9 @@ import UIKit
 
 extension UIView {
     @objc func prepareViewForSkeleton() {
+        isUserInteractionEnabled = false
         startTransition { [weak self] in
             self?.backgroundColor = .clear
-            self?.isUserInteractionEnabled = false
         }
     }
 }
@@ -39,14 +39,17 @@ extension UILabel {
     }
     
     func restoreBackupHeightConstraints() {
+        heightConstraints.forEach {
+            removeConstraint($0)
+        }
         guard !backupHeightConstraints.isEmpty else { return }
-        NSLayoutConstraint.deactivate(heightConstraints)
         NSLayoutConstraint.activate(backupHeightConstraints)
         backupHeightConstraints.removeAll()
     }
     
     override func prepareViewForSkeleton() {
         backgroundColor = .clear
+        isUserInteractionEnabled = false
         resignFirstResponder()
         startTransition { [weak self] in
             self?.updateHeightConstraintsIfNeeded()
@@ -58,6 +61,7 @@ extension UILabel {
 extension UITextView {
     override func prepareViewForSkeleton() {
         backgroundColor = .clear
+        isUserInteractionEnabled = false
         resignFirstResponder()
         startTransition { [weak self] in
             self?.textColor = .clear
@@ -65,9 +69,22 @@ extension UITextView {
     }
 }
 
+extension UITextField {
+    override func prepareViewForSkeleton() {
+        backgroundColor = .clear
+        resignFirstResponder()
+
+        startTransition { [weak self] in
+            self?.textColor = .clear
+            self?.placeholder = nil
+        }
+    }
+}
+
 extension UIImageView {
     override func prepareViewForSkeleton() {
         backgroundColor = .clear
+        isUserInteractionEnabled = false
         startTransition { [weak self] in
             self?.image = nil
         }
@@ -77,6 +94,7 @@ extension UIImageView {
 extension UIButton {
     override func prepareViewForSkeleton() {
         backgroundColor = .clear
+        isUserInteractionEnabled = false
         startTransition { [weak self] in
             self?.setTitle(nil, for: .normal)
         }

Sources/Recoverable/Recoverable.swift

@@ -86,6 +86,33 @@ extension UITextView {
     }
 }
 
+extension UITextField {
+    var textState: RecoverableTextFieldState? {
+        get { return ao_get(pkey: &ViewAssociatedKeys.labelViewState) as? RecoverableTextFieldState }
+        set { ao_setOptional(newValue, pkey: &ViewAssociatedKeys.labelViewState) }
+    }
+
+    override func saveViewState() {
+        super.saveViewState()
+        textState = RecoverableTextFieldState(view: self)
+    }
+
+    override func recoverViewState(forced: Bool) {
+        super.recoverViewState(forced: forced)
+        startTransition { [weak self] in
+            guard let storedLabelState = self?.textState else { return }
+
+            if self?.textColor == .clear || forced {
+                self?.textColor = storedLabelState.textColor
+            }
+
+            if self?.placeholder == nil || forced {
+                self?.placeholder = storedLabelState.placeholder
+            }
+        }
+    }
+}
+
 extension UIImageView {
     var imageState: RecoverableImageViewState? {
         get { return ao_get(pkey: &ViewAssociatedKeys.imageViewState) as? RecoverableImageViewState }

Sources/Recoverable/RecoverableViewState.swift

@@ -34,6 +34,16 @@ struct RecoverableTextViewState {
     }
 }
 
+struct RecoverableTextFieldState {
+    var textColor: UIColor?
+    var placeholder: String?
+
+    init(view: UITextField) {
+        self.textColor = view.textColor
+        self.placeholder = view.placeholder
+    }
+}
+
 struct RecoverableImageViewState {
     var image: UIImage?
     

Sources/SkeletonAnimationBuilder.swift

@@ -63,7 +63,7 @@ public class SkeletonAnimationBuilder {
     public init() { }
     
     public func makeSlidingAnimation(withDirection direction: GradientDirection, duration: CFTimeInterval = 1.5, autoreverses: Bool = false) -> SkeletonLayerAnimation {
-        return { layer in
+        return { _ in
             let startPointAnim = CABasicAnimation(keyPath: #keyPath(CAGradientLayer.startPoint))
             startPointAnim.fromValue = direction.startPoint.from
             startPointAnim.toValue = direction.startPoint.to

Sources/SkeletonView.swift

@@ -136,7 +136,7 @@ extension UIView {
     private func showSkeletonIfNotActive(skeletonConfig config: SkeletonConfig) {
         guard !isSkeletonActive else { return }
         saveViewState()
-        isUserInteractionEnabled = false
+
         prepareViewForSkeleton()
         addSkeletonLayer(skeletonConfig: config)
     }
@@ -190,7 +190,6 @@ extension UIView {
             isHidden = false
         }
         currentSkeletonConfig?.transition = transition
-        isUserInteractionEnabled = true
         removeDummyDataSourceIfNeeded(reloadAfter: reload)
         subviewsSkeletonables.recursiveSearch(leafBlock: {
             recoverViewState(forced: false)

scripts/update_pod_version.sh

@@ -1,13 +0,0 @@
-if [[ ! $1 =~ (0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))? ]]; then
-    echo "No valid version supplied"
-    exit 1
-fi
-
-VERSION_NUMBER=$1
-echo "Updating podspec version number to $VERSION_NUMBER"
-
-
-cd SkeletonView &>/dev/null
-cd .. &>/dev/null
-
-sed -i '' -E "s/(s.version[[:space:]]+=[[:space:]]+').*(')/\1$VERSION_NUMBER\2/" SkeletonView.podspec