Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reorganize collections folder #440

Merged
merged 2 commits into from
Aug 19, 2021
Merged

Reorganize collections folder #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40dee07
reorganize collections folder
Juanpe Aug 19, 2021
0d95327
update podspec
Juanpe Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SkeletonView.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SkeletonView"
s.version = "1.22.0"
s.version = "1.23.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.
Expand Down
76 changes: 38 additions & 38 deletions SkeletonView.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
F556F56626CD1F3900A80B83 /* SkeletonAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* SkeletonAppearance.swift */; };
F556F56726CD1F3900A80B83 /* SkeletonLayerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* SkeletonLayerBuilder.swift */; };
F556F56826CD1F3900A80B83 /* SkeletonMultilineLayerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* SkeletonMultilineLayerBuilder.swift */; };
F556F56926CD1F3900A80B83 /* CollectionSkeletonProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* CollectionSkeletonProtocol.swift */; };
F556F56926CD1F3900A80B83 /* CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* CollectionSkeleton.swift */; };
F556F56A26CD1F3900A80B83 /* SkeletonCollectionViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_16 /* SkeletonCollectionViewProtocols.swift */; };
F556F56B26CD1F3900A80B83 /* UICollectionView+CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_17 /* UICollectionView+CollectionSkeleton.swift */; };
F556F56C26CD1F3900A80B83 /* GenericCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_19 /* GenericCollectionView.swift */; };
F556F56D26CD1F3900A80B83 /* SkeletonReusableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_20 /* SkeletonReusableCell.swift */; };
F556F56E26CD1F3900A80B83 /* SkeletonCollectionDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_21 /* SkeletonCollectionDataSource.swift */; };
F556F56F26CD1F3900A80B83 /* SkeletonCollectionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_22 /* SkeletonCollectionDelegate.swift */; };
Expand Down Expand Up @@ -87,6 +86,8 @@
F556F6CD26CE2A7400A80B83 /* UITextView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F556F6CB26CE2A7400A80B83 /* UITextView+Extensions.swift */; };
F556F6CF26CE2AB800A80B83 /* SkeletonTextNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = F556F6CE26CE2AB800A80B83 /* SkeletonTextNode.swift */; };
F556F6D026CE2AB800A80B83 /* SkeletonTextNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = F556F6CE26CE2AB800A80B83 /* SkeletonTextNode.swift */; };
F556F6D926CE315A00A80B83 /* UICollectionView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F556F6D826CE315A00A80B83 /* UICollectionView+Extensions.swift */; };
F556F6DA26CE315A00A80B83 /* UICollectionView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F556F6D826CE315A00A80B83 /* UICollectionView+Extensions.swift */; };
OBJ_101 /* Int+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_31 /* Int+Extensions.swift */; };
OBJ_103 /* UIColor+Skeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_33 /* UIColor+Skeleton.swift */; };
OBJ_104 /* UITableView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_34 /* UITableView+Extensions.swift */; };
Expand All @@ -109,10 +110,9 @@
OBJ_86 /* SkeletonAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* SkeletonAppearance.swift */; };
OBJ_87 /* SkeletonLayerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* SkeletonLayerBuilder.swift */; };
OBJ_88 /* SkeletonMultilineLayerBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* SkeletonMultilineLayerBuilder.swift */; };
OBJ_89 /* CollectionSkeletonProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* CollectionSkeletonProtocol.swift */; };
OBJ_89 /* CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* CollectionSkeleton.swift */; };
OBJ_90 /* SkeletonCollectionViewProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_16 /* SkeletonCollectionViewProtocols.swift */; };
OBJ_91 /* UICollectionView+CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_17 /* UICollectionView+CollectionSkeleton.swift */; };
OBJ_92 /* GenericCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_19 /* GenericCollectionView.swift */; };
OBJ_93 /* SkeletonReusableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_20 /* SkeletonReusableCell.swift */; };
OBJ_94 /* SkeletonCollectionDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_21 /* SkeletonCollectionDataSource.swift */; };
OBJ_95 /* SkeletonCollectionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_22 /* SkeletonCollectionDelegate.swift */; };
Expand Down Expand Up @@ -191,12 +191,12 @@
F556F6C826CE2A4A00A80B83 /* UITextView+IBInspectable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextView+IBInspectable.swift"; sourceTree = "<group>"; };
F556F6CB26CE2A7400A80B83 /* UITextView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextView+Extensions.swift"; sourceTree = "<group>"; };
F556F6CE26CE2AB800A80B83 /* SkeletonTextNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonTextNode.swift; sourceTree = "<group>"; };
F556F6D826CE315A00A80B83 /* UICollectionView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Extensions.swift"; sourceTree = "<group>"; };
OBJ_11 /* SkeletonLayerBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonLayerBuilder.swift; sourceTree = "<group>"; };
OBJ_12 /* SkeletonMultilineLayerBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonMultilineLayerBuilder.swift; sourceTree = "<group>"; };
OBJ_14 /* CollectionSkeletonProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionSkeletonProtocol.swift; sourceTree = "<group>"; };
OBJ_14 /* CollectionSkeleton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionSkeleton.swift; sourceTree = "<group>"; };
OBJ_16 /* SkeletonCollectionViewProtocols.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonCollectionViewProtocols.swift; sourceTree = "<group>"; };
OBJ_17 /* UICollectionView+CollectionSkeleton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionView+CollectionSkeleton.swift"; sourceTree = "<group>"; };
OBJ_19 /* GenericCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericCollectionView.swift; sourceTree = "<group>"; };
OBJ_20 /* SkeletonReusableCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonReusableCell.swift; sourceTree = "<group>"; };
OBJ_21 /* SkeletonCollectionDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonCollectionDataSource.swift; sourceTree = "<group>"; };
OBJ_22 /* SkeletonCollectionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonCollectionDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -343,6 +343,7 @@
F556F64A26CD2CD100A80B83 /* API */ = {
isa = PBXGroup;
children = (
F556F6D726CE30EE00A80B83 /* Collections */,
F556F6B726CE25B100A80B83 /* Models */,
F556F6B226CE24DA00A80B83 /* AnimationBuilder */,
OBJ_8 /* Appearance */,
Expand All @@ -357,15 +358,16 @@
F556F64B26CD2CD600A80B83 /* Internal */ = {
isa = PBXGroup;
children = (
OBJ_54 /* SkeletonFlowHandler.swift */,
F556F6D326CE2F3700A80B83 /* Collections */,
F556F65226CD2E0A00A80B83 /* Debug */,
F556F67E26CD476300A80B83 /* FoundationExtensions */,
F556F6AD26CE241D00A80B83 /* Helpers */,
F556F6C426CE284300A80B83 /* Models */,
F556F6A926CD5C3E00A80B83 /* SkeletonConfigs */,
F556F6B326CE256D00A80B83 /* SkeletonExtensions */,
OBJ_54 /* SkeletonFlowHandler.swift */,
F556F6B126CE246E00A80B83 /* SkeletonLayerBuilders */,
F556F6AD26CE241D00A80B83 /* Helpers */,
F556F6A926CD5C3E00A80B83 /* SkeletonConfigs */,
F556F67E26CD476300A80B83 /* FoundationExtensions */,
F556F67D26CD475800A80B83 /* UIKitExtensions */,
F556F65226CD2E0A00A80B83 /* Debug */,
);
path = Internal;
sourceTree = "<group>";
Expand All @@ -389,15 +391,18 @@
F556F67D26CD475800A80B83 /* UIKitExtensions */ = {
isa = PBXGroup;
children = (
OBJ_61 /* UIView+Transitions.swift */,
OBJ_39 /* UIView+AppLifecycleNotifications.swift */,
OBJ_34 /* UITableView+Extensions.swift */,
F556F68226CD48F700A80B83 /* UIView+AssociatedObjects.swift */,
F556F69D26CD553B00A80B83 /* UIView+Extensions.swift */,
F556F6A626CD5B0400A80B83 /* CALayer+Extensions.swift */,
OBJ_17 /* UICollectionView+CollectionSkeleton.swift */,
OBJ_33 /* UIColor+Skeleton.swift */,
F556F6BB26CE272600A80B83 /* UILabel+Extensions.swift */,
OBJ_25 /* UITableView+CollectionSkeleton.swift */,
OBJ_34 /* UITableView+Extensions.swift */,
F556F6CB26CE2A7400A80B83 /* UITextView+Extensions.swift */,
OBJ_39 /* UIView+AppLifecycleNotifications.swift */,
F556F68226CD48F700A80B83 /* UIView+AssociatedObjects.swift */,
OBJ_26 /* UIView+CollectionSkeleton.swift */,
F556F69D26CD553B00A80B83 /* UIView+Extensions.swift */,
OBJ_61 /* UIView+Transitions.swift */,
);
path = UIKitExtensions;
sourceTree = "<group>";
Expand All @@ -421,6 +426,7 @@
F556F6A026CD566C00A80B83 /* UIView+Debug.swift */,
F556F6C526CE2A2100A80B83 /* UILabel+IBInspectable.swift */,
F556F6C826CE2A4A00A80B83 /* UITextView+IBInspectable.swift */,
F556F6D826CE315A00A80B83 /* UICollectionView+Extensions.swift */,
);
path = UIKitExtensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -481,10 +487,10 @@
isa = PBXGroup;
children = (
OBJ_58 /* SubviewsSkeletonables.swift */,
F556F6B426CE258300A80B83 /* GradientDirection+Animations.swift */,
F556F6BE26CE277F00A80B83 /* PrepareViewForSkeleton.swift */,
OBJ_50 /* Recoverable.swift */,
F556F6CE26CE2AB800A80B83 /* SkeletonTextNode.swift */,
OBJ_50 /* Recoverable.swift */,
F556F6B426CE258300A80B83 /* GradientDirection+Animations.swift */,
);
path = SkeletonExtensions;
sourceTree = "<group>";
Expand All @@ -509,43 +515,38 @@
path = Models;
sourceTree = "<group>";
};
OBJ_13 /* Collections */ = {
F556F6D326CE2F3700A80B83 /* Collections */ = {
isa = PBXGroup;
children = (
OBJ_14 /* CollectionSkeletonProtocol.swift */,
OBJ_15 /* CollectionViews */,
OBJ_18 /* Generics */,
OBJ_21 /* SkeletonCollectionDataSource.swift */,
OBJ_22 /* SkeletonCollectionDelegate.swift */,
OBJ_23 /* TableViews */,
OBJ_26 /* UIView+CollectionSkeleton.swift */,
OBJ_20 /* SkeletonReusableCell.swift */,
OBJ_14 /* CollectionSkeleton.swift */,
);
path = Collections;
sourceTree = "<group>";
};
OBJ_15 /* CollectionViews */ = {
F556F6D726CE30EE00A80B83 /* Collections */ = {
isa = PBXGroup;
children = (
OBJ_16 /* SkeletonCollectionViewProtocols.swift */,
OBJ_17 /* UICollectionView+CollectionSkeleton.swift */,
OBJ_23 /* TableViews */,
OBJ_15 /* CollectionViews */,
);
path = CollectionViews;
path = Collections;
sourceTree = "<group>";
};
OBJ_18 /* Generics */ = {
OBJ_15 /* CollectionViews */ = {
isa = PBXGroup;
children = (
OBJ_19 /* GenericCollectionView.swift */,
OBJ_20 /* SkeletonReusableCell.swift */,
OBJ_16 /* SkeletonCollectionViewProtocols.swift */,
);
path = Generics;
path = CollectionViews;
sourceTree = "<group>";
};
OBJ_23 /* TableViews */ = {
isa = PBXGroup;
children = (
OBJ_24 /* SkeletonTableViewProtocols.swift */,
OBJ_25 /* UITableView+CollectionSkeleton.swift */,
);
path = TableViews;
sourceTree = "<group>";
Expand Down Expand Up @@ -588,7 +589,6 @@
F556F64B26CD2CD600A80B83 /* Internal */,
F556F64A26CD2CD100A80B83 /* API */,
F556F55F26CD1D4400A80B83 /* Supporting Files */,
OBJ_13 /* Collections */,
OBJ_57 /* SkeletonView.swift */,
);
name = Sources;
Expand Down Expand Up @@ -770,12 +770,11 @@
F556F6D026CE2AB800A80B83 /* SkeletonTextNode.swift in Sources */,
F556F65126CD2DFD00A80B83 /* PublicSkeletonView.swift in Sources */,
F556F56826CD1F3900A80B83 /* SkeletonMultilineLayerBuilder.swift in Sources */,
F556F56926CD1F3900A80B83 /* CollectionSkeletonProtocol.swift in Sources */,
F556F56926CD1F3900A80B83 /* CollectionSkeleton.swift in Sources */,
F556F56A26CD1F3900A80B83 /* SkeletonCollectionViewProtocols.swift in Sources */,
F556F6C026CE277F00A80B83 /* PrepareViewForSkeleton.swift in Sources */,
F556F6A826CD5B0400A80B83 /* CALayer+Extensions.swift in Sources */,
F556F56B26CD1F3900A80B83 /* UICollectionView+CollectionSkeleton.swift in Sources */,
F556F56C26CD1F3900A80B83 /* GenericCollectionView.swift in Sources */,
F556F56D26CD1F3900A80B83 /* SkeletonReusableCell.swift in Sources */,
F556F56E26CD1F3900A80B83 /* SkeletonCollectionDataSource.swift in Sources */,
F556F56F26CD1F3900A80B83 /* SkeletonCollectionDelegate.swift in Sources */,
Expand Down Expand Up @@ -815,6 +814,7 @@
F556F68126CD47CF00A80B83 /* ProcessInfo+Extensions.swift in Sources */,
F556F68826CD49F900A80B83 /* UIView+IBInspectable.swift in Sources */,
F556F6C726CE2A2100A80B83 /* UILabel+IBInspectable.swift in Sources */,
F556F6DA26CE315A00A80B83 /* UICollectionView+Extensions.swift in Sources */,
F556F64E26CD2D3D00A80B83 /* SkeletonDebug.swift in Sources */,
F556F6A526CD5A9000A80B83 /* CALayer+Animations.swift in Sources */,
F556F58F26CD1F3900A80B83 /* UIView+Transitions.swift in Sources */,
Expand Down Expand Up @@ -847,12 +847,11 @@
F556F6CF26CE2AB800A80B83 /* SkeletonTextNode.swift in Sources */,
F556F65026CD2DFD00A80B83 /* PublicSkeletonView.swift in Sources */,
OBJ_88 /* SkeletonMultilineLayerBuilder.swift in Sources */,
OBJ_89 /* CollectionSkeletonProtocol.swift in Sources */,
OBJ_89 /* CollectionSkeleton.swift in Sources */,
OBJ_90 /* SkeletonCollectionViewProtocols.swift in Sources */,
F556F6BF26CE277F00A80B83 /* PrepareViewForSkeleton.swift in Sources */,
F556F6A726CD5B0400A80B83 /* CALayer+Extensions.swift in Sources */,
OBJ_91 /* UICollectionView+CollectionSkeleton.swift in Sources */,
OBJ_92 /* GenericCollectionView.swift in Sources */,
OBJ_93 /* SkeletonReusableCell.swift in Sources */,
OBJ_94 /* SkeletonCollectionDataSource.swift in Sources */,
OBJ_95 /* SkeletonCollectionDelegate.swift in Sources */,
Expand Down Expand Up @@ -892,6 +891,7 @@
F556F68026CD47CF00A80B83 /* ProcessInfo+Extensions.swift in Sources */,
F556F68726CD49F900A80B83 /* UIView+IBInspectable.swift in Sources */,
F556F6C626CE2A2100A80B83 /* UILabel+IBInspectable.swift in Sources */,
F556F6D926CE315A00A80B83 /* UICollectionView+Extensions.swift in Sources */,
F556F64D26CD2CF800A80B83 /* SkeletonDebug.swift in Sources */,
F556F6A426CD5A9000A80B83 /* CALayer+Animations.swift in Sources */,
OBJ_127 /* UIView+Transitions.swift in Sources */,
Expand Down
0 ...ews/SkeletonCollectionViewProtocols.swift → ...ews/SkeletonCollectionViewProtocols.swift
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions ...bleViews/SkeletonTableViewProtocols.swift → ...bleViews/SkeletonTableViewProtocols.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@

import UIKit

extension UITableView {
public static let automaticNumberOfSkeletonRows = -1
}

public typealias ReusableHeaderFooterIdentifier = String

public protocol SkeletonTableViewDataSource: UITableViewDataSource {
func numSections(in collectionSkeletonView: UITableView) -> Int
func collectionSkeletonView(_ skeletonView: UITableView, numberOfRowsInSection section: Int) -> Int
Expand Down
34 changes: 34 additions & 0 deletions SkeletonViewCore/Sources/API/UIKitExtensions/UICollectionView+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//
// Copyright SkeletonView. All Rights Reserved.
//
// Licensed under the MIT License (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://opensource.org/licenses/MIT
//
// UICollectionView+Extensions.swift
//
// Created by Juanpe Catalán on 19/8/21.

import UIKit

public extension UICollectionView {

static let automaticNumberOfSkeletonItems = -1

func prepareSkeleton(completion: @escaping (Bool) -> Void) {
guard let originalDataSource = self.dataSource as? SkeletonCollectionViewDataSource,
!(originalDataSource is SkeletonCollectionDataSource)
else { return }

let dataSource = SkeletonCollectionDataSource(collectionViewDataSource: originalDataSource, rowHeight: 0.0)
self.skeletonDataSource = dataSource
performBatchUpdates({
self.reloadData()
}) { done in
completion(done)

}
}
}
13 changes: 0 additions & 13 deletions SkeletonViewCore/Sources/Collections/Generics/GenericCollectionView.swift
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ...lections/CollectionSkeletonProtocol.swift → ...rnal/Collections/CollectionSkeleton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ enum CollectionAssociatedKeys {
}

protocol CollectionSkeleton {

var skeletonDataSource: SkeletonCollectionDataSource? { get set }
var skeletonDelegate: SkeletonCollectionDelegate? { get set }
var estimatedNumberOfRows: Int { get }
Expand All @@ -23,9 +24,11 @@ protocol CollectionSkeleton {
func removeDummyDataSource(reloadAfter: Bool)
func disableUserInteraction()
func enableUserInteraction()

}

extension CollectionSkeleton where Self: UIScrollView {

var estimatedNumberOfRows: Int { return 0 }
func addDummyDataSource() {}
func removeDummyDataSource(reloadAfter: Bool) {}
Expand All @@ -43,4 +46,5 @@ extension CollectionSkeleton where Self: UIScrollView {
isScrollEnabled = true
}
}

}
0 ...ctions/SkeletonCollectionDataSource.swift → ...ctions/SkeletonCollectionDataSource.swift
View file
Open in desktop
File renamed without changes.
0 ...lections/SkeletonCollectionDelegate.swift → ...lections/SkeletonCollectionDelegate.swift
View file
Open in desktop
File renamed without changes.
0 ...tions/Generics/SkeletonReusableCell.swift → ...al/Collections/SkeletonReusableCell.swift
View file
Open in desktop
File renamed without changes.
23 changes: 1 addition & 22 deletions ...UICollectionView+CollectionSkeleton.swift → ...UICollectionView+CollectionSkeleton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import UIKit

extension UICollectionView: CollectionSkeleton {
public static let automaticNumberOfSkeletonItems = -1

var estimatedNumberOfRows: Int {
guard let flowlayout = collectionViewLayout as? UICollectionViewFlowLayout else { return 0 }
Expand Down Expand Up @@ -63,25 +62,5 @@ extension UICollectionView: CollectionSkeleton {
self.dataSource = dataSource.originalCollectionViewDataSource
if reloadAfter { self.reloadData() }
}
}

extension UICollectionView: GenericCollectionView {
var scrollView: UIScrollView { return self }
}

public extension UICollectionView {
func prepareSkeleton(completion: @escaping (Bool) -> Void) {
guard let originalDataSource = self.dataSource as? SkeletonCollectionViewDataSource,
!(originalDataSource is SkeletonCollectionDataSource)
else { return }

let dataSource = SkeletonCollectionDataSource(collectionViewDataSource: originalDataSource, rowHeight: 0.0)
self.skeletonDataSource = dataSource
performBatchUpdates({
self.reloadData()
}) { done in
completion(done)

}
}

}
12 changes: 7 additions & 5 deletions ...iews/UITableView+CollectionSkeleton.swift → ...ions/UITableView+CollectionSkeleton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@

import UIKit

public typealias ReusableHeaderFooterIdentifier = String

extension UITableView: CollectionSkeleton {
public static let automaticNumberOfSkeletonRows = -1

var estimatedNumberOfRows: Int {
return Int(ceil(frame.height / rowHeight))
Expand Down Expand Up @@ -74,14 +71,19 @@ extension UITableView: CollectionSkeleton {

if reloadAfter { self.reloadData() }
}

}

private func restoreRowHeight() {
private extension UITableView {

func restoreRowHeight() {
guard let dataSource = self.dataSource as? SkeletonCollectionDataSource else { return }
rowHeight = dataSource.originalRowHeight
}

private func calculateRowHeight() -> CGFloat {
func calculateRowHeight() -> CGFloat {
guard rowHeight == UITableView.automaticDimension else { return rowHeight }
return estimatedRowHeight
}

}
Loading