From 7ef5d82b1760ffeab8cb9176603c45a0daf94fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E7=BF=B0?= Date: Thu, 9 Apr 2020 18:45:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=E9=A1=B5=E6=97=B6=E7=A6=81=E6=AD=A2ScrollView=E6=BB=91?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EmptyPage.podspec | 2 +- Example/EmptyPage.xcodeproj/project.pbxproj | 2 + Example/EmptyPage/AppDelegate.swift | 2 +- .../DZIndexViewController.swift | 21 -- .../Demos/DemoCollectionViewController.swift | 96 ++++----- Example/EmptyPage/EmptyStore.swift | 40 +++- Example/Podfile | 1 + Example/Podfile.lock | 8 +- Example/Pods/Manifest.lock | 8 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 204 ++++++++++-------- ...mptyPage_Example-acknowledgements.markdown | 23 ++ ...s-EmptyPage_Example-acknowledgements.plist | 29 +++ .../Pods-EmptyPage_Example-frameworks.sh | 2 + .../Pods-EmptyPage_Example.debug.xcconfig | 6 +- .../Pods-EmptyPage_Example.release.xcconfig | 6 +- Sources/Core/Empty+UIScrollView.swift | 13 +- 16 files changed, 281 insertions(+), 182 deletions(-) diff --git a/EmptyPage.podspec b/EmptyPage.podspec index b13ec26..7a342f7 100644 --- a/EmptyPage.podspec +++ b/EmptyPage.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'EmptyPage' -s.version = '3.3.0' +s.version = '3.3.1' s.summary = 'iOS - 轻量级空白页占位图框架...' s.homepage = 'https://github.com/linhay/EmptyPage' diff --git a/Example/EmptyPage.xcodeproj/project.pbxproj b/Example/EmptyPage.xcodeproj/project.pbxproj index 73b0802..39ebcbe 100644 --- a/Example/EmptyPage.xcodeproj/project.pbxproj +++ b/Example/EmptyPage.xcodeproj/project.pbxproj @@ -372,6 +372,7 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/EmptyPage/EmptyPage.framework", + "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework", "${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework", "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework", "${BUILT_PRODUCTS_DIR}/Stem/Stem.framework", @@ -380,6 +381,7 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EmptyPage.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Stem.framework", diff --git a/Example/EmptyPage/AppDelegate.swift b/Example/EmptyPage/AppDelegate.swift index 234780f..c9420b6 100644 --- a/Example/EmptyPage/AppDelegate.swift +++ b/Example/EmptyPage/AppDelegate.swift @@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { window = UIWindow(frame: UIScreen.main.bounds) - window?.rootViewController = UINavigationController(rootViewController: MainViewController()) + window?.rootViewController = UINavigationController(rootViewController: DemoCollectionViewController()) window?.makeKeyAndVisible() return true } diff --git a/Example/EmptyPage/DZNEmptyDataSet/DZIndexViewController.swift b/Example/EmptyPage/DZNEmptyDataSet/DZIndexViewController.swift index 4e81f99..cddae94 100644 --- a/Example/EmptyPage/DZNEmptyDataSet/DZIndexViewController.swift +++ b/Example/EmptyPage/DZNEmptyDataSet/DZIndexViewController.swift @@ -11,27 +11,6 @@ import EmptyPage import SnapKit import Stem -// MARK: - 初始化 -extension UIImage{ - /// 获取指定颜色的图片 - /// - /// - Parameters: - /// - color: UIColor - /// - size: 图片大小 - convenience init?(color: UIColor, size: CGSize = CGSize(width: 1, height: 1)) { - if size.width <= 0 || size.height <= 0 { return nil } - let rect = CGRect(x: 0, y: 0, width: size.width, height: size.height) - UIGraphicsBeginImageContextWithOptions(rect.size, false, 0) - guard let context = UIGraphicsGetCurrentContext() else { return nil } - context.setFillColor(color.cgColor) - context.fill(rect) - let image = UIGraphicsGetImageFromCurrentImageContext() - UIGraphicsEndImageContext() - guard let cgImg = image?.cgImage else { return nil } - self.init(cgImage: cgImg) - } -} - /// from: https://github.com/dzenbot/DZNEmptyDataSet class DZIndexViewController: UITableViewController { diff --git a/Example/EmptyPage/Demos/DemoCollectionViewController.swift b/Example/EmptyPage/Demos/DemoCollectionViewController.swift index 4a94296..b3ca961 100644 --- a/Example/EmptyPage/Demos/DemoCollectionViewController.swift +++ b/Example/EmptyPage/Demos/DemoCollectionViewController.swift @@ -9,74 +9,70 @@ import UIKit import EmptyPage import SVProgressHUD +import MJRefresh +import Stem +import Stuart -private let reuseIdentifier = "Cell" +class DemoCollectionItemCell: SectionItemCell,STViewProtocol { -class DemoCollectionViewController: UIViewController,UICollectionViewDelegate,UICollectionViewDataSource { + override class func preferredSize(collectionView: UICollectionView, model: Void? = nil) -> CGSize { + return CGSize(width: collectionView.bounds.width, height: 44) + } - let collectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout()) +} - var rows = 0 +class DemoCollectionSection: SectionProtocol { + var index: Int = 0 + unowned var collectionView: UICollectionView - override func viewDidLoad() { - super.viewDidLoad() - view.backgroundColor = .white - view.addSubview(collectionView) - let layout = UICollectionViewFlowLayout() - layout.itemSize = CGSize(width: 100, height: 100) - layout.scrollDirection = .vertical - collectionView.backgroundColor = UIColor.gray - collectionView.frame = view.bounds - collectionView.delegate = self - collectionView.dataSource = self - collectionView.collectionViewLayout = layout - collectionView.ep.setFirstLoading(UIView()) - collectionView.ep.setEmpty(EmptyStore.custom(block1: event1(), block2: event2())) - self.collectionView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: reuseIdentifier) - getData() - } + var itemCount: Int = 3 - func event1() -> (() -> ()) { - return { self.getData() } + init(collectionView: UICollectionView) { + self.collectionView = collectionView + collectionView.st.register(DemoCollectionItemCell.self) } - func event2() -> (() -> ()) { - return { - self.rows = 2 - self.collectionView.insertItems(at: [IndexPath(row: 0, section: 0),IndexPath(row: 1, section: 0)]) - } + func itemSize(at index: Int) -> CGSize { + DemoCollectionItemCell.preferredSize(collectionView: collectionView) } - func getData() { - SVProgressHUD.show() - rows = 0 - sleep(3) {[weak self] in - guard let base = self else { return } - SVProgressHUD.dismiss() - base.collectionView.reloadData() - } + func itemCell(at indexPath: IndexPath) -> UICollectionViewCell { + let cell = collectionView.st.dequeueCell(indexPath) as DemoCollectionItemCell + cell.backgroundColor = UIColor.st.random + return cell } - func numberOfSections(in collectionView: UICollectionView) -> Int { - return 1 - } - +} - func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { - return rows - } +class DemoCollectionViewController: SectionController { - func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { - let cell = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath) - cell.backgroundColor = .blue - return cell + override func viewDidLoad() { + super.viewDidLoad() + sectionView.mj_header = MJRefreshNormalHeader(refreshingTarget: self, refreshingAction: #selector(refresh)) + sectionView.ep.setEmpty(EmptyStore.demo.standard(tapEvent: { [weak self] _ in + guard let self = self else { + return + } + self.refresh() + })) + refresh() } - func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { - rows -= 1 - collectionView.deleteItems(at: [indexPath]) + @objc + func refresh() { + if sectionView.mj_header?.isRefreshing == false { + sectionView.mj_header?.beginRefreshing() + return + } + Gcd.delay(2) { [weak self] in + guard let self = self else { + return + } + self.manager.update(sections: self.manager.sections.isEmpty ? [DemoCollectionSection(collectionView: self.sectionView)] : []) + self.sectionView.mj_header?.endRefreshing() + } } } diff --git a/Example/EmptyPage/EmptyStore.swift b/Example/EmptyPage/EmptyStore.swift index faaec99..7200452 100644 --- a/Example/EmptyPage/EmptyStore.swift +++ b/Example/EmptyPage/EmptyStore.swift @@ -8,8 +8,46 @@ import UIKit import EmptyPage + +struct DZNEmptyDataSet { + +} + +struct DemoSet { + + func standard(tapEvent: ((EmptyPageForStandard) -> Void)?) -> EmptyPageView { + return EmptyPageView.Template.standard + .change(hspace: .button, value: 30) + .change(vspace: .textWithButton, value: 10) + .change(vspace: .titleWithText, value: 10) + .config(button: { (item) in + item.layer.borderColor = UIColor("#2ca3fa").cgColor + item.layer.borderWidth = 1 + item.layer.cornerRadius = 5 + item.titleLabel?.font = UIFont.systemFont(ofSize: 14) + item.backgroundColor = .white + item.setTitleColor(UIColor("#2ca3fa"), for: .normal) + item.contentEdgeInsets = UIEdgeInsets(top: 8, left: 20, bottom: 8, right: 20) + }) + .set(image: UIImage(named: "empty-1001")!) + .set(title: "Nobody is following", + color: UIColor("#536571"), + font: UIFont.boldSystemFont(ofSize: 18)) + .set(text: "Following people helps you keep what they're saying and recommending.", + color: UIColor("#c3ccd1")) + .set(buttonTitle: "Find interesting people to follow >>") + .set(tap: tapEvent) + .mix() + .set(backgroundColor: UIColor.white) + } + +} + class EmptyStore { - + + static let dzn = DZNEmptyDataSet() + static let demo = DemoSet() + class var loading: EmptyPageView{ return EmptyPageView.Template.image .set(image: UIImage(named: "load-0")) diff --git a/Example/Podfile b/Example/Podfile index 8118840..4b69240 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -10,5 +10,6 @@ target 'EmptyPage_Example' do pod 'Stuart', :git => 'git@github.com:linhay/Stuart.git', :branch => 'master' pod 'Stem', :git => 'git@github.com:linhay/Stem.git', :branch => 'develop' pod 'SVProgressHUD' + pod 'MJRefresh' pod 'SwiftLint' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index b16ef08..d097025 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -5,6 +5,7 @@ PODS: - EmptyPage/Core (3.3.0) - EmptyPage/Standard (3.3.0): - EmptyPage/Core + - MJRefresh (3.3.1) - SnapKit (5.0.0) - Stem (0.0.31): - Stem/AVKit (= 0.0.31) @@ -174,6 +175,7 @@ PODS: DEPENDENCIES: - EmptyPage (from `../EmptyPage.podspec`) + - MJRefresh - SnapKit (= 5.0.0) - "Stem (from `git@github.com:linhay/Stem.git`, branch `develop`)" - "Stuart (from `git@github.com:linhay/Stuart.git`, branch `master`)" @@ -182,6 +184,7 @@ DEPENDENCIES: SPEC REPOS: trunk: + - MJRefresh - SnapKit - SVProgressHUD - SwiftLint @@ -201,17 +204,18 @@ CHECKOUT OPTIONS: :commit: c7fa7ed8607342a7e6d91760e03ab29880552b30 :git: "git@github.com:linhay/Stem.git" Stuart: - :commit: 4fe44369e7d99d644ad2eb04711c75ae8026028e + :commit: e43b576351fcd78423887448208d278342746ca1 :git: "git@github.com:linhay/Stuart.git" SPEC CHECKSUMS: EmptyPage: b85eb9d70cda567e418becd1677a41865904595b + MJRefresh: eeda70fbf0ad277f3178cef1cd0c3532591d6237 SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf Stem: ea4aa174339e851a15619fd7d370cc3570667f6c Stuart: b5fccbcb300fd684f248d371c7b36be7494a88b3 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SwiftLint: 5553187048b900c91aa03552807681bb6b027846 -PODFILE CHECKSUM: 002741590eaee6030d7a9e6ee37c8ae6caa87b12 +PODFILE CHECKSUM: b80657be41226e1ebd399ce57699ca21ef6fed65 COCOAPODS: 1.9.0 diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index b16ef08..d097025 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -5,6 +5,7 @@ PODS: - EmptyPage/Core (3.3.0) - EmptyPage/Standard (3.3.0): - EmptyPage/Core + - MJRefresh (3.3.1) - SnapKit (5.0.0) - Stem (0.0.31): - Stem/AVKit (= 0.0.31) @@ -174,6 +175,7 @@ PODS: DEPENDENCIES: - EmptyPage (from `../EmptyPage.podspec`) + - MJRefresh - SnapKit (= 5.0.0) - "Stem (from `git@github.com:linhay/Stem.git`, branch `develop`)" - "Stuart (from `git@github.com:linhay/Stuart.git`, branch `master`)" @@ -182,6 +184,7 @@ DEPENDENCIES: SPEC REPOS: trunk: + - MJRefresh - SnapKit - SVProgressHUD - SwiftLint @@ -201,17 +204,18 @@ CHECKOUT OPTIONS: :commit: c7fa7ed8607342a7e6d91760e03ab29880552b30 :git: "git@github.com:linhay/Stem.git" Stuart: - :commit: 4fe44369e7d99d644ad2eb04711c75ae8026028e + :commit: e43b576351fcd78423887448208d278342746ca1 :git: "git@github.com:linhay/Stuart.git" SPEC CHECKSUMS: EmptyPage: b85eb9d70cda567e418becd1677a41865904595b + MJRefresh: eeda70fbf0ad277f3178cef1cd0c3532591d6237 SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf Stem: ea4aa174339e851a15619fd7d370cc3570667f6c Stuart: b5fccbcb300fd684f248d371c7b36be7494a88b3 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SwiftLint: 5553187048b900c91aa03552807681bb6b027846 -PODFILE CHECKSUM: 002741590eaee6030d7a9e6ee37c8ae6caa87b12 +PODFILE CHECKSUM: b80657be41226e1ebd399ce57699ca21ef6fed65 COCOAPODS: 1.9.0 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 6a02f15..1eb9090 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,83 +7,91 @@ objects = { /* Begin PBXBuildFile section */ - 1CDC766DB39309E883DDB87DB18C32C4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3212113385A8FBBDB272BD23C409FF61 /* Foundation.framework */; }; - 33A01248E012087311D1F0D8A3F10AB1 /* Pods-EmptyPage_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6F90B50EB0C238BE24A3AD8C23BD9 /* Pods-EmptyPage_Example-dummy.m */; }; - 673CABEFAC89012E196DBE1642359915 /* Pods-EmptyPage_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F433B4B90C62B99668FAFFFB53B40C6 /* Pods-EmptyPage_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 01819A061CB6CBF3D9FCE79BEA90E1B3 /* Pods-EmptyPage_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6F90B50EB0C238BE24A3AD8C23BD9 /* Pods-EmptyPage_Example-dummy.m */; }; + 1038FBBC90CA949FD518012220CC9CE6 /* Pods-EmptyPage_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F433B4B90C62B99668FAFFFB53B40C6 /* Pods-EmptyPage_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + DBE4ED59D677AEE6BBE98BAE13F0E119 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3212113385A8FBBDB272BD23C409FF61 /* Foundation.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 57F7F5C11E0F72C3FECB4E40B1386EAF /* PBXContainerItemProxy */ = { + 02C528076BA6F3A1CB33FF8D4D9996A3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 859B26FEB7D77A57F54DD9666CE49CBD /* EmptyPage.xcodeproj */; + containerPortal = 62217D87BC11C57B38D6C6C78C479EBC /* Stem.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 54AA05B856D4484D51CE8AA0C829C97C; - remoteInfo = EmptyPage; + remoteGlobalIDString = B16A23BAAA892A38CAEC57C934EB4E7C; + remoteInfo = Stem; }; - 691777772AA816377DF35BC3102BA468 /* PBXContainerItemProxy */ = { + 35C149B0BD1D7EB5FF9FA49A4F5D8E4D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 324177A8B1E179000426D113349230FA /* SVProgressHUD.xcodeproj */; + containerPortal = 427CFC6272AC1F77CA10B174E9E13FCA /* SwiftLint.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 8A902363E0683102423DADEA0C0D4541; - remoteInfo = SVProgressHUD; + remoteGlobalIDString = DF739ADE66FA54F9BBFF97A8CB609E34; + remoteInfo = SwiftLint; }; - 84DD0D9B5E4CCABA42FBDEB2F2721C7F /* PBXContainerItemProxy */ = { + 69DEF8EF966E28C78A7379BB97E87DDE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 49D5F20417C95AFA95BDF43A635917F3 /* Stem.xcodeproj */; + containerPortal = A9958395331A92FDA9ABD198E581274B /* MJRefresh.xcodeproj */; proxyType = 1; - remoteGlobalIDString = B16A23BAAA892A38CAEC57C934EB4E7C; - remoteInfo = Stem; + remoteGlobalIDString = E94AEF767442EDAAAAB2129CDFA2C2ED; + remoteInfo = MJRefresh; }; - ACD9FB2C455EAB0DD0B48F85E27FC3EA /* PBXContainerItemProxy */ = { + 87BB11C0BA30D3B48B0CA7F2E197EC18 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 845D28A47D3CF6DB776ED44F21799CAE /* Stuart.xcodeproj */; + containerPortal = 20473B84D6532569E08DC37DCC1D1E47 /* Stuart.xcodeproj */; proxyType = 1; remoteGlobalIDString = 1CC0EFE9112958F2154D85A353093896; remoteInfo = Stuart; }; - E521B0CC2EA367C00167DDB7D1DC9E1C /* PBXContainerItemProxy */ = { + 8E42E607F67483B868A5A7C6ABB5D717 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 2A09D96DE1AA834BA5FE20D85C7259E8 /* SwiftLint.xcodeproj */; + containerPortal = FC24BE07121BBF05BAA7429E9EC5C744 /* SnapKit.xcodeproj */; proxyType = 1; - remoteGlobalIDString = DF739ADE66FA54F9BBFF97A8CB609E34; - remoteInfo = SwiftLint; + remoteGlobalIDString = 6913FCF4B90C224E55FE5C821AFB90D2; + remoteInfo = SnapKit; }; - FF0596A0848312DD63F50D88E951B581 /* PBXContainerItemProxy */ = { + 951691F36E1DDF930EB9C2553F7D107E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = A45D28C9D82CAFE2FB34E41D98370435 /* SnapKit.xcodeproj */; + containerPortal = 859B26FEB7D77A57F54DD9666CE49CBD /* EmptyPage.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 6913FCF4B90C224E55FE5C821AFB90D2; - remoteInfo = SnapKit; + remoteGlobalIDString = 54AA05B856D4484D51CE8AA0C829C97C; + remoteInfo = EmptyPage; + }; + D325CCFFF13793312E7E830C0924DC1A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 344C9C33D6897D0872E1FEC226E29E14 /* SVProgressHUD.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8A902363E0683102423DADEA0C0D4541; + remoteInfo = SVProgressHUD; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 18B44A982F5FFF2B2D1CBC88C68A107C /* Pods-EmptyPage_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-EmptyPage_Example.debug.xcconfig"; sourceTree = ""; }; - 2A09D96DE1AA834BA5FE20D85C7259E8 /* SwiftLint */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftLint; path = SwiftLint.xcodeproj; sourceTree = ""; }; + 20473B84D6532569E08DC37DCC1D1E47 /* Stuart */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Stuart; path = Stuart.xcodeproj; sourceTree = ""; }; 2F433B4B90C62B99668FAFFFB53B40C6 /* Pods-EmptyPage_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-EmptyPage_Example-umbrella.h"; sourceTree = ""; }; 3212113385A8FBBDB272BD23C409FF61 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 324177A8B1E179000426D113349230FA /* SVProgressHUD */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SVProgressHUD; path = SVProgressHUD.xcodeproj; sourceTree = ""; }; - 49D5F20417C95AFA95BDF43A635917F3 /* Stem */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Stem; path = Stem.xcodeproj; sourceTree = ""; }; + 344C9C33D6897D0872E1FEC226E29E14 /* SVProgressHUD */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SVProgressHUD; path = SVProgressHUD.xcodeproj; sourceTree = ""; }; + 427CFC6272AC1F77CA10B174E9E13FCA /* SwiftLint */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftLint; path = SwiftLint.xcodeproj; sourceTree = ""; }; 4FC8BC88557F05395267E78EEC6191AA /* Pods_EmptyPage_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_EmptyPage_Example.framework; path = "Pods-EmptyPage_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; 50896B91D69399FB01969153EAE113AF /* Pods-EmptyPage_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-EmptyPage_Example-acknowledgements.markdown"; sourceTree = ""; }; 59E6F90B50EB0C238BE24A3AD8C23BD9 /* Pods-EmptyPage_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-EmptyPage_Example-dummy.m"; sourceTree = ""; }; + 62217D87BC11C57B38D6C6C78C479EBC /* Stem */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Stem; path = Stem.xcodeproj; sourceTree = ""; }; 6763DCC91CF80AE1025B3E66A88423B4 /* Pods-EmptyPage_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-EmptyPage_Example.modulemap"; sourceTree = ""; }; - 845D28A47D3CF6DB776ED44F21799CAE /* Stuart */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Stuart; path = Stuart.xcodeproj; sourceTree = ""; }; 859B26FEB7D77A57F54DD9666CE49CBD /* EmptyPage */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = EmptyPage; path = EmptyPage.xcodeproj; sourceTree = ""; }; 8AB7F9CDCA50047147BFB8682DA6CAB4 /* Pods-EmptyPage_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-EmptyPage_Example.release.xcconfig"; sourceTree = ""; }; 8CF0FCB9142A2C89738FAB223D194AED /* Pods-EmptyPage_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-EmptyPage_Example-acknowledgements.plist"; sourceTree = ""; }; 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - A45D28C9D82CAFE2FB34E41D98370435 /* SnapKit */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SnapKit; path = SnapKit.xcodeproj; sourceTree = ""; }; + A9958395331A92FDA9ABD198E581274B /* MJRefresh */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MJRefresh; path = MJRefresh.xcodeproj; sourceTree = ""; }; BF367DD12F289ADB01B6513BBB494B86 /* Pods-EmptyPage_Example-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-EmptyPage_Example-Info.plist"; sourceTree = ""; }; C9470FF59B1F5406E9E2E2F11AD69259 /* Pods-EmptyPage_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-EmptyPage_Example-frameworks.sh"; sourceTree = ""; }; + FC24BE07121BBF05BAA7429E9EC5C744 /* SnapKit */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SnapKit; path = SnapKit.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 5B30C47FC6217BF9CCB7CB4EAF171B69 /* Frameworks */ = { + A50EA1A1868170904E6276F35DA28891 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1CDC766DB39309E883DDB87DB18C32C4 /* Foundation.framework in Frameworks */, + DBE4ED59D677AEE6BBE98BAE13F0E119 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -98,6 +106,19 @@ name = "Development Pods"; sourceTree = ""; }; + 2A9516112D402590C61E9A2E2E1D43F0 /* Pods */ = { + isa = PBXGroup; + children = ( + A9958395331A92FDA9ABD198E581274B /* MJRefresh */, + FC24BE07121BBF05BAA7429E9EC5C744 /* SnapKit */, + 62217D87BC11C57B38D6C6C78C479EBC /* Stem */, + 20473B84D6532569E08DC37DCC1D1E47 /* Stuart */, + 344C9C33D6897D0872E1FEC226E29E14 /* SVProgressHUD */, + 427CFC6272AC1F77CA10B174E9E13FCA /* SwiftLint */, + ); + name = Pods; + sourceTree = ""; + }; 7DE777EC02DD5B266B38A80843D81F68 /* Targets Support Files */ = { isa = PBXGroup; children = ( @@ -139,25 +160,13 @@ name = iOS; sourceTree = ""; }; - C253FBE210FD00B56F659243E2EE5CB4 /* Pods */ = { - isa = PBXGroup; - children = ( - A45D28C9D82CAFE2FB34E41D98370435 /* SnapKit */, - 49D5F20417C95AFA95BDF43A635917F3 /* Stem */, - 845D28A47D3CF6DB776ED44F21799CAE /* Stuart */, - 324177A8B1E179000426D113349230FA /* SVProgressHUD */, - 2A09D96DE1AA834BA5FE20D85C7259E8 /* SwiftLint */, - ); - name = Pods; - sourceTree = ""; - }; CF1408CF629C7361332E53B88F7BD30C = { isa = PBXGroup; children = ( 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */, 12E33BC306EACAE1D2FFA8D457B072F1 /* Development Pods */, D210D550F4EA176C3123ED886F8F87F5 /* Frameworks */, - C253FBE210FD00B56F659243E2EE5CB4 /* Pods */, + 2A9516112D402590C61E9A2E2E1D43F0 /* Pods */, BDFA7A4BD570FAD5A60FA9665441EE31 /* Products */, 7DE777EC02DD5B266B38A80843D81F68 /* Targets Support Files */, ); @@ -174,11 +183,11 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - E975793D8352915C4E9577364AA414D7 /* Headers */ = { + 18B721F6BF22A839D6804F92B4E5937D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 673CABEFAC89012E196DBE1642359915 /* Pods-EmptyPage_Example-umbrella.h in Headers */, + 1038FBBC90CA949FD518012220CC9CE6 /* Pods-EmptyPage_Example-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -187,22 +196,23 @@ /* Begin PBXNativeTarget section */ 0ADD6FE390D7B68C9F61EC50D7175D4E /* Pods-EmptyPage_Example */ = { isa = PBXNativeTarget; - buildConfigurationList = AEECECB37F35AD3114CE673A06AD9121 /* Build configuration list for PBXNativeTarget "Pods-EmptyPage_Example" */; + buildConfigurationList = D48A7077338359B7E4CD8F476B6AF424 /* Build configuration list for PBXNativeTarget "Pods-EmptyPage_Example" */; buildPhases = ( - E975793D8352915C4E9577364AA414D7 /* Headers */, - 686BE66C7C8DC71064D5E966CCCF8275 /* Sources */, - 5B30C47FC6217BF9CCB7CB4EAF171B69 /* Frameworks */, - 5273FCE84764EA587864FD44D0A273BF /* Resources */, + 18B721F6BF22A839D6804F92B4E5937D /* Headers */, + 4FEAC64CA5BEF78AF6B7F88CDE5095A4 /* Sources */, + A50EA1A1868170904E6276F35DA28891 /* Frameworks */, + 58F2FB23F7F2C39C53641ADAB649B514 /* Resources */, ); buildRules = ( ); dependencies = ( - 9448B685918A8BD4B8FAD6AFDFAE79C6 /* PBXTargetDependency */, - 57B3E40A2E591027D84D64E8F827B269 /* PBXTargetDependency */, - C24E9A6F14F49081DC28B9626EABE0D8 /* PBXTargetDependency */, - 04406198182166B4AE4110F06C4089BE /* PBXTargetDependency */, - FE7B7943E9E74A3BC6FBBB0432508F07 /* PBXTargetDependency */, - 45C323EF539F96BFB72A3BEEAF091B7C /* PBXTargetDependency */, + F4A4222AF8AE125C98F7AC74C241A5AB /* PBXTargetDependency */, + 3B719FD9102B9C69EF68B5FA27648864 /* PBXTargetDependency */, + 71D1889B436ED9877EE8F2017952A77C /* PBXTargetDependency */, + F9DD8EBC18EAB4FF3E053C9AA8949875 /* PBXTargetDependency */, + 67DD4BC4BE7C2C4FE8202212510193E8 /* PBXTargetDependency */, + 264916E6278154D5AE360A9C337CD44A /* PBXTargetDependency */, + CFBC53C4D37DAE6AE3DC2AF9BFDF367A /* PBXTargetDependency */, ); name = "Pods-EmptyPage_Example"; productName = "Pods-EmptyPage_Example"; @@ -234,19 +244,22 @@ ProjectRef = 859B26FEB7D77A57F54DD9666CE49CBD /* EmptyPage */; }, { - ProjectRef = 324177A8B1E179000426D113349230FA /* SVProgressHUD */; + ProjectRef = A9958395331A92FDA9ABD198E581274B /* MJRefresh */; + }, + { + ProjectRef = 344C9C33D6897D0872E1FEC226E29E14 /* SVProgressHUD */; }, { - ProjectRef = A45D28C9D82CAFE2FB34E41D98370435 /* SnapKit */; + ProjectRef = FC24BE07121BBF05BAA7429E9EC5C744 /* SnapKit */; }, { - ProjectRef = 49D5F20417C95AFA95BDF43A635917F3 /* Stem */; + ProjectRef = 62217D87BC11C57B38D6C6C78C479EBC /* Stem */; }, { - ProjectRef = 845D28A47D3CF6DB776ED44F21799CAE /* Stuart */; + ProjectRef = 20473B84D6532569E08DC37DCC1D1E47 /* Stuart */; }, { - ProjectRef = 2A09D96DE1AA834BA5FE20D85C7259E8 /* SwiftLint */; + ProjectRef = 427CFC6272AC1F77CA10B174E9E13FCA /* SwiftLint */; }, ); projectRoot = ""; @@ -257,7 +270,7 @@ /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 5273FCE84764EA587864FD44D0A273BF /* Resources */ = { + 58F2FB23F7F2C39C53641ADAB649B514 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -267,46 +280,51 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 686BE66C7C8DC71064D5E966CCCF8275 /* Sources */ = { + 4FEAC64CA5BEF78AF6B7F88CDE5095A4 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 33A01248E012087311D1F0D8A3F10AB1 /* Pods-EmptyPage_Example-dummy.m in Sources */, + 01819A061CB6CBF3D9FCE79BEA90E1B3 /* Pods-EmptyPage_Example-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 04406198182166B4AE4110F06C4089BE /* PBXTargetDependency */ = { + 264916E6278154D5AE360A9C337CD44A /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = Stem; - targetProxy = 84DD0D9B5E4CCABA42FBDEB2F2721C7F /* PBXContainerItemProxy */; + name = Stuart; + targetProxy = 87BB11C0BA30D3B48B0CA7F2E197EC18 /* PBXContainerItemProxy */; }; - 45C323EF539F96BFB72A3BEEAF091B7C /* PBXTargetDependency */ = { + 3B719FD9102B9C69EF68B5FA27648864 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = SwiftLint; - targetProxy = E521B0CC2EA367C00167DDB7D1DC9E1C /* PBXContainerItemProxy */; + name = MJRefresh; + targetProxy = 69DEF8EF966E28C78A7379BB97E87DDE /* PBXContainerItemProxy */; }; - 57B3E40A2E591027D84D64E8F827B269 /* PBXTargetDependency */ = { + 67DD4BC4BE7C2C4FE8202212510193E8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Stem; + targetProxy = 02C528076BA6F3A1CB33FF8D4D9996A3 /* PBXContainerItemProxy */; + }; + 71D1889B436ED9877EE8F2017952A77C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = SVProgressHUD; - targetProxy = 691777772AA816377DF35BC3102BA468 /* PBXContainerItemProxy */; + targetProxy = D325CCFFF13793312E7E830C0924DC1A /* PBXContainerItemProxy */; }; - 9448B685918A8BD4B8FAD6AFDFAE79C6 /* PBXTargetDependency */ = { + CFBC53C4D37DAE6AE3DC2AF9BFDF367A /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = EmptyPage; - targetProxy = 57F7F5C11E0F72C3FECB4E40B1386EAF /* PBXContainerItemProxy */; + name = SwiftLint; + targetProxy = 35C149B0BD1D7EB5FF9FA49A4F5D8E4D /* PBXContainerItemProxy */; }; - C24E9A6F14F49081DC28B9626EABE0D8 /* PBXTargetDependency */ = { + F4A4222AF8AE125C98F7AC74C241A5AB /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = SnapKit; - targetProxy = FF0596A0848312DD63F50D88E951B581 /* PBXContainerItemProxy */; + name = EmptyPage; + targetProxy = 951691F36E1DDF930EB9C2553F7D107E /* PBXContainerItemProxy */; }; - FE7B7943E9E74A3BC6FBBB0432508F07 /* PBXTargetDependency */ = { + F9DD8EBC18EAB4FF3E053C9AA8949875 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = Stuart; - targetProxy = ACD9FB2C455EAB0DD0B48F85E27FC3EA /* PBXContainerItemProxy */; + name = SnapKit; + targetProxy = 8E42E607F67483B868A5A7C6ABB5D717 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -375,9 +393,9 @@ }; name = Debug; }; - 97B6B5983D741B3CCD78F67B6C69B55B /* Debug */ = { + 38E06B482E8BDAD612BB35D6D3B435C5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 18B44A982F5FFF2B2D1CBC88C68A107C /* Pods-EmptyPage_Example.debug.xcconfig */; + baseConfigurationReference = 8AB7F9CDCA50047147BFB8682DA6CAB4 /* Pods-EmptyPage_Example.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_OBJC_WEAK = NO; @@ -404,10 +422,11 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; B01D14FDC83DCF9D4BE53066BEA96D05 /* Release */ = { isa = XCBuildConfiguration; @@ -469,9 +488,9 @@ }; name = Release; }; - B98AE5A64B3CC7E434BD0DA6F3FF53BC /* Release */ = { + EE764F18A40552F6391562C9467FD184 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8AB7F9CDCA50047147BFB8682DA6CAB4 /* Pods-EmptyPage_Example.release.xcconfig */; + baseConfigurationReference = 18B44A982F5FFF2B2D1CBC88C68A107C /* Pods-EmptyPage_Example.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_OBJC_WEAK = NO; @@ -498,11 +517,10 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; /* End XCBuildConfiguration section */ @@ -516,11 +534,11 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - AEECECB37F35AD3114CE673A06AD9121 /* Build configuration list for PBXNativeTarget "Pods-EmptyPage_Example" */ = { + D48A7077338359B7E4CD8F476B6AF424 /* Build configuration list for PBXNativeTarget "Pods-EmptyPage_Example" */ = { isa = XCConfigurationList; buildConfigurations = ( - 97B6B5983D741B3CCD78F67B6C69B55B /* Debug */, - B98AE5A64B3CC7E434BD0DA6F3FF53BC /* Release */, + EE764F18A40552F6391562C9467FD184 /* Debug */, + 38E06B482E8BDAD612BB35D6D3B435C5 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-acknowledgements.markdown b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-acknowledgements.markdown index 9b5de2b..7688094 100644 --- a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-acknowledgements.markdown +++ b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-acknowledgements.markdown @@ -206,6 +206,29 @@ This application makes use of the following third party libraries: limitations under the License. +## MJRefresh + +Copyright (c) 2013-2015 MJRefresh (https://github.com/CoderMJLee/MJRefresh) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + ## SVProgressHUD MIT License diff --git a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-acknowledgements.plist b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-acknowledgements.plist index a4f97b3..a321e95 100644 --- a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-acknowledgements.plist +++ b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-acknowledgements.plist @@ -223,6 +223,35 @@ Type PSGroupSpecifier + + FooterText + Copyright (c) 2013-2015 MJRefresh (https://github.com/CoderMJLee/MJRefresh) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + License + MIT + Title + MJRefresh + Type + PSGroupSpecifier + FooterText MIT License diff --git a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-frameworks.sh b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-frameworks.sh index 7a8aff9..0da1e71 100755 --- a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-frameworks.sh +++ b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-frameworks.sh @@ -198,6 +198,7 @@ fi if [[ "$CONFIGURATION" == "Debug" ]]; then install_framework "${BUILT_PRODUCTS_DIR}/EmptyPage/EmptyPage.framework" + install_framework "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework" install_framework "${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework" install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework" install_framework "${BUILT_PRODUCTS_DIR}/Stem/Stem.framework" @@ -205,6 +206,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then fi if [[ "$CONFIGURATION" == "Release" ]]; then install_framework "${BUILT_PRODUCTS_DIR}/EmptyPage/EmptyPage.framework" + install_framework "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework" install_framework "${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework" install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework" install_framework "${BUILT_PRODUCTS_DIR}/Stem/Stem.framework" diff --git a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.debug.xcconfig b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.debug.xcconfig index 091454f..65b0101 100644 --- a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.debug.xcconfig @@ -1,9 +1,9 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/Stem" "${PODS_CONFIGURATION_BUILD_DIR}/Stuart" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/Stem" "${PODS_CONFIGURATION_BUILD_DIR}/Stuart" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage/EmptyPage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stem/Stem.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stuart/Stuart.framework/Headers" +HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage/EmptyPage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stem/Stem.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stuart/Stuart.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "EmptyPage" -framework "Foundation" -framework "QuartzCore" -framework "SVProgressHUD" -framework "SnapKit" -framework "Stem" -framework "Stuart" -framework "UIKit" -framework "WebKit" +OTHER_LDFLAGS = $(inherited) -framework "EmptyPage" -framework "Foundation" -framework "MJRefresh" -framework "QuartzCore" -framework "SVProgressHUD" -framework "SnapKit" -framework "Stem" -framework "Stuart" -framework "UIKit" -framework "WebKit" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.release.xcconfig b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.release.xcconfig index 091454f..65b0101 100644 --- a/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.release.xcconfig @@ -1,9 +1,9 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/Stem" "${PODS_CONFIGURATION_BUILD_DIR}/Stuart" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/Stem" "${PODS_CONFIGURATION_BUILD_DIR}/Stuart" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage/EmptyPage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stem/Stem.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stuart/Stuart.framework/Headers" +HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage/EmptyPage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh/MJRefresh.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD/SVProgressHUD.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stem/Stem.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Stuart/Stuart.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "EmptyPage" -framework "Foundation" -framework "QuartzCore" -framework "SVProgressHUD" -framework "SnapKit" -framework "Stem" -framework "Stuart" -framework "UIKit" -framework "WebKit" +OTHER_LDFLAGS = $(inherited) -framework "EmptyPage" -framework "Foundation" -framework "MJRefresh" -framework "QuartzCore" -framework "SVProgressHUD" -framework "SnapKit" -framework "Stem" -framework "Stuart" -framework "UIKit" -framework "WebKit" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/Sources/Core/Empty+UIScrollView.swift b/Sources/Core/Empty+UIScrollView.swift index a2caa7a..54735f6 100644 --- a/Sources/Core/Empty+UIScrollView.swift +++ b/Sources/Core/Empty+UIScrollView.swift @@ -131,17 +131,20 @@ extension UIScrollView { } func setEmptyView(_ isEmpty: Bool) { - self.oldEmptyView?.removeFromSuperview() - guard isEmpty else { isScrollEnabled = oldIsScrollEnabled firstLoadingView?.removeFromSuperview() emptyView?.removeFromSuperview() + oldEmptyView?.removeFromSuperview() return } - - oldIsScrollEnabled = isScrollEnabled - isScrollEnabled = isEmpty + + if oldEmptyView?.superview !== self { + oldIsScrollEnabled = isScrollEnabled + isScrollEnabled = isEmpty == false + } + + oldEmptyView?.removeFromSuperview() var emptyView: UIView?