From 9f5fc4e5c6425645a4bb2c53e71ab593cfc7ce9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E7=BF=B0?= Date: Thu, 9 Apr 2020 15:14:46 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20demo=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Example/EmptyPage.xcodeproj/project.pbxproj | 18 +- .../DZIndexViewController.swift | 87 +++--- Example/EmptyPage/EmptyViewStore.swift | 86 +++--- Example/EmptyPage/HomeViewController.swift | 17 +- .../Main/views/ActionView/ActionSection.swift | 1 - .../EmptyPage/Main/views/MainHeaderView.swift | 8 +- Example/Podfile | 5 +- Example/Podfile.lock | 260 ++++++++++++----- Example/Pods/Hue/LICENSE.md | 22 -- Example/Pods/Hue/README.md | 153 ---------- .../Hue/Source/iOS+tvOS/UIColor+Hue.swift | 247 ---------------- .../Hue/Source/iOS+tvOS/UIImage+Hue.swift | 176 ----------- Example/Pods/Manifest.lock | 260 ++++++++++++----- Example/Pods/Pods.xcodeproj/project.pbxproj | 273 ++++++++---------- .../Target Support Files/Hue/Hue-Info.plist | 26 -- .../Pods/Target Support Files/Hue/Hue-dummy.m | 5 - .../Target Support Files/Hue/Hue-prefix.pch | 12 - .../Target Support Files/Hue/Hue-umbrella.h | 16 - .../Target Support Files/Hue/Hue.modulemap | 6 - .../Target Support Files/Hue/Hue.xcconfig | 12 - ...mptyPage_Example-acknowledgements.markdown | 52 +--- ...s-EmptyPage_Example-acknowledgements.plist | 58 +--- .../Pods-EmptyPage_Example-frameworks.sh | 62 +++- .../Pods-EmptyPage_Example.debug.xcconfig | 6 +- .../Pods-EmptyPage_Example.release.xcconfig | 6 +- Gemfile | 2 +- Gemfile.lock | 37 ++- 27 files changed, 712 insertions(+), 1201 deletions(-) delete mode 100644 Example/Pods/Hue/LICENSE.md delete mode 100644 Example/Pods/Hue/README.md delete mode 100644 Example/Pods/Hue/Source/iOS+tvOS/UIColor+Hue.swift delete mode 100644 Example/Pods/Hue/Source/iOS+tvOS/UIImage+Hue.swift delete mode 100644 Example/Pods/Target Support Files/Hue/Hue-Info.plist delete mode 100644 Example/Pods/Target Support Files/Hue/Hue-dummy.m delete mode 100644 Example/Pods/Target Support Files/Hue/Hue-prefix.pch delete mode 100644 Example/Pods/Target Support Files/Hue/Hue-umbrella.h delete mode 100644 Example/Pods/Target Support Files/Hue/Hue.modulemap delete mode 100644 Example/Pods/Target Support Files/Hue/Hue.xcconfig diff --git a/Example/EmptyPage.xcodeproj/project.pbxproj b/Example/EmptyPage.xcodeproj/project.pbxproj index 1af19f0..73b0802 100644 --- a/Example/EmptyPage.xcodeproj/project.pbxproj +++ b/Example/EmptyPage.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 9D9EB38F2008674E002264E7 /* HomeViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9D9EB38E2008674E002264E7 /* HomeViewController.storyboard */; }; 9D9EB39120088528002264E7 /* EmptyPageForCustom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D9EB39020088528002264E7 /* EmptyPageForCustom.swift */; }; 9D9EB3932008853E002264E7 /* EmptyPageForCustom.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9D9EB3922008853E002264E7 /* EmptyPageForCustom.xib */; }; + AE38F5D96C49EB394DD1D0F4 /* Pods_EmptyPage_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41596BF002FE665F5D287E21 /* Pods_EmptyPage_Example.framework */; }; CD056F2F21D0E78200A7F94A /* AutoLayoutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD056F2E21D0E78200A7F94A /* AutoLayoutViewController.swift */; }; CD056F3121D0E78F00A7F94A /* AutoLayoutViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD056F3021D0E78F00A7F94A /* AutoLayoutViewController.storyboard */; }; CD22C7BF2334BFC3003192F1 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD22C7B82334BFC3003192F1 /* MainViewController.swift */; }; @@ -42,13 +43,12 @@ CDCA14462338D7FD00D1425E /* ActionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA14442338D7FD00D1425E /* ActionCell.swift */; }; CDCA14472338D7FD00D1425E /* ActionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = CDCA14452338D7FD00D1425E /* ActionCell.xib */; }; CDCA14492338D8A600D1425E /* ActionSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA14482338D8A600D1425E /* ActionSection.swift */; }; - D1322284C3AF07E5E228A989 /* Pods_EmptyPage_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A65B0197A95543AF5D0756E /* Pods_EmptyPage_Example.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 279651C94AB31F26C93245C4 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; - 2A65B0197A95543AF5D0756E /* Pods_EmptyPage_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EmptyPage_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 2A92FDD691F47CFF2DA54F12 /* Pods-EmptyPage_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EmptyPage_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.release.xcconfig"; sourceTree = ""; }; + 41596BF002FE665F5D287E21 /* Pods_EmptyPage_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_EmptyPage_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACD01AFB9204008FA782 /* EmptyPage_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EmptyPage_Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 607FACD51AFB9204008FA782 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -98,7 +98,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D1322284C3AF07E5E228A989 /* Pods_EmptyPage_Example.framework in Frameworks */, + AE38F5D96C49EB394DD1D0F4 /* Pods_EmptyPage_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -179,9 +179,9 @@ CC162247290B497944FA1627 /* Frameworks */ = { isa = PBXGroup; children = ( - 2A65B0197A95543AF5D0756E /* Pods_EmptyPage_Example.framework */, 7A0D4B6758498EB40AB7A721 /* Pods_EmptyPage_Tests.framework */, A530BC265F9B925295F14521 /* Pods_EmptyPage_Objective_C.framework */, + 41596BF002FE665F5D287E21 /* Pods_EmptyPage_Example.framework */, ); name = Frameworks; sourceTree = ""; @@ -296,8 +296,8 @@ 607FACCC1AFB9204008FA782 /* Sources */, 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, - 37B7C346C082BFE4312356BF /* [CP] Embed Pods Frameworks */, CD543C68233CCBC200CFE10F /* ShellScript */, + 15F810948AB7A8443DD29DB2 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -364,7 +364,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 37B7C346C082BFE4312356BF /* [CP] Embed Pods Frameworks */ = { + 15F810948AB7A8443DD29DB2 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -372,20 +372,18 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/EmptyPage/EmptyPage.framework", - "${BUILT_PRODUCTS_DIR}/Hue/Hue.framework", "${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework", "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework", "${BUILT_PRODUCTS_DIR}/Stem/Stem.framework", - "${BUILT_PRODUCTS_DIR}/Stone/Stone.framework", + "${BUILT_PRODUCTS_DIR}/Stuart/Stuart.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EmptyPage.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hue.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", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Stone.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Stuart.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/Example/EmptyPage/DZNEmptyDataSet/DZIndexViewController.swift b/Example/EmptyPage/DZNEmptyDataSet/DZIndexViewController.swift index 5dee7e9..4e81f99 100644 --- a/Example/EmptyPage/DZNEmptyDataSet/DZIndexViewController.swift +++ b/Example/EmptyPage/DZNEmptyDataSet/DZIndexViewController.swift @@ -9,6 +9,7 @@ import UIKit import EmptyPage import SnapKit +import Stem // MARK: - 初始化 extension UIImage{ @@ -97,10 +98,10 @@ class DZIndexViewController: UITableViewController { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_500px")) .set(title: "No Photos", - color: UIColor(hex: "#545454"), + color: UIColor("#545454"), font: UIFont.boldSystemFont(ofSize: 17)) .set(text: "Get started by uploading a photo.", - color: UIColor(hex: "545454"), + color: UIColor("#545454"), font: UIFont.boldSystemFont(ofSize: 15)) .change(vspace: .titleWithText, value: 15) .mix({ (item) in @@ -116,14 +117,14 @@ class DZIndexViewController: UITableViewController { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_airbnb")) .set(title: "No Messages", - color: UIColor(hex: "#c9c9c9"), + color: UIColor("#c9c9c9"), font: UIFont(name: "HelveticaNeue-Light", size: 22)!) .set(text: "When you have messages, you’ll see them here.", - color: UIColor(hex: "#cfcfcf"), + color: UIColor("#cfcfcf"), font: UIFont.boldSystemFont(ofSize: 13)) .config(button: { (item) in item.setTitle("Start Browsing", for: .normal) - item.setTitleColor(UIColor(hex: "#6bceff"), for: .normal) + item.setTitleColor(UIColor("#6bceff"), for: .normal) item.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16) item.backgroundColor = UIColor.white }) @@ -137,7 +138,7 @@ class DZIndexViewController: UITableViewController { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_appstore")) .set(text: "There are no results for “wwdc2014”.", - color: UIColor(hex: "#333333"), + color: UIColor("#333333"), font: UIFont.boldSystemFont(ofSize: 14)) .change(vspace: .imageWithTitle, value: 34) .mix() @@ -145,10 +146,10 @@ class DZIndexViewController: UITableViewController { case .camera: return EmptyPageView.Template.standard .set(title: "Please Allow Photo Access", - color: UIColor(hex: "#5f6978"), + color: UIColor("#5f6978"), font: UIFont.boldSystemFont(ofSize: 18)) .set(text: "This allows you to share photos from your library and save photos to your camera roll.", - color: UIColor(hex: "#5f6978"), + color: UIColor("#5f6978"), font: UIFont.systemFont(ofSize: 14)) .set(buttonTitle: "Continue") .set(tap: tapEvent()) @@ -158,43 +159,43 @@ class DZIndexViewController: UITableViewController { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_dropbox")) .set(title: "Star Your Favorite Files", - color: UIColor(hex: "#25282b"), + color: UIColor("#25282b"), font: UIFont.boldSystemFont(ofSize: 17)) .set(text: "Favorites are saved for offline access.", - color: UIColor(hex: "#7b8994"), + color: UIColor("#7b8994"), font: UIFont.systemFont(ofSize: 14.5)) - .set(buttonTitle: "Learn more", color: UIColor(hex: "48a1ea"),for: UIControl.State.normal) + .set(buttonTitle: "Learn more", color: UIColor("#48a1ea"),for: UIControl.State.normal) .set(tap: tapEvent()) .mix() - .set(backgroundColor: UIColor(hex: "#f0f3f5")) + .set(backgroundColor: UIColor("#f0f3f5")) .set(tap: backgroundTapEvent()) case .fackbook: return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_facebook")) .set(title: "No friends to show.", - color: UIColor(hex: "#acafbd"), + color: UIColor("#acafbd"), font: UIFont.boldSystemFont(ofSize: 22)) .change(vspace: .imageWithTitle, value: 30) .mix() - .set(backgroundColor: UIColor(hex: "#eceef7")) + .set(backgroundColor: UIColor("#eceef7")) .set(tap: backgroundTapEvent()) case .fancy: return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_fancy")) .set(title: "No Owns yet", - color: UIColor(hex: "#494c53"), + color: UIColor("#494c53"), font: UIFont.boldSystemFont(ofSize: 14)) .set(text: "Tap Add to List and add things to Owns", - color: UIColor(hex: "#7a7d83"), + color: UIColor("#7a7d83"), font: UIFont.boldSystemFont(ofSize: 13)) .mix() - .set(backgroundColor: UIColor(hex: "#f0f0f0")) + .set(backgroundColor: UIColor("#f0f0f0")) .set(tap: backgroundTapEvent()) case .foursquare: return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_foursquare")) .set(text: "Nobody has liked or commented on your check-ins yet.", - color: UIColor(hex: "#cecbc6"), + color: UIColor("#cecbc6"), font: UIFont.systemFont(ofSize: 14)) .change(height: .button, value: 36) .change(hspace: .text, value : 15) @@ -202,7 +203,7 @@ class DZIndexViewController: UITableViewController { .change(vspace: .imageWithTitle, value: 15) .config(button: { (item) in item.setTitle("Add friends to get started!", for: .normal) - item.setTitleColor(UIColor(hex: "#00aeef"), for: .normal) + item.setTitleColor(UIColor("#00aeef"), for: .normal) item.layer.cornerRadius = 18 item.layer.borderColor = item.titleColor(for: .normal)!.cgColor item.layer.borderWidth = 1 @@ -210,15 +211,15 @@ class DZIndexViewController: UITableViewController { }) .set(tap: tapEvent()) .mix() - .set(backgroundColor: UIColor(hex: "#fcfcfa")) + .set(backgroundColor: UIColor("#fcfcfa")) .set(tap: backgroundTapEvent()) case .icloud: return EmptyPageView.Template.standard .set(title: "iCloud Photo Sharing", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 30)) .set(text: "Share photos and videos with just the people you choose, and let them add photos, videos, and comments.", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 18)) .change(hspace: .button, value: 100) .change(hspace: .text, value: 40) @@ -226,7 +227,7 @@ class DZIndexViewController: UITableViewController { .change(vspace: .textWithButton, value: 20) .config(button: { (item) in item.setTitle("Create New Stream", for: .normal) - item.setTitleColor(UIColor(hex: "#999999"), for: .normal) + item.setTitleColor(UIColor("#999999"), for: .normal) item.titleLabel?.font = UIFont.systemFont(ofSize: 14) item.layer.cornerRadius = 2 item.layer.borderColor = item.titleColor(for: .normal)!.cgColor @@ -240,10 +241,10 @@ class DZIndexViewController: UITableViewController { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_instagram")) .set(title: "Instagram Direct", - color: UIColor(hex: "#444444"), + color: UIColor("#444444"), font: UIFont(name: "HelveticaNeue-Light", size: 26)!) .set(text: "Send photos and videos directly to your friends. Only the people you send to can see these posts.", - color: UIColor(hex: "#444444"), + color: UIColor("#444444"), font: UIFont.systemFont(ofSize: 16)) .change(vspace: .imageWithTitle, value: 24) .change(vspace: .titleWithText, value: 24) @@ -270,10 +271,10 @@ class DZIndexViewController: UITableViewController { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_kickstarter")) .set(title: "Activity empty", - color: UIColor(hex: "#828587"), + color: UIColor("#828587"), font: UIFont.systemFont(ofSize: 16)) .set(text: "When you back a project or follow a friend, their activity will show up here.", - color: UIColor(hex: "#828587"), + color: UIColor("#828587"), font: UIFont.systemFont(ofSize: 14)) .config(button: { (item) in item.setTitle("Discover projects", for: .normal) @@ -291,7 +292,7 @@ class DZIndexViewController: UITableViewController { .change(hspace: .button, value: 40) .change(height: .button, value: 45) .mix() - .set(backgroundColor: UIColor(hex: "#f7fafa")) + .set(backgroundColor: UIColor("#f7fafa")) .set(tap: backgroundTapEvent()) case .path: return EmptyPageView.Template.standard @@ -300,20 +301,20 @@ class DZIndexViewController: UITableViewController { color: UIColor.white, font: UIFont.boldSystemFont(ofSize: 16)) .set(text: "Send a message or create a group.", - color: UIColor(hex: "#a6978d"), + color: UIColor("#a6978d"), font: UIFont.systemFont(ofSize: 14)) .change(vspace: .imageWithTitle, value: 1) .change(vspace: .titleWithText, value: 1) .mix() - .set(backgroundColor: UIColor(hex: "#726d67")) + .set(backgroundColor: UIColor("#726d67")) .set(tap: backgroundTapEvent()) case .photo: return EmptyPageView.Template.standard .set(title: "No Photos or Videos", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 30)) .set(text: "You can sync photos and videos onto your iPhone using iTunes.", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 18)) .change(hspace: .text, value: 40) .change(vspace: .titleWithText, value: 15) @@ -322,10 +323,10 @@ class DZIndexViewController: UITableViewController { case .podcasts: return EmptyPageView.Template.standard .set(title: "No Podcasts", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 30)) .set(text: "You can subscribe to podcasts in Top Charts or Featured.", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 18)) .change(hspace: .text, value: 35) .change(vspace: .titleWithText, value: 35) @@ -335,10 +336,10 @@ class DZIndexViewController: UITableViewController { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_remote")) .set(title: "Cannot Connect to a Local Network", - color: UIColor(hex: "#555555"), + color: UIColor("#555555"), font: UIFont(name: "HelveticaNeue-Medium", size: 18)!) .set(text: "You must connect to a Wi-Fi network to control iTunes or Apple TV", - color: UIColor(hex: "#555555"), + color: UIColor("#555555"), font: UIFont(name: "HelveticaNeue-Medium", size: 11.75)!) .change(hspace: .text, value: 20) .mix() @@ -346,7 +347,7 @@ class DZIndexViewController: UITableViewController { case .safari: return EmptyPageView.Template.text .set(text: "Safari cannot open the page because your iPhone is not connected to the Internet.", - color: UIColor(hex: "#7d7f7f"), + color: UIColor("#7d7f7f"), font: UIFont.systemFont(ofSize: 18)) .change(hspace: .text, value: 20) .mix() @@ -354,10 +355,10 @@ class DZIndexViewController: UITableViewController { case .skype: let attr = NSMutableAttributedString(string: "Keep all your favorite people together", attributes: [.font : UIFont(name: "HelveticaNeue-Light", size: 17.75)!, - .foregroundColor: UIColor(hex: "#a6c3d1")]) + .foregroundColor: UIColor("#a6c3d1")]) let attr2 = NSAttributedString(string: "\nadd favorites", attributes: [.font : UIFont(name: "HelveticaNeue-Light", size: 17.75)!, - .foregroundColor : UIColor(hex: "00adf1")]) + .foregroundColor : UIColor("#00adf1")]) attr.append(attr2) return EmptyPageView.Template.text .set(attributed: attr) @@ -368,7 +369,7 @@ class DZIndexViewController: UITableViewController { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_slack")) .set(title: "You don't have any recent mentions", - color: UIColor(hex: "#d7d7d7"), + color: UIColor("#d7d7d7"), font: UIFont.systemFont(ofSize: 19)) .change(hspace: .text, value: 20) .mix() @@ -377,16 +378,16 @@ class DZIndexViewController: UITableViewController { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_tumblr")) .set(title: "This is your Dashboard.", - color: UIColor(hex: "#aab6c4"), + color: UIColor("#aab6c4"), font: UIFont.systemFont(ofSize: 18)) .set(text: "When you follow some blogs, their latest posts will show up here!", - color: UIColor(hex: "#828e9c"), + color: UIColor("#828e9c"), font: UIFont.systemFont(ofSize: 17)) .change(hspace: .text, value: 20) .change(vspace: .imageWithTitle, value: 10) .change(vspace: .titleWithText, value: 10) .mix() - .set(backgroundColor: UIColor(hex: "#34465c")) + .set(backgroundColor: UIColor("#34465c")) .set(tap: backgroundTapEvent()) } diff --git a/Example/EmptyPage/EmptyViewStore.swift b/Example/EmptyPage/EmptyViewStore.swift index 4d893ad..7bd9a51 100644 --- a/Example/EmptyPage/EmptyViewStore.swift +++ b/Example/EmptyPage/EmptyViewStore.swift @@ -146,10 +146,10 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_500px")) .set(title: "No Photos", - color: UIColor(hex: "#545454"), + color: UIColor("#545454"), font: UIFont.boldSystemFont(ofSize: 17)) .set(text: "Get started by uploading a photo.", - color: UIColor(hex: "545454"), + color: UIColor("#545454"), font: UIFont.boldSystemFont(ofSize: 15)) .change(vspace: .titleWithText, value: 15) .mix({ (item) in @@ -165,14 +165,14 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_airbnb")) .set(title: "No Messages", - color: UIColor(hex: "#c9c9c9"), + color: UIColor("#c9c9c9"), font: UIFont(name: "HelveticaNeue-Light", size: 22)!) .set(text: "When you have messages, you’ll see them here.", - color: UIColor(hex: "#cfcfcf"), + color: UIColor("#cfcfcf"), font: UIFont.boldSystemFont(ofSize: 13)) .config(button: { (item) in item.setTitle("Start Browsing", for: .normal) - item.setTitleColor(UIColor(hex: "#6bceff"), for: .normal) + item.setTitleColor(UIColor("#6bceff"), for: .normal) item.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16) item.backgroundColor = UIColor.white }) @@ -186,7 +186,7 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_appstore")) .set(text: "There are no results for “wwdc2014”.", - color: UIColor(hex: "#333333"), + color: UIColor("#333333"), font: UIFont.boldSystemFont(ofSize: 14)) .change(vspace: .imageWithTitle, value: 34) .mix() @@ -194,10 +194,10 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { case .camera: return EmptyPageView.Template.standard .set(title: "Please Allow Photo Access", - color: UIColor(hex: "#5f6978"), + color: UIColor("#5f6978"), font: UIFont.boldSystemFont(ofSize: 18)) .set(text: "This allows you to share photos from your library and save photos to your camera roll.", - color: UIColor(hex: "#5f6978"), + color: UIColor("#5f6978"), font: UIFont.systemFont(ofSize: 14)) .set(buttonTitle: "Continue") .set(tap: tapEvent()) @@ -207,43 +207,43 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_dropbox")) .set(title: "Star Your Favorite Files", - color: UIColor(hex: "#25282b"), + color: UIColor("#25282b"), font: UIFont.boldSystemFont(ofSize: 17)) .set(text: "Favorites are saved for offline access.", - color: UIColor(hex: "#7b8994"), + color: UIColor("#7b8994"), font: UIFont.systemFont(ofSize: 14.5)) - .set(buttonTitle: "Learn more", color: UIColor(hex: "48a1ea"),for: UIControl.State.normal) + .set(buttonTitle: "Learn more", color: UIColor("#48a1ea"),for: UIControl.State.normal) .set(tap: tapEvent()) .mix() - .set(backgroundColor: UIColor(hex: "#f0f3f5")) + .set(backgroundColor: UIColor("#f0f3f5")) .set(tap: backgroundTapEvent()) case .fackbook: return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_facebook")) .set(title: "No friends to show.", - color: UIColor(hex: "#acafbd"), + color: UIColor("#acafbd"), font: UIFont.boldSystemFont(ofSize: 22)) .change(vspace: .imageWithTitle, value: 30) .mix() - .set(backgroundColor: UIColor(hex: "#eceef7")) + .set(backgroundColor: UIColor("#eceef7")) .set(tap: backgroundTapEvent()) case .fancy: return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_fancy")) .set(title: "No Owns yet", - color: UIColor(hex: "#494c53"), + color: UIColor("#494c53"), font: UIFont.boldSystemFont(ofSize: 14)) .set(text: "Tap Add to List and add things to Owns", - color: UIColor(hex: "#7a7d83"), + color: UIColor("#7a7d83"), font: UIFont.boldSystemFont(ofSize: 13)) .mix() - .set(backgroundColor: UIColor(hex: "#f0f0f0")) + .set(backgroundColor: UIColor("#f0f0f0")) .set(tap: backgroundTapEvent()) case .foursquare: return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_foursquare")) .set(text: "Nobody has liked or commented on your check-ins yet.", - color: UIColor(hex: "#cecbc6"), + color: UIColor("#cecbc6"), font: UIFont.systemFont(ofSize: 14)) .change(height: .button, value: 36) .change(hspace: .text, value : 15) @@ -251,7 +251,7 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { .change(vspace: .imageWithTitle, value: 15) .config(button: { (item) in item.setTitle("Add friends to get started!", for: .normal) - item.setTitleColor(UIColor(hex: "#00aeef"), for: .normal) + item.setTitleColor(UIColor("#00aeef"), for: .normal) item.layer.cornerRadius = 18 item.layer.borderColor = item.titleColor(for: .normal)!.cgColor item.layer.borderWidth = 1 @@ -259,15 +259,15 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { }) .set(tap: tapEvent()) .mix() - .set(backgroundColor: UIColor(hex: "#fcfcfa")) + .set(backgroundColor: UIColor("#fcfcfa")) .set(tap: backgroundTapEvent()) case .icloud: return EmptyPageView.Template.standard .set(title: "iCloud Photo Sharing", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 30)) .set(text: "Share photos and videos with just the people you choose, and let them add photos, videos, and comments.", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 18)) .change(hspace: .button, value: 100) .change(hspace: .text, value: 40) @@ -275,7 +275,7 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { .change(vspace: .textWithButton, value: 20) .config(button: { (item) in item.setTitle("Create New Stream", for: .normal) - item.setTitleColor(UIColor(hex: "#999999"), for: .normal) + item.setTitleColor(UIColor("#999999"), for: .normal) item.titleLabel?.font = UIFont.systemFont(ofSize: 14) item.layer.cornerRadius = 2 item.layer.borderColor = item.titleColor(for: .normal)!.cgColor @@ -289,10 +289,10 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_instagram")) .set(title: "Instagram Direct", - color: UIColor(hex: "#444444"), + color: UIColor("#444444"), font: UIFont(name: "HelveticaNeue-Light", size: 26)!) .set(text: "Send photos and videos directly to your friends. Only the people you send to can see these posts.", - color: UIColor(hex: "#444444"), + color: UIColor("#444444"), font: UIFont.systemFont(ofSize: 16)) .change(vspace: .imageWithTitle, value: 24) .change(vspace: .titleWithText, value: 24) @@ -319,10 +319,10 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_kickstarter")) .set(title: "Activity empty", - color: UIColor(hex: "#828587"), + color: UIColor("#828587"), font: UIFont.systemFont(ofSize: 16)) .set(text: "When you back a project or follow a friend, their activity will show up here.", - color: UIColor(hex: "#828587"), + color: UIColor("#828587"), font: UIFont.systemFont(ofSize: 14)) .config(button: { (item) in item.setTitle("Discover projects", for: .normal) @@ -340,7 +340,7 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { .change(hspace: .button, value: 40) .change(height: .button, value: 45) .mix() - .set(backgroundColor: UIColor(hex: "#f7fafa")) + .set(backgroundColor: UIColor("#f7fafa")) .set(tap: backgroundTapEvent()) case .path: return EmptyPageView.Template.standard @@ -349,20 +349,20 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { color: UIColor.white, font: UIFont.boldSystemFont(ofSize: 16)) .set(text: "Send a message or create a group.", - color: UIColor(hex: "#a6978d"), + color: UIColor("#a6978d"), font: UIFont.systemFont(ofSize: 14)) .change(vspace: .imageWithTitle, value: 1) .change(vspace: .titleWithText, value: 1) .mix() - .set(backgroundColor: UIColor(hex: "#726d67")) + .set(backgroundColor: UIColor("#726d67")) .set(tap: backgroundTapEvent()) case .photo: return EmptyPageView.Template.standard .set(title: "No Photos or Videos", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 30)) .set(text: "You can sync photos and videos onto your iPhone using iTunes.", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 18)) .change(hspace: .text, value: 40) .change(vspace: .titleWithText, value: 15) @@ -371,10 +371,10 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { case .podcasts: return EmptyPageView.Template.standard .set(title: "No Podcasts", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 30)) .set(text: "You can subscribe to podcasts in Top Charts or Featured.", - color: UIColor(hex: "#999999"), + color: UIColor("#999999"), font: UIFont.systemFont(ofSize: 18)) .change(hspace: .text, value: 35) .change(vspace: .titleWithText, value: 35) @@ -384,10 +384,10 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_remote")) .set(title: "Cannot Connect to a Local Network", - color: UIColor(hex: "#555555"), + color: UIColor("#555555"), font: UIFont(name: "HelveticaNeue-Medium", size: 18)!) .set(text: "You must connect to a Wi-Fi network to control iTunes or Apple TV", - color: UIColor(hex: "#555555"), + color: UIColor("#555555"), font: UIFont(name: "HelveticaNeue-Medium", size: 11.75)!) .change(hspace: .text, value: 20) .mix() @@ -395,7 +395,7 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { case .safari: return EmptyPageView.Template.text .set(text: "Safari cannot open the page because your iPhone is not connected to the Internet.", - color: UIColor(hex: "#7d7f7f"), + color: UIColor("#7d7f7f"), font: UIFont.systemFont(ofSize: 18)) .change(hspace: .text, value: 20) .mix() @@ -403,10 +403,10 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { case .skype: let attr = NSMutableAttributedString(string: "Keep all your favorite people together", attributes: [.font : UIFont(name: "HelveticaNeue-Light", size: 17.75)!, - .foregroundColor: UIColor(hex: "#a6c3d1")]) + .foregroundColor: UIColor("#a6c3d1")]) let attr2 = NSAttributedString(string: "\nadd favorites", attributes: [.font : UIFont(name: "HelveticaNeue-Light", size: 17.75)!, - .foregroundColor : UIColor(hex: "00adf1")]) + .foregroundColor : UIColor("#00adf1")]) attr.append(attr2) return EmptyPageView.Template.text .set(attributed: attr) @@ -417,7 +417,7 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_slack")) .set(title: "You don't have any recent mentions", - color: UIColor(hex: "#d7d7d7"), + color: UIColor("#d7d7d7"), font: UIFont.systemFont(ofSize: 19)) .change(hspace: .text, value: 20) .mix() @@ -426,16 +426,16 @@ enum DZEmptyStyle: EmptyViewStoreProtocol, CaseIterable { return EmptyPageView.Template.standard .set(image: UIImage(named: "placeholder_tumblr")) .set(title: "This is your Dashboard.", - color: UIColor(hex: "#aab6c4"), + color: UIColor("#aab6c4"), font: UIFont.systemFont(ofSize: 18)) .set(text: "When you follow some blogs, their latest posts will show up here!", - color: UIColor(hex: "#828e9c"), + color: UIColor("#828e9c"), font: UIFont.systemFont(ofSize: 17)) .change(hspace: .text, value: 20) .change(vspace: .imageWithTitle, value: 10) .change(vspace: .titleWithText, value: 10) .mix() - .set(backgroundColor: UIColor(hex: "#34465c")) + .set(backgroundColor: UIColor("#34465c")) .set(tap: backgroundTapEvent()) } } diff --git a/Example/EmptyPage/HomeViewController.swift b/Example/EmptyPage/HomeViewController.swift index 4562687..674d621 100644 --- a/Example/EmptyPage/HomeViewController.swift +++ b/Example/EmptyPage/HomeViewController.swift @@ -8,7 +8,6 @@ import UIKit import EmptyPage -import Hue class HomeViewController: UITableViewController { @@ -95,20 +94,20 @@ class HomeViewController: UITableViewController { .change(vspace: .textWithButton, value: 10) .change(vspace: .titleWithText, value: 10) .config(button: { (item) in - item.layer.borderColor = UIColor(hex: "#2ca3fa").cgColor + 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(hex: "#2ca3fa"), for: .normal) + 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(hex: "#536571"), + color: UIColor("#536571"), font: UIFont.boldSystemFont(ofSize: 18)) .set(text: "Following people helps you keep what they're saying and recommending.", - color: UIColor(hex: "#c3ccd1")) + color: UIColor("#c3ccd1")) .set(buttonTitle: "Find interesting people to follow >>") .set(tap: alertEvent()) .mix() @@ -126,7 +125,7 @@ class HomeViewController: UITableViewController { .change(height: .button, value: 60) .change(hspace: .image, value: 15) .config(button: { (item) in - item.backgroundColor = UIColor(hex: "#0180bf") + item.backgroundColor = UIColor("#0180bf") item.contentEdgeInsets = UIEdgeInsets(top: 8, left: 20, bottom: 8, right: 20) }) .set(image: UIImage(named: "empty-1002")!) @@ -156,16 +155,16 @@ class HomeViewController: UITableViewController { .set(image: UIImage(named: "404")!) .change(vspace: .titleWithText, value: 0) .set(title: "FILE NOT FOUND", - color: UIColor(hex: "#849aac"), + color: UIColor("#849aac"), font: UIFont.boldSystemFont(ofSize: 18)) .set(text: "Lorem ipsum dolor sit amet.\nconectetur adipscing elit sed do eiusmod", - color: UIColor(hex: "#c5cfd7")) + color: UIColor("#c5cfd7")) .config(button: { (item) in item.isHidden = true }) .set(tap: alertEvent()) .mix() - .set(backgroundColor: UIColor(hex: "#f5f7f9")) + .set(backgroundColor: UIColor("#f5f7f9")) let item = CellItem(title: "404 page - Illustration", subTitle: "https://dribbble.com/iftikharshaikh", emptyView: emptyView) diff --git a/Example/EmptyPage/Main/views/ActionView/ActionSection.swift b/Example/EmptyPage/Main/views/ActionView/ActionSection.swift index 160a356..9ef8a93 100644 --- a/Example/EmptyPage/Main/views/ActionView/ActionSection.swift +++ b/Example/EmptyPage/Main/views/ActionView/ActionSection.swift @@ -10,7 +10,6 @@ import UIKit import Stem import EmptyPage import SVProgressHUD -import Stone class ActionSection: SectionTableType { diff --git a/Example/EmptyPage/Main/views/MainHeaderView.swift b/Example/EmptyPage/Main/views/MainHeaderView.swift index 25da0ac..3bed036 100644 --- a/Example/EmptyPage/Main/views/MainHeaderView.swift +++ b/Example/EmptyPage/Main/views/MainHeaderView.swift @@ -10,7 +10,7 @@ import UIKit import Stem import SnapKit -class MainHeaderView: UITableViewHeaderFooterView, STCellProtocol { +class MainHeaderView: UITableViewHeaderFooterView, STViewProtocol { lazy private var titleLabel = UILabel() @@ -28,7 +28,7 @@ class MainHeaderView: UITableViewHeaderFooterView, STCellProtocol { make.height.greaterThanOrEqualTo(45) } - _ = contentView.st.set(tap: { _ in + contentView.st.setTapGesture({ _ in self.action?() }) } @@ -43,11 +43,11 @@ extension MainHeaderView { func config(title: String?, action: (() -> Void)? = nil) { if action == nil { - contentView.backgroundColor = UIColor(hex: "F6F6F6") + contentView.backgroundColor = UIColor("#F6F6F6") titleLabel.font = UIFont.systemFont(ofSize: 15, weight: .regular) }else{ titleLabel.font = UIFont.systemFont(ofSize: 24, weight: .bold) - contentView.backgroundColor = UIColor(hex: "CCCCCC") + contentView.backgroundColor = UIColor("#CCCCCC") } self.titleLabel.text = title self.action = action diff --git a/Example/Podfile b/Example/Podfile index bb47522..8118840 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -7,9 +7,8 @@ install! 'cocoapods', :generate_multiple_pod_projects => true target 'EmptyPage_Example' do pod 'EmptyPage', :path => '../EmptyPage.podspec' pod 'SnapKit', '5.0.0' - pod 'Hue' - pod 'Stone' - pod 'Stem', '0.0.27' + 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 'SwiftLint' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 908e097..b16ef08 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -5,105 +5,213 @@ PODS: - EmptyPage/Core (3.3.0) - EmptyPage/Standard (3.3.0): - EmptyPage/Core - - Hue (5.0.0) - SnapKit (5.0.0) - - Stem (0.0.27): - - Stem/Application (= 0.0.27) - - Stem/CGGeometry (= 0.0.27) - - Stem/Color (= 0.0.27) - - Stem/Control (= 0.0.27) - - Stem/Core (= 0.0.27) - - Stem/Font (= 0.0.27) - - Stem/Foundation (= 0.0.27) - - Stem/GestureRecognizer (= 0.0.27) - - Stem/Image (= 0.0.27) - - Stem/ImageView (= 0.0.27) - - Stem/InputView (= 0.0.27) - - Stem/Label (= 0.0.27) - - Stem/ListView (= 0.0.27) - - Stem/NavigationBar (= 0.0.27) - - Stem/NSLayoutConstraint (= 0.0.27) - - Stem/PopGesture (= 0.0.27) - - Stem/Storyboard (= 0.0.27) - - Stem/UIDevice (= 0.0.27) - - Stem/View (= 0.0.27) - - Stem/ViewController (= 0.0.27) - - Stem/Application (0.0.27): - - Stem/Core - - Stem/CGGeometry (0.0.27): - - Stem/Core - - Stem/Color (0.0.27): - - Stem/Core - - Stem/Control (0.0.27): - - Stem/Core - - Stem/Core (0.0.27) - - Stem/Font (0.0.27): - - Stem/Core - - Stem/Foundation (0.0.27): - - Stem/Core - - Stem/GestureRecognizer (0.0.27): - - Stem/Core - - Stem/Image (0.0.27): - - Stem/Core - - Stem/ImageView (0.0.27): - - Stem/Core - - Stem/Image - - Stem/InputView (0.0.27): - - Stem/CGGeometry - - Stem/Core - - Stem/Label (0.0.27): - - Stem/Core - - Stem/ListView (0.0.27): - - Stem/Core - - Stem/NavigationBar (0.0.27): - - Stem/Core - - Stem/NSLayoutConstraint (0.0.27): - - Stem/Core - - Stem/PopGesture (0.0.27): - - Stem/Core - - Stem/Storyboard (0.0.27): - - Stem/Core - - Stem/UIDevice (0.0.27): - - Stem/Core - - Stem/View (0.0.27): - - Stem/Core - - Stem/ViewController (0.0.27): - - Stem/Core - - Stone (0.0.2) + - Stem (0.0.31): + - Stem/AVKit (= 0.0.31) + - Stem/Core (= 0.0.31) + - Stem/Foundation (= 0.0.31) + - Stem/Fundamentals (= 0.0.31) + - Stem/NSObject (= 0.0.31) + - Stem/Runtime (= 0.0.31) + - Stem/UIKit (= 0.0.31) + - Stem/WebKit (= 0.0.31) + - Stem/AVKit (0.0.31): + - Stem/Core + - Stem/Core (0.0.31) + - Stem/Foundation (0.0.31): + - Stem/Core + - Stem/Foundation/Coder (= 0.0.31) + - Stem/Foundation/Collections (= 0.0.31) + - Stem/Foundation/Custom (= 0.0.31) + - Stem/Foundation/Date (= 0.0.31) + - Stem/Foundation/Dispatch (= 0.0.31) + - Stem/Foundation/Fundamentals (= 0.0.31) + - Stem/Foundation/pre-release (= 0.0.31) + - Stem/Foundation/String (= 0.0.31) + - Stem/Foundation/Coder (0.0.31): + - Stem/Core + - Stem/Foundation/Collections (0.0.31): + - Stem/Core + - Stem/Foundation/Custom (0.0.31): + - Stem/Core + - Stem/Foundation/Date (0.0.31): + - Stem/Core + - Stem/Foundation/Dispatch (0.0.31): + - Stem/Core + - Stem/Foundation/Fundamentals (0.0.31): + - Stem/Core + - Stem/Foundation/pre-release (0.0.31): + - Stem/Core + - Stem/Foundation/String (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/Fundamentals (0.0.31): + - Stem/Core + - Stem/NSObject (0.0.31): + - Stem/Core + - Stem/Runtime (0.0.31) + - Stem/UIKit (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Application (= 0.0.31) + - Stem/UIKit/AttributedString (= 0.0.31) + - Stem/UIKit/Color (= 0.0.31) + - Stem/UIKit/Control (= 0.0.31) + - Stem/UIKit/Custom (= 0.0.31) + - Stem/UIKit/Font (= 0.0.31) + - Stem/UIKit/GestureRecognizer (= 0.0.31) + - Stem/UIKit/Image (= 0.0.31) + - Stem/UIKit/ImageView (= 0.0.31) + - Stem/UIKit/InputView (= 0.0.31) + - Stem/UIKit/Interface (= 0.0.31) + - Stem/UIKit/Label (= 0.0.31) + - Stem/UIKit/ListView (= 0.0.31) + - Stem/UIKit/NavigationBar (= 0.0.31) + - Stem/UIKit/NSLayoutConstraint (= 0.0.31) + - Stem/UIKit/UIDevice (= 0.0.31) + - Stem/UIKit/View (= 0.0.31) + - Stem/UIKit/ViewController (= 0.0.31) + - Stem/UIKit/Application (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/AttributedString (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Color (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Control (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Custom (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Font (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/GestureRecognizer (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Image (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/ImageView (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/InputView (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Interface (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Label (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/ListView (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Interface + - Stem/UIKit/NavigationBar (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/NSLayoutConstraint (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/UIDevice (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/View (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/ViewController (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/WebKit (0.0.31): + - Stem/Core + - Stuart (0.0.1): + - Stuart/SectionView (= 0.0.1) + - Stuart/SectionView (0.0.1) - SVProgressHUD (2.2.5) - SwiftLint (0.35.0) DEPENDENCIES: - EmptyPage (from `../EmptyPage.podspec`) - - Hue - SnapKit (= 5.0.0) - - Stem (= 0.0.27) - - Stone + - "Stem (from `git@github.com:linhay/Stem.git`, branch `develop`)" + - "Stuart (from `git@github.com:linhay/Stuart.git`, branch `master`)" - SVProgressHUD - SwiftLint SPEC REPOS: - https://cdn.cocoapods.org/: - - Hue + trunk: - SnapKit - - Stem - - Stone - SVProgressHUD - SwiftLint EXTERNAL SOURCES: EmptyPage: :path: "../EmptyPage.podspec" + Stem: + :branch: develop + :git: "git@github.com:linhay/Stem.git" + Stuart: + :branch: master + :git: "git@github.com:linhay/Stuart.git" + +CHECKOUT OPTIONS: + Stem: + :commit: c7fa7ed8607342a7e6d91760e03ab29880552b30 + :git: "git@github.com:linhay/Stem.git" + Stuart: + :commit: 4fe44369e7d99d644ad2eb04711c75ae8026028e + :git: "git@github.com:linhay/Stuart.git" SPEC CHECKSUMS: EmptyPage: b85eb9d70cda567e418becd1677a41865904595b - Hue: c129cb67be7d093a82bbbc30ce8a96757bf6f37a SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf - Stem: 1b48be402f890568bfce61afd3e25c504e92a706 - Stone: ce22394d2644c843bfc93413454df098c8c630d6 + Stem: ea4aa174339e851a15619fd7d370cc3570667f6c + Stuart: b5fccbcb300fd684f248d371c7b36be7494a88b3 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SwiftLint: 5553187048b900c91aa03552807681bb6b027846 -PODFILE CHECKSUM: 9c7af6e2cc1cac4eb61454dc887cbbf03a6393b1 +PODFILE CHECKSUM: 002741590eaee6030d7a9e6ee37c8ae6caa87b12 -COCOAPODS: 1.8.0 +COCOAPODS: 1.9.0 diff --git a/Example/Pods/Hue/LICENSE.md b/Example/Pods/Hue/LICENSE.md deleted file mode 100644 index 65e9840..0000000 --- a/Example/Pods/Hue/LICENSE.md +++ /dev/null @@ -1,22 +0,0 @@ -Licensed under the **MIT** license - -> Copyright (c) 2015 Hyper Interaktiv AS -> -> 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. diff --git a/Example/Pods/Hue/README.md b/Example/Pods/Hue/README.md deleted file mode 100644 index 56d634c..0000000 --- a/Example/Pods/Hue/README.md +++ /dev/null @@ -1,153 +0,0 @@ -![Hue](https://github.com/hyperoslo/Hue/blob/master/Images/cover.png) - -Hue is the all-in-one coloring utility that you'll ever need. - -[![Version](https://img.shields.io/cocoapods/v/Hue.svg?style=flat)](http://cocoadocs.org/docsets/Hue) -[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) -[![License](https://img.shields.io/cocoapods/l/Hue.svg?style=flat)](http://cocoadocs.org/docsets/Hue) -[![Platform](https://img.shields.io/cocoapods/p/Hue.svg?style=flat)](http://cocoadocs.org/docsets/Hue) -![Swift](https://img.shields.io/badge/%20in-swift%205.0-orange.svg) - -## Usage - -#### Hex -Hue IconYou can easily use hex colors with the `init(hex:)` convenience initializer on `UIColor`. It supports the following hex formats `#ffffff`, `ffffff`, `#fff`, `fff` -```swift -let white = UIColor(hex: "#ffffff") -let black = UIColor(hex: "#000000") -let red = UIColor(hex: "#ff0000") -let blue = UIColor(hex: "#0000ff") -let green = UIColor(hex: "#00ff00") -let yellow = UIColor(hex: "#ffff00") -``` - -#### Computed color properties -```swift -let white = UIColor(hex: "#ffffff") -let black = UIColor(hex: "#000000") - -if white.isDarkColor {} // return false -if white.isBlackOrWhite {} // return true -``` - -#### Alpha -`.alpha` is a sugar for `colorWithAlphaComponent`, internally it does the exact same thing, think of it as a -lipstick for your implementation. -```swift -let colorWithAlpha = myColor.alpha(0.75) -``` - -#### Gradients -You can easily create gradient layers using the `gradient()` method on arrays with `UIColor`. -As an extra bonus, you can also add a transform closure if you want to modify the `CAGradientLayer`. - -```swift -let gradient = [UIColor.blackColor(), UIColor.orangeColor()].gradient() - -let secondGradient = [UIColor.blackColor(), UIColor.orangeColor()].gradient { gradient in - gradient.locations = [0.25, 1.0] - return gradient -} -``` - -#### Image colors -```swift -let image = UIImage(named: "My Image") -let (background, primary, secondary, detail) = image.colors() -``` - -#### Components -You can get red, green, blue, and alpha components from any UIColor by using the (red|green|blue|alpha)Component property. - -```swift -let myColor = UIColor(hex: "#ffafc2") -let myColorBlueComponent = myColor.blueComponent -let myColorGreenComponent = myColor.greenComponent -let myColorRedComponent = myColor.redComponent -let myColorAlphaComponent = myColor.alphaComponent -``` - -#### Blending -```swift -let red = UIColor.redColor() -let green = UIColor.greenColor() -let yellow = red.addRGB(green) - -let desaturatedBlue = UIColor(hex: "#aaaacc") -let saturatedBlue = desaturatedBlue.addHue(0.0, saturation: 1.0, brightness: 0.0, alpha: 0.0) -``` - -## Examples -Hex Example screenshot - -#### Hex -This super simple example that displays a bunch of color schemes in a Carousel view. - -It uses hex to set the color for the schemes. It leverages from `.isDarkColor` to make the text color readable in all scenarios. - -The demo also features [Spots](http://github.com/hyperoslo/Spots) for rendering the Carousel view. - -**Example code:** - -```swift -let color = UIColor(hex: "#3b5998") -backgroundColor = color -label.textColor = color.isDark - ? UIColor.whiteColor() - : UIColor.darkGrayColor() -``` - -#### Gradients -Gradients Example screenshot - -This examples shows how much fun you can have with combining `CAGradientLayer` with `CABasicAnimation`. - -It uses `.hex` for getting the colors and `.gradient()` for transforming -a collection of `UIColor`'s into a `CAGradientLayer`. - -The demo features [Spots](http://github.com/hyperoslo/Spots) for rendering the list view and [Fakery](https://github.com/vadymmarkov/Fakery) for generating random content strings. - -**Extract from the demo:** -```swift -lazy var gradient: CAGradientLayer = [ - UIColor(hex: "#FD4340"), - UIColor(hex: "#CE2BAE") - ].gradient { gradient in - gradient.speed = 0 - gradient.timeOffset = 0 - - return gradient - } -``` - -## Installation - -**Hue** is available through [CocoaPods](http://cocoapods.org). To install -it, simply add the following line to your Podfile: - -```ruby -pod 'Hue' -``` - -**Hue** is also available through [Carthage](https://github.com/Carthage/Carthage). -To install just write into your Cartfile: - -```ruby -github "hyperoslo/Hue" -``` - -## Author - -[Hyper](http://hyper.no) made this with ❤️ - -## Contribute - -We would love you to contribute to **Hue**, check the [CONTRIBUTING](https://github.com/hyperoslo/Hue/blob/master/CONTRIBUTING.md) file for more info. - -## Credits - -Credit goes out to Panic Inc who created [ColorArt](https://github.com/panicinc/ColorArt) and [@jathu](https://github.com/jathu) for his work on [UIImageColors](https://github.com/jathu/UIImageColors) which deeply inspired the functionality behind the image color analysis. - -## License - -**Hue** is available under the MIT license. See the LICENSE file for more info. diff --git a/Example/Pods/Hue/Source/iOS+tvOS/UIColor+Hue.swift b/Example/Pods/Hue/Source/iOS+tvOS/UIColor+Hue.swift deleted file mode 100644 index 09bb452..0000000 --- a/Example/Pods/Hue/Source/iOS+tvOS/UIColor+Hue.swift +++ /dev/null @@ -1,247 +0,0 @@ -import UIKit - -// MARK: - Color Builders - -public extension UIColor { - /// Constructing color from hex string - /// - /// - Parameter hex: A hex string, can either contain # or not - convenience init(hex string: String) { - var hex = string.hasPrefix("#") - ? String(string.dropFirst()) - : string - guard hex.count == 3 || hex.count == 6 - else { - self.init(white: 1.0, alpha: 0.0) - return - } - if hex.count == 3 { - for (index, char) in hex.enumerated() { - hex.insert(char, at: hex.index(hex.startIndex, offsetBy: index * 2)) - } - } - - guard let intCode = Int(hex, radix: 16) else { - self.init(white: 1.0, alpha: 0.0) - return - } - - self.init( - red: CGFloat((intCode >> 16) & 0xFF) / 255.0, - green: CGFloat((intCode >> 8) & 0xFF) / 255.0, - blue: CGFloat((intCode) & 0xFF) / 255.0, alpha: 1.0) - } - - /// Adjust color based on saturation - /// - /// - Parameter minSaturation: The minimun saturation value - /// - Returns: The adjusted color - func color(minSaturation: CGFloat) -> UIColor { - var (hue, saturation, brightness, alpha): (CGFloat, CGFloat, CGFloat, CGFloat) = (0.0, 0.0, 0.0, 0.0) - getHue(&hue, saturation: &saturation, brightness: &brightness, alpha: &alpha) - - return saturation < minSaturation - ? UIColor(hue: hue, saturation: minSaturation, brightness: brightness, alpha: alpha) - : self - } - - /// Convenient method to change alpha value - /// - /// - Parameter value: The alpha value - /// - Returns: The alpha adjusted color - func alpha(_ value: CGFloat) -> UIColor { - return withAlphaComponent(value) - } -} - -// MARK: - Helpers - -public extension UIColor { - - func hex(hashPrefix: Bool = true) -> String { - var (r, g, b, a): (CGFloat, CGFloat, CGFloat, CGFloat) = (0.0, 0.0, 0.0, 0.0) - getRed(&r, green: &g, blue: &b, alpha: &a) - - let prefix = hashPrefix ? "#" : "" - - return String(format: "\(prefix)%02X%02X%02X", Int(r * 255), Int(g * 255), Int(b * 255)) - } - - internal func rgbComponents() -> [CGFloat] { - var (r, g, b, a): (CGFloat, CGFloat, CGFloat, CGFloat) = (0.0, 0.0, 0.0, 0.0) - getRed(&r, green: &g, blue: &b, alpha: &a) - - return [r, g, b] - } - - var isDark: Bool { - let RGB = rgbComponents() - return (0.2126 * RGB[0] + 0.7152 * RGB[1] + 0.0722 * RGB[2]) < 0.5 - } - - var isBlackOrWhite: Bool { - let RGB = rgbComponents() - return (RGB[0] > 0.91 && RGB[1] > 0.91 && RGB[2] > 0.91) || (RGB[0] < 0.09 && RGB[1] < 0.09 && RGB[2] < 0.09) - } - - var isBlack: Bool { - let RGB = rgbComponents() - return (RGB[0] < 0.09 && RGB[1] < 0.09 && RGB[2] < 0.09) - } - - var isWhite: Bool { - let RGB = rgbComponents() - return (RGB[0] > 0.91 && RGB[1] > 0.91 && RGB[2] > 0.91) - } - - func isDistinct(from color: UIColor) -> Bool { - let bg = rgbComponents() - let fg = color.rgbComponents() - let threshold: CGFloat = 0.25 - var result = false - - if abs(bg[0] - fg[0]) > threshold || abs(bg[1] - fg[1]) > threshold || abs(bg[2] - fg[2]) > threshold { - if abs(bg[0] - bg[1]) < 0.03 && abs(bg[0] - bg[2]) < 0.03 { - if abs(fg[0] - fg[1]) < 0.03 && abs(fg[0] - fg[2]) < 0.03 { - result = false - } - } - result = true - } - - return result - } - - func isContrasting(with color: UIColor) -> Bool { - let bg = rgbComponents() - let fg = color.rgbComponents() - - let bgLum = 0.2126 * bg[0] + 0.7152 * bg[1] + 0.0722 * bg[2] - let fgLum = 0.2126 * fg[0] + 0.7152 * fg[1] + 0.0722 * fg[2] - let contrast = bgLum > fgLum - ? (bgLum + 0.05) / (fgLum + 0.05) - : (fgLum + 0.05) / (bgLum + 0.05) - - return 1.6 < contrast - } - -} - -// MARK: - Gradient - -public extension Array where Element : UIColor { - - func gradient(_ transform: ((_ gradient: inout CAGradientLayer) -> CAGradientLayer)? = nil) -> CAGradientLayer { - var gradient = CAGradientLayer() - gradient.colors = self.map { $0.cgColor } - - if let transform = transform { - gradient = transform(&gradient) - } - - return gradient - } -} - -// MARK: - Components - -public extension UIColor { - - var redComponent: CGFloat { - var red: CGFloat = 0 - getRed(&red, green: nil , blue: nil, alpha: nil) - return red - } - - var greenComponent: CGFloat { - var green: CGFloat = 0 - getRed(nil, green: &green , blue: nil, alpha: nil) - return green - } - - var blueComponent: CGFloat { - var blue: CGFloat = 0 - getRed(nil, green: nil , blue: &blue, alpha: nil) - return blue - } - - var alphaComponent: CGFloat { - var alpha: CGFloat = 0 - getRed(nil, green: nil , blue: nil, alpha: &alpha) - return alpha - } - - var hueComponent: CGFloat { - var hue: CGFloat = 0 - getHue(&hue, saturation: nil, brightness: nil, alpha: nil) - return hue - } - - var saturationComponent: CGFloat { - var saturation: CGFloat = 0 - getHue(nil, saturation: &saturation, brightness: nil, alpha: nil) - return saturation - } - - var brightnessComponent: CGFloat { - var brightness: CGFloat = 0 - getHue(nil, saturation: nil, brightness: &brightness, alpha: nil) - return brightness - } -} - - -// MARK: - Blending - -public extension UIColor { - - /**adds hue, saturation, and brightness to the HSB components of this color (self)*/ - func add(hue: CGFloat, saturation: CGFloat, brightness: CGFloat, alpha: CGFloat) -> UIColor { - var (oldHue, oldSat, oldBright, oldAlpha) : (CGFloat, CGFloat, CGFloat, CGFloat) = (0,0,0,0) - getHue(&oldHue, saturation: &oldSat, brightness: &oldBright, alpha: &oldAlpha) - - // make sure new values doesn't overflow - var newHue = oldHue + hue - while newHue < 0.0 { newHue += 1.0 } - while newHue > 1.0 { newHue -= 1.0 } - - let newBright: CGFloat = max(min(oldBright + brightness, 1.0), 0) - let newSat: CGFloat = max(min(oldSat + saturation, 1.0), 0) - let newAlpha: CGFloat = max(min(oldAlpha + alpha, 1.0), 0) - - return UIColor(hue: newHue, saturation: newSat, brightness: newBright, alpha: newAlpha) - } - - /**adds red, green, and blue to the RGB components of this color (self)*/ - func add(red: CGFloat, green: CGFloat, blue: CGFloat, alpha: CGFloat) -> UIColor { - var (oldRed, oldGreen, oldBlue, oldAlpha) : (CGFloat, CGFloat, CGFloat, CGFloat) = (0,0,0,0) - getRed(&oldRed, green: &oldGreen, blue: &oldBlue, alpha: &oldAlpha) - // make sure new values doesn't overflow - let newRed: CGFloat = max(min(oldRed + red, 1.0), 0) - let newGreen: CGFloat = max(min(oldGreen + green, 1.0), 0) - let newBlue: CGFloat = max(min(oldBlue + blue, 1.0), 0) - let newAlpha: CGFloat = max(min(oldAlpha + alpha, 1.0), 0) - return UIColor(red: newRed, green: newGreen, blue: newBlue, alpha: newAlpha) - } - - func add(hsb color: UIColor) -> UIColor { - var (h,s,b,a) : (CGFloat, CGFloat, CGFloat, CGFloat) = (0,0,0,0) - color.getHue(&h, saturation: &s, brightness: &b, alpha: &a) - return self.add(hue: h, saturation: s, brightness: b, alpha: 0) - } - - func add(rgb color: UIColor) -> UIColor { - return self.add(red: color.redComponent, green: color.greenComponent, blue: color.blueComponent, alpha: 0) - } - - func add(hsba color: UIColor) -> UIColor { - var (h,s,b,a) : (CGFloat, CGFloat, CGFloat, CGFloat) = (0,0,0,0) - color.getHue(&h, saturation: &s, brightness: &b, alpha: &a) - return self.add(hue: h, saturation: s, brightness: b, alpha: a) - } - - /**adds the rgb components of two colors*/ - func add(rgba color: UIColor) -> UIColor { - return self.add(red: color.redComponent, green: color.greenComponent, blue: color.blueComponent, alpha: color.alphaComponent) - } -} diff --git a/Example/Pods/Hue/Source/iOS+tvOS/UIImage+Hue.swift b/Example/Pods/Hue/Source/iOS+tvOS/UIImage+Hue.swift deleted file mode 100644 index 3de79df..0000000 --- a/Example/Pods/Hue/Source/iOS+tvOS/UIImage+Hue.swift +++ /dev/null @@ -1,176 +0,0 @@ -import UIKit - -class CountedColor { - let color: UIColor - let count: Int - - init(color: UIColor, count: Int) { - self.color = color - self.count = count - } -} - -extension UIImage { - fileprivate func resize(to newSize: CGSize) -> UIImage { - UIGraphicsBeginImageContextWithOptions(newSize, false, 2) - draw(in: CGRect(x: 0, y: 0, width: newSize.width, height: newSize.height)) - let result = UIGraphicsGetImageFromCurrentImageContext() - UIGraphicsEndImageContext() - - return result! - } - - public func colors(scaleDownSize: CGSize? = nil) -> (background: UIColor, primary: UIColor, secondary: UIColor, detail: UIColor) { - let cgImage: CGImage - - if let scaleDownSize = scaleDownSize { - cgImage = resize(to: scaleDownSize).cgImage! - } else { - let ratio = size.width / size.height - let r_width: CGFloat = 250 - cgImage = resize(to: CGSize(width: r_width, height: r_width / ratio)).cgImage! - } - - let width = cgImage.width - let height = cgImage.height - let bytesPerPixel = 4 - let bytesPerRow = width * bytesPerPixel - let bitsPerComponent = 8 - let randomColorsThreshold = Int(CGFloat(height) * 0.01) - let blackColor = UIColor(red: 0, green: 0, blue: 0, alpha: 1) - let whiteColor = UIColor(red: 1, green: 1, blue: 1, alpha: 1) - let colorSpace = CGColorSpaceCreateDeviceRGB() - let raw = malloc(bytesPerRow * height) - let bitmapInfo = CGImageAlphaInfo.premultipliedFirst.rawValue - let context = CGContext(data: raw, width: width, height: height, bitsPerComponent: bitsPerComponent, bytesPerRow: bytesPerRow, space: colorSpace, bitmapInfo: bitmapInfo) - context?.draw(cgImage, in: CGRect(x: 0, y: 0, width: CGFloat(width), height: CGFloat(height))) - let data = UnsafePointer(context?.data?.assumingMemoryBound(to: UInt8.self)) - let imageBackgroundColors = NSCountedSet(capacity: height) - let imageColors = NSCountedSet(capacity: width * height) - - let sortComparator: (CountedColor, CountedColor) -> Bool = { (a, b) -> Bool in - return a.count <= b.count - } - - for x in 0..= 5 && x <= 10 { - imageBackgroundColors.add(color) - } - - imageColors.add(color) - } - } - - var sortedColors = [CountedColor]() - - for color in imageBackgroundColors { - guard let color = color as? UIColor else { continue } - - let colorCount = imageBackgroundColors.count(for: color) - - if randomColorsThreshold <= colorCount { - sortedColors.append(CountedColor(color: color, count: colorCount)) - } - } - - sortedColors.sort(by: sortComparator) - - var proposedEdgeColor = CountedColor(color: blackColor, count: 1) - - if let first = sortedColors.first { proposedEdgeColor = first } - - if proposedEdgeColor.color.isBlackOrWhite && !sortedColors.isEmpty { - for countedColor in sortedColors where CGFloat(countedColor.count / proposedEdgeColor.count) > 0.3 { - if !countedColor.color.isBlackOrWhite { - proposedEdgeColor = countedColor - break - } - } - } - - let imageBackgroundColor = proposedEdgeColor.color - let isDarkBackgound = imageBackgroundColor.isDark - - sortedColors.removeAll() - - for imageColor in imageColors { - guard let imageColor = imageColor as? UIColor else { continue } - - let color = imageColor.color(minSaturation: 0.15) - - if color.isDark == !isDarkBackgound { - let colorCount = imageColors.count(for: color) - sortedColors.append(CountedColor(color: color, count: colorCount)) - } - } - - sortedColors.sort(by: sortComparator) - - var primaryColor, secondaryColor, detailColor: UIColor? - - for countedColor in sortedColors { - let color = countedColor.color - - if primaryColor == nil && - color.isContrasting(with: imageBackgroundColor) { - primaryColor = color - } else if secondaryColor == nil && - primaryColor != nil && - primaryColor!.isDistinct(from: color) && - color.isContrasting(with: imageBackgroundColor) { - secondaryColor = color - } else if secondaryColor != nil && - (secondaryColor!.isDistinct(from: color) && - primaryColor!.isDistinct(from: color) && - color.isContrasting(with: imageBackgroundColor)) { - detailColor = color - break - } - } - - free(raw) - - return ( - imageBackgroundColor, - primaryColor ?? (isDarkBackgound ? whiteColor : blackColor), - secondaryColor ?? (isDarkBackgound ? whiteColor : blackColor), - detailColor ?? (isDarkBackgound ? whiteColor : blackColor)) - } - - public func color(at point: CGPoint, completion: @escaping (UIColor?) -> Void) { - let size = self.size - let cgImage = self.cgImage - - DispatchQueue.global(qos: .userInteractive).async { - let rect = CGRect(x: 0, y: 0, width: size.width, height: size.height) - guard let imgRef = cgImage, - let dataProvider = imgRef.dataProvider, - let dataCopy = dataProvider.data, - let data = CFDataGetBytePtr(dataCopy), rect.contains(point) else { - DispatchQueue.main.async { - completion(nil) - } - return - } - - let pixelInfo = (Int(size.width) * Int(point.y) + Int(point.x)) * 4 - let red = CGFloat(data[pixelInfo]) / 255.0 - let green = CGFloat(data[pixelInfo + 1]) / 255.0 - let blue = CGFloat(data[pixelInfo + 2]) / 255.0 - let alpha = CGFloat(data[pixelInfo + 3]) / 255.0 - - DispatchQueue.main.async { - completion(UIColor(red: red, green: green, blue: blue, alpha: alpha)) - } - } - } -} diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 908e097..b16ef08 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -5,105 +5,213 @@ PODS: - EmptyPage/Core (3.3.0) - EmptyPage/Standard (3.3.0): - EmptyPage/Core - - Hue (5.0.0) - SnapKit (5.0.0) - - Stem (0.0.27): - - Stem/Application (= 0.0.27) - - Stem/CGGeometry (= 0.0.27) - - Stem/Color (= 0.0.27) - - Stem/Control (= 0.0.27) - - Stem/Core (= 0.0.27) - - Stem/Font (= 0.0.27) - - Stem/Foundation (= 0.0.27) - - Stem/GestureRecognizer (= 0.0.27) - - Stem/Image (= 0.0.27) - - Stem/ImageView (= 0.0.27) - - Stem/InputView (= 0.0.27) - - Stem/Label (= 0.0.27) - - Stem/ListView (= 0.0.27) - - Stem/NavigationBar (= 0.0.27) - - Stem/NSLayoutConstraint (= 0.0.27) - - Stem/PopGesture (= 0.0.27) - - Stem/Storyboard (= 0.0.27) - - Stem/UIDevice (= 0.0.27) - - Stem/View (= 0.0.27) - - Stem/ViewController (= 0.0.27) - - Stem/Application (0.0.27): - - Stem/Core - - Stem/CGGeometry (0.0.27): - - Stem/Core - - Stem/Color (0.0.27): - - Stem/Core - - Stem/Control (0.0.27): - - Stem/Core - - Stem/Core (0.0.27) - - Stem/Font (0.0.27): - - Stem/Core - - Stem/Foundation (0.0.27): - - Stem/Core - - Stem/GestureRecognizer (0.0.27): - - Stem/Core - - Stem/Image (0.0.27): - - Stem/Core - - Stem/ImageView (0.0.27): - - Stem/Core - - Stem/Image - - Stem/InputView (0.0.27): - - Stem/CGGeometry - - Stem/Core - - Stem/Label (0.0.27): - - Stem/Core - - Stem/ListView (0.0.27): - - Stem/Core - - Stem/NavigationBar (0.0.27): - - Stem/Core - - Stem/NSLayoutConstraint (0.0.27): - - Stem/Core - - Stem/PopGesture (0.0.27): - - Stem/Core - - Stem/Storyboard (0.0.27): - - Stem/Core - - Stem/UIDevice (0.0.27): - - Stem/Core - - Stem/View (0.0.27): - - Stem/Core - - Stem/ViewController (0.0.27): - - Stem/Core - - Stone (0.0.2) + - Stem (0.0.31): + - Stem/AVKit (= 0.0.31) + - Stem/Core (= 0.0.31) + - Stem/Foundation (= 0.0.31) + - Stem/Fundamentals (= 0.0.31) + - Stem/NSObject (= 0.0.31) + - Stem/Runtime (= 0.0.31) + - Stem/UIKit (= 0.0.31) + - Stem/WebKit (= 0.0.31) + - Stem/AVKit (0.0.31): + - Stem/Core + - Stem/Core (0.0.31) + - Stem/Foundation (0.0.31): + - Stem/Core + - Stem/Foundation/Coder (= 0.0.31) + - Stem/Foundation/Collections (= 0.0.31) + - Stem/Foundation/Custom (= 0.0.31) + - Stem/Foundation/Date (= 0.0.31) + - Stem/Foundation/Dispatch (= 0.0.31) + - Stem/Foundation/Fundamentals (= 0.0.31) + - Stem/Foundation/pre-release (= 0.0.31) + - Stem/Foundation/String (= 0.0.31) + - Stem/Foundation/Coder (0.0.31): + - Stem/Core + - Stem/Foundation/Collections (0.0.31): + - Stem/Core + - Stem/Foundation/Custom (0.0.31): + - Stem/Core + - Stem/Foundation/Date (0.0.31): + - Stem/Core + - Stem/Foundation/Dispatch (0.0.31): + - Stem/Core + - Stem/Foundation/Fundamentals (0.0.31): + - Stem/Core + - Stem/Foundation/pre-release (0.0.31): + - Stem/Core + - Stem/Foundation/String (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/Fundamentals (0.0.31): + - Stem/Core + - Stem/NSObject (0.0.31): + - Stem/Core + - Stem/Runtime (0.0.31) + - Stem/UIKit (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Application (= 0.0.31) + - Stem/UIKit/AttributedString (= 0.0.31) + - Stem/UIKit/Color (= 0.0.31) + - Stem/UIKit/Control (= 0.0.31) + - Stem/UIKit/Custom (= 0.0.31) + - Stem/UIKit/Font (= 0.0.31) + - Stem/UIKit/GestureRecognizer (= 0.0.31) + - Stem/UIKit/Image (= 0.0.31) + - Stem/UIKit/ImageView (= 0.0.31) + - Stem/UIKit/InputView (= 0.0.31) + - Stem/UIKit/Interface (= 0.0.31) + - Stem/UIKit/Label (= 0.0.31) + - Stem/UIKit/ListView (= 0.0.31) + - Stem/UIKit/NavigationBar (= 0.0.31) + - Stem/UIKit/NSLayoutConstraint (= 0.0.31) + - Stem/UIKit/UIDevice (= 0.0.31) + - Stem/UIKit/View (= 0.0.31) + - Stem/UIKit/ViewController (= 0.0.31) + - Stem/UIKit/Application (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/AttributedString (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Color (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Control (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Custom (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Font (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/GestureRecognizer (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Image (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/ImageView (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/InputView (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Interface (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Label (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/ListView (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/Interface + - Stem/UIKit/NavigationBar (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/NSLayoutConstraint (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/UIDevice (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/View (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/UIKit/ViewController (0.0.31): + - Stem/Core + - Stem/Fundamentals + - Stem/NSObject + - Stem/Runtime + - Stem/WebKit (0.0.31): + - Stem/Core + - Stuart (0.0.1): + - Stuart/SectionView (= 0.0.1) + - Stuart/SectionView (0.0.1) - SVProgressHUD (2.2.5) - SwiftLint (0.35.0) DEPENDENCIES: - EmptyPage (from `../EmptyPage.podspec`) - - Hue - SnapKit (= 5.0.0) - - Stem (= 0.0.27) - - Stone + - "Stem (from `git@github.com:linhay/Stem.git`, branch `develop`)" + - "Stuart (from `git@github.com:linhay/Stuart.git`, branch `master`)" - SVProgressHUD - SwiftLint SPEC REPOS: - https://cdn.cocoapods.org/: - - Hue + trunk: - SnapKit - - Stem - - Stone - SVProgressHUD - SwiftLint EXTERNAL SOURCES: EmptyPage: :path: "../EmptyPage.podspec" + Stem: + :branch: develop + :git: "git@github.com:linhay/Stem.git" + Stuart: + :branch: master + :git: "git@github.com:linhay/Stuart.git" + +CHECKOUT OPTIONS: + Stem: + :commit: c7fa7ed8607342a7e6d91760e03ab29880552b30 + :git: "git@github.com:linhay/Stem.git" + Stuart: + :commit: 4fe44369e7d99d644ad2eb04711c75ae8026028e + :git: "git@github.com:linhay/Stuart.git" SPEC CHECKSUMS: EmptyPage: b85eb9d70cda567e418becd1677a41865904595b - Hue: c129cb67be7d093a82bbbc30ce8a96757bf6f37a SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf - Stem: 1b48be402f890568bfce61afd3e25c504e92a706 - Stone: ce22394d2644c843bfc93413454df098c8c630d6 + Stem: ea4aa174339e851a15619fd7d370cc3570667f6c + Stuart: b5fccbcb300fd684f248d371c7b36be7494a88b3 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 SwiftLint: 5553187048b900c91aa03552807681bb6b027846 -PODFILE CHECKSUM: 9c7af6e2cc1cac4eb61454dc887cbbf03a6393b1 +PODFILE CHECKSUM: 002741590eaee6030d7a9e6ee37c8ae6caa87b12 -COCOAPODS: 1.8.0 +COCOAPODS: 1.9.0 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 4a7d4c4..6a02f15 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -7,91 +7,83 @@ objects = { /* Begin PBXBuildFile section */ - 3A11FC21AC83E9707C991319C3987AA9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3212113385A8FBBDB272BD23C409FF61 /* Foundation.framework */; }; - DA882004CB05D5F950A5AE58431DBC3C /* Pods-EmptyPage_Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F433B4B90C62B99668FAFFFB53B40C6 /* Pods-EmptyPage_Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F54DFF5E6FD35E631B7C88EC5EB86EC8 /* Pods-EmptyPage_Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6F90B50EB0C238BE24A3AD8C23BD9 /* Pods-EmptyPage_Example-dummy.m */; }; + 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, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 21465A881F80DCBED1CF724D7DAAEDE2 /* PBXContainerItemProxy */ = { + 57F7F5C11E0F72C3FECB4E40B1386EAF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 633752051E7AF2C4E4E9E7C5B1FEAE8D /* Stem.xcodeproj */; + containerPortal = 859B26FEB7D77A57F54DD9666CE49CBD /* EmptyPage.xcodeproj */; proxyType = 1; - remoteGlobalIDString = B16A23BAAA892A38CAEC57C934EB4E7C; - remoteInfo = Stem; + remoteGlobalIDString = 54AA05B856D4484D51CE8AA0C829C97C; + remoteInfo = EmptyPage; }; - 2AC491DB5729B2D6193FEF5645FBD375 /* PBXContainerItemProxy */ = { + 691777772AA816377DF35BC3102BA468 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 068E18F00E5D397A275B47F67C71BCF9 /* Hue.xcodeproj */; + containerPortal = 324177A8B1E179000426D113349230FA /* SVProgressHUD.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 76FA599334E14703056EC01E82666053; - remoteInfo = Hue; + remoteGlobalIDString = 8A902363E0683102423DADEA0C0D4541; + remoteInfo = SVProgressHUD; }; - 489D73F38B2FB429CC1CB09A0D825C2A /* PBXContainerItemProxy */ = { + 84DD0D9B5E4CCABA42FBDEB2F2721C7F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 222AA3E12BF7D123E87B6BC98A005601 /* SwiftLint.xcodeproj */; + containerPortal = 49D5F20417C95AFA95BDF43A635917F3 /* Stem.xcodeproj */; proxyType = 1; - remoteGlobalIDString = DF739ADE66FA54F9BBFF97A8CB609E34; - remoteInfo = SwiftLint; + remoteGlobalIDString = B16A23BAAA892A38CAEC57C934EB4E7C; + remoteInfo = Stem; }; - 5AC3080400E3F1B9F0D948DEA0BBB860 /* PBXContainerItemProxy */ = { + ACD9FB2C455EAB0DD0B48F85E27FC3EA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 508AC2F29E8A5801EE068AB82AC6DCC5 /* SnapKit.xcodeproj */; + containerPortal = 845D28A47D3CF6DB776ED44F21799CAE /* Stuart.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 6913FCF4B90C224E55FE5C821AFB90D2; - remoteInfo = SnapKit; + remoteGlobalIDString = 1CC0EFE9112958F2154D85A353093896; + remoteInfo = Stuart; }; - B320BA96E797985CE70C5996A46F030C /* PBXContainerItemProxy */ = { + E521B0CC2EA367C00167DDB7D1DC9E1C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 859B26FEB7D77A57F54DD9666CE49CBD /* EmptyPage.xcodeproj */; + containerPortal = 2A09D96DE1AA834BA5FE20D85C7259E8 /* SwiftLint.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 54AA05B856D4484D51CE8AA0C829C97C; - remoteInfo = EmptyPage; - }; - D64BE0E85589AF7C04E78AAD2F4A5660 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9874F45E1782E3AA1AF953746C43A9DE /* SVProgressHUD.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8A902363E0683102423DADEA0C0D4541; - remoteInfo = SVProgressHUD; + remoteGlobalIDString = DF739ADE66FA54F9BBFF97A8CB609E34; + remoteInfo = SwiftLint; }; - DCAB2D20533B77A90FE4E301DD5EFFB5 /* PBXContainerItemProxy */ = { + FF0596A0848312DD63F50D88E951B581 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = B9E53F393E979D07FFE793F4A62DD6EA /* Stone.xcodeproj */; + containerPortal = A45D28C9D82CAFE2FB34E41D98370435 /* SnapKit.xcodeproj */; proxyType = 1; - remoteGlobalIDString = C84FC75044D64DC3B3AD85DCDFBD81EC; - remoteInfo = Stone; + remoteGlobalIDString = 6913FCF4B90C224E55FE5C821AFB90D2; + remoteInfo = SnapKit; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 068E18F00E5D397A275B47F67C71BCF9 /* Hue */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Hue; path = Hue.xcodeproj; sourceTree = ""; }; 18B44A982F5FFF2B2D1CBC88C68A107C /* Pods-EmptyPage_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-EmptyPage_Example.debug.xcconfig"; sourceTree = ""; }; - 222AA3E12BF7D123E87B6BC98A005601 /* SwiftLint */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftLint; path = SwiftLint.xcodeproj; sourceTree = ""; }; + 2A09D96DE1AA834BA5FE20D85C7259E8 /* SwiftLint */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftLint; path = SwiftLint.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 = ""; }; 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 = ""; }; - 508AC2F29E8A5801EE068AB82AC6DCC5 /* SnapKit */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SnapKit; path = SnapKit.xcodeproj; sourceTree = ""; }; 59E6F90B50EB0C238BE24A3AD8C23BD9 /* Pods-EmptyPage_Example-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-EmptyPage_Example-dummy.m"; sourceTree = ""; }; - 633752051E7AF2C4E4E9E7C5B1FEAE8D /* 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 = ""; }; - 9874F45E1782E3AA1AF953746C43A9DE /* SVProgressHUD */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SVProgressHUD; path = SVProgressHUD.xcodeproj; 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; }; - B9E53F393E979D07FFE793F4A62DD6EA /* Stone */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Stone; path = Stone.xcodeproj; sourceTree = ""; }; + A45D28C9D82CAFE2FB34E41D98370435 /* SnapKit */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SnapKit; path = SnapKit.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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 9BFBCF5355A836040FE24D8C4891AA2A /* Frameworks */ = { + 5B30C47FC6217BF9CCB7CB4EAF171B69 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3A11FC21AC83E9707C991319C3987AA9 /* Foundation.framework in Frameworks */, + 1CDC766DB39309E883DDB87DB18C32C4 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -131,19 +123,6 @@ path = "Target Support Files/Pods-EmptyPage_Example"; sourceTree = ""; }; - BAC75FC5BF1C283C1E0AF278E261BB0D /* Pods */ = { - isa = PBXGroup; - children = ( - 068E18F00E5D397A275B47F67C71BCF9 /* Hue */, - 508AC2F29E8A5801EE068AB82AC6DCC5 /* SnapKit */, - 633752051E7AF2C4E4E9E7C5B1FEAE8D /* Stem */, - B9E53F393E979D07FFE793F4A62DD6EA /* Stone */, - 9874F45E1782E3AA1AF953746C43A9DE /* SVProgressHUD */, - 222AA3E12BF7D123E87B6BC98A005601 /* SwiftLint */, - ); - name = Pods; - sourceTree = ""; - }; BDFA7A4BD570FAD5A60FA9665441EE31 /* Products */ = { isa = PBXGroup; children = ( @@ -160,13 +139,25 @@ 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 */, - BAC75FC5BF1C283C1E0AF278E261BB0D /* Pods */, + C253FBE210FD00B56F659243E2EE5CB4 /* Pods */, BDFA7A4BD570FAD5A60FA9665441EE31 /* Products */, 7DE777EC02DD5B266B38A80843D81F68 /* Targets Support Files */, ); @@ -183,11 +174,11 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 307D91BFCADD23141F74C1DF16990C65 /* Headers */ = { + E975793D8352915C4E9577364AA414D7 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - DA882004CB05D5F950A5AE58431DBC3C /* Pods-EmptyPage_Example-umbrella.h in Headers */, + 673CABEFAC89012E196DBE1642359915 /* Pods-EmptyPage_Example-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -196,23 +187,22 @@ /* Begin PBXNativeTarget section */ 0ADD6FE390D7B68C9F61EC50D7175D4E /* Pods-EmptyPage_Example */ = { isa = PBXNativeTarget; - buildConfigurationList = 234E268A1620C3051F3138F25BB5E99A /* Build configuration list for PBXNativeTarget "Pods-EmptyPage_Example" */; + buildConfigurationList = AEECECB37F35AD3114CE673A06AD9121 /* Build configuration list for PBXNativeTarget "Pods-EmptyPage_Example" */; buildPhases = ( - 307D91BFCADD23141F74C1DF16990C65 /* Headers */, - EB8221061E08097D81573C0DE6A79DD8 /* Sources */, - 9BFBCF5355A836040FE24D8C4891AA2A /* Frameworks */, - E8197D0D2D916452E28A9322855AB47E /* Resources */, + E975793D8352915C4E9577364AA414D7 /* Headers */, + 686BE66C7C8DC71064D5E966CCCF8275 /* Sources */, + 5B30C47FC6217BF9CCB7CB4EAF171B69 /* Frameworks */, + 5273FCE84764EA587864FD44D0A273BF /* Resources */, ); buildRules = ( ); dependencies = ( - E6C5B1AF5C80FA6F0904D586BFF49689 /* PBXTargetDependency */, - 7F7924D5D9BB24AC036E13FABF4C4990 /* PBXTargetDependency */, - 1E40D3F07CF2C3EAABC6D507A87E2176 /* PBXTargetDependency */, - C8062C1DC2C75CD14A3CB8AEF87F414F /* PBXTargetDependency */, - F319CD2655AE2A0C75EA0284B649D45D /* PBXTargetDependency */, - E153037FFFACECF95540AB572211E869 /* PBXTargetDependency */, - 2C3A8A5EFDCA7814456A10F689D8FE0F /* PBXTargetDependency */, + 9448B685918A8BD4B8FAD6AFDFAE79C6 /* PBXTargetDependency */, + 57B3E40A2E591027D84D64E8F827B269 /* PBXTargetDependency */, + C24E9A6F14F49081DC28B9626EABE0D8 /* PBXTargetDependency */, + 04406198182166B4AE4110F06C4089BE /* PBXTargetDependency */, + FE7B7943E9E74A3BC6FBBB0432508F07 /* PBXTargetDependency */, + 45C323EF539F96BFB72A3BEEAF091B7C /* PBXTargetDependency */, ); name = "Pods-EmptyPage_Example"; productName = "Pods-EmptyPage_Example"; @@ -234,6 +224,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = CF1408CF629C7361332E53B88F7BD30C; productRefGroup = BDFA7A4BD570FAD5A60FA9665441EE31 /* Products */; @@ -243,22 +234,19 @@ ProjectRef = 859B26FEB7D77A57F54DD9666CE49CBD /* EmptyPage */; }, { - ProjectRef = 068E18F00E5D397A275B47F67C71BCF9 /* Hue */; - }, - { - ProjectRef = 9874F45E1782E3AA1AF953746C43A9DE /* SVProgressHUD */; + ProjectRef = 324177A8B1E179000426D113349230FA /* SVProgressHUD */; }, { - ProjectRef = 508AC2F29E8A5801EE068AB82AC6DCC5 /* SnapKit */; + ProjectRef = A45D28C9D82CAFE2FB34E41D98370435 /* SnapKit */; }, { - ProjectRef = 633752051E7AF2C4E4E9E7C5B1FEAE8D /* Stem */; + ProjectRef = 49D5F20417C95AFA95BDF43A635917F3 /* Stem */; }, { - ProjectRef = B9E53F393E979D07FFE793F4A62DD6EA /* Stone */; + ProjectRef = 845D28A47D3CF6DB776ED44F21799CAE /* Stuart */; }, { - ProjectRef = 222AA3E12BF7D123E87B6BC98A005601 /* SwiftLint */; + ProjectRef = 2A09D96DE1AA834BA5FE20D85C7259E8 /* SwiftLint */; }, ); projectRoot = ""; @@ -269,7 +257,7 @@ /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - E8197D0D2D916452E28A9322855AB47E /* Resources */ = { + 5273FCE84764EA587864FD44D0A273BF /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -279,51 +267,46 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - EB8221061E08097D81573C0DE6A79DD8 /* Sources */ = { + 686BE66C7C8DC71064D5E966CCCF8275 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F54DFF5E6FD35E631B7C88EC5EB86EC8 /* Pods-EmptyPage_Example-dummy.m in Sources */, + 33A01248E012087311D1F0D8A3F10AB1 /* Pods-EmptyPage_Example-dummy.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 1E40D3F07CF2C3EAABC6D507A87E2176 /* PBXTargetDependency */ = { + 04406198182166B4AE4110F06C4089BE /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = SVProgressHUD; - targetProxy = D64BE0E85589AF7C04E78AAD2F4A5660 /* PBXContainerItemProxy */; + name = Stem; + targetProxy = 84DD0D9B5E4CCABA42FBDEB2F2721C7F /* PBXContainerItemProxy */; }; - 2C3A8A5EFDCA7814456A10F689D8FE0F /* PBXTargetDependency */ = { + 45C323EF539F96BFB72A3BEEAF091B7C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = SwiftLint; - targetProxy = 489D73F38B2FB429CC1CB09A0D825C2A /* PBXContainerItemProxy */; - }; - 7F7924D5D9BB24AC036E13FABF4C4990 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Hue; - targetProxy = 2AC491DB5729B2D6193FEF5645FBD375 /* PBXContainerItemProxy */; + targetProxy = E521B0CC2EA367C00167DDB7D1DC9E1C /* PBXContainerItemProxy */; }; - C8062C1DC2C75CD14A3CB8AEF87F414F /* PBXTargetDependency */ = { + 57B3E40A2E591027D84D64E8F827B269 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = SnapKit; - targetProxy = 5AC3080400E3F1B9F0D948DEA0BBB860 /* PBXContainerItemProxy */; + name = SVProgressHUD; + targetProxy = 691777772AA816377DF35BC3102BA468 /* PBXContainerItemProxy */; }; - E153037FFFACECF95540AB572211E869 /* PBXTargetDependency */ = { + 9448B685918A8BD4B8FAD6AFDFAE79C6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = Stone; - targetProxy = DCAB2D20533B77A90FE4E301DD5EFFB5 /* PBXContainerItemProxy */; + name = EmptyPage; + targetProxy = 57F7F5C11E0F72C3FECB4E40B1386EAF /* PBXContainerItemProxy */; }; - E6C5B1AF5C80FA6F0904D586BFF49689 /* PBXTargetDependency */ = { + C24E9A6F14F49081DC28B9626EABE0D8 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = EmptyPage; - targetProxy = B320BA96E797985CE70C5996A46F030C /* PBXContainerItemProxy */; + name = SnapKit; + targetProxy = FF0596A0848312DD63F50D88E951B581 /* PBXContainerItemProxy */; }; - F319CD2655AE2A0C75EA0284B649D45D /* PBXTargetDependency */ = { + FE7B7943E9E74A3BC6FBBB0432508F07 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = Stem; - targetProxy = 21465A881F80DCBED1CF724D7DAAEDE2 /* PBXContainerItemProxy */; + name = Stuart; + targetProxy = ACD9FB2C455EAB0DD0B48F85E27FC3EA /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -392,7 +375,7 @@ }; name = Debug; }; - 3EEE7A6E0EF4FF4B12F27DB30D1AF744 /* Debug */ = { + 97B6B5983D741B3CCD78F67B6C69B55B /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 18B44A982F5FFF2B2D1CBC88C68A107C /* Pods-EmptyPage_Example.debug.xcconfig */; buildSettings = { @@ -426,41 +409,6 @@ }; name = Debug; }; - 661CBBCF47CDFF668343D5AB827386B6 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 8AB7F9CDCA50047147BFB8682DA6CAB4 /* Pods-EmptyPage_Example.release.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CLANG_ENABLE_OBJC_WEAK = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; B01D14FDC83DCF9D4BE53066BEA96D05 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -521,23 +469,58 @@ }; name = Release; }; + B98AE5A64B3CC7E434BD0DA6F3FF53BC /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8AB7F9CDCA50047147BFB8682DA6CAB4 /* Pods-EmptyPage_Example.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-EmptyPage_Example/Pods-EmptyPage_Example.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 234E268A1620C3051F3138F25BB5E99A /* Build configuration list for PBXNativeTarget "Pods-EmptyPage_Example" */ = { + 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - 3EEE7A6E0EF4FF4B12F27DB30D1AF744 /* Debug */, - 661CBBCF47CDFF668343D5AB827386B6 /* Release */, + 196DFA3E4A09A28224918543529A1885 /* Debug */, + B01D14FDC83DCF9D4BE53066BEA96D05 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */ = { + AEECECB37F35AD3114CE673A06AD9121 /* Build configuration list for PBXNativeTarget "Pods-EmptyPage_Example" */ = { isa = XCConfigurationList; buildConfigurations = ( - 196DFA3E4A09A28224918543529A1885 /* Debug */, - B01D14FDC83DCF9D4BE53066BEA96D05 /* Release */, + 97B6B5983D741B3CCD78F67B6C69B55B /* Debug */, + B98AE5A64B3CC7E434BD0DA6F3FF53BC /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Target Support Files/Hue/Hue-Info.plist b/Example/Pods/Target Support Files/Hue/Hue-Info.plist deleted file mode 100644 index e2771ff..0000000 --- a/Example/Pods/Target Support Files/Hue/Hue-Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - ${PRODUCT_BUNDLE_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 5.0.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - - - diff --git a/Example/Pods/Target Support Files/Hue/Hue-dummy.m b/Example/Pods/Target Support Files/Hue/Hue-dummy.m deleted file mode 100644 index 32f38e2..0000000 --- a/Example/Pods/Target Support Files/Hue/Hue-dummy.m +++ /dev/null @@ -1,5 +0,0 @@ -#import -@interface PodsDummy_Hue : NSObject -@end -@implementation PodsDummy_Hue -@end diff --git a/Example/Pods/Target Support Files/Hue/Hue-prefix.pch b/Example/Pods/Target Support Files/Hue/Hue-prefix.pch deleted file mode 100644 index beb2a24..0000000 --- a/Example/Pods/Target Support Files/Hue/Hue-prefix.pch +++ /dev/null @@ -1,12 +0,0 @@ -#ifdef __OBJC__ -#import -#else -#ifndef FOUNDATION_EXPORT -#if defined(__cplusplus) -#define FOUNDATION_EXPORT extern "C" -#else -#define FOUNDATION_EXPORT extern -#endif -#endif -#endif - diff --git a/Example/Pods/Target Support Files/Hue/Hue-umbrella.h b/Example/Pods/Target Support Files/Hue/Hue-umbrella.h deleted file mode 100644 index 5c8c5b4..0000000 --- a/Example/Pods/Target Support Files/Hue/Hue-umbrella.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifdef __OBJC__ -#import -#else -#ifndef FOUNDATION_EXPORT -#if defined(__cplusplus) -#define FOUNDATION_EXPORT extern "C" -#else -#define FOUNDATION_EXPORT extern -#endif -#endif -#endif - - -FOUNDATION_EXPORT double HueVersionNumber; -FOUNDATION_EXPORT const unsigned char HueVersionString[]; - diff --git a/Example/Pods/Target Support Files/Hue/Hue.modulemap b/Example/Pods/Target Support Files/Hue/Hue.modulemap deleted file mode 100644 index 0ae5460..0000000 --- a/Example/Pods/Target Support Files/Hue/Hue.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module Hue { - umbrella header "Hue-umbrella.h" - - export * - module * { export * } -} diff --git a/Example/Pods/Target Support Files/Hue/Hue.xcconfig b/Example/Pods/Target Support Files/Hue/Hue.xcconfig deleted file mode 100644 index e01955e..0000000 --- a/Example/Pods/Target Support Files/Hue/Hue.xcconfig +++ /dev/null @@ -1,12 +0,0 @@ -CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/Hue -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -OTHER_LDFLAGS = $(inherited) -framework "UIKit" -OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -PODS_BUILD_DIR = ${BUILD_DIR} -PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_ROOT = ${SRCROOT} -PODS_TARGET_SRCROOT = ${PODS_ROOT}/Hue -PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} -SKIP_INSTALL = YES -SWIFT_VERSION = 5.0 -USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES 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 7da9538..9b5de2b 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,32 +206,6 @@ This application makes use of the following third party libraries: limitations under the License. -## Hue - -Licensed under the **MIT** license - -> Copyright (c) 2015 Hyper Interaktiv AS -> -> 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 @@ -282,7 +256,9 @@ THE SOFTWARE. ## Stem -Copyright (c) 2019 linhay +MIT License + +Copyright (c) 2020 linhey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -291,21 +267,23 @@ 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 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. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +## Stuart -## Stone +MIT License -Copyright (c) 2019 linhey <158179948@qq.com> +Copyright (c) 2020 linhey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -314,16 +292,16 @@ 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 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. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. ## SwiftLint 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 54e2e77..a4f97b3 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,38 +223,6 @@ Type PSGroupSpecifier - - FooterText - Licensed under the **MIT** license - -> Copyright (c) 2015 Hyper Interaktiv AS -> -> 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 - Hue - Type - PSGroupSpecifier - FooterText MIT License @@ -317,7 +285,9 @@ THE SOFTWARE. FooterText - Copyright (c) 2019 linhay <is.linhay@outlook.com> + MIT License + +Copyright (c) 2020 linhey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -326,16 +296,16 @@ 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 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. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. License MIT @@ -346,7 +316,9 @@ THE SOFTWARE. FooterText - Copyright (c) 2019 linhey <158179948@qq.com> + MIT License + +Copyright (c) 2020 linhey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -355,21 +327,21 @@ 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 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. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. License MIT Title - Stone + Stuart Type PSGroupSpecifier 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 22a5bfd..7a8aff9 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 @@ -46,8 +46,8 @@ install_framework() fi # Use filter instead of exclude so missing patterns don't throw errors. - echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" - rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${destination}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${destination}" local basename basename="$(basename -s .framework "$1")" @@ -84,27 +84,29 @@ install_framework() # Copies and strips a vendored dSYM install_dsym() { local source="$1" + warn_missing_arch=${2:-true} if [ -r "$source" ]; then - # Copy the dSYM into a the targets temp dir. + # Copy the dSYM into the targets temp dir. echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" local basename - basename="$(basename -s .framework.dSYM "$source")" - binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + basename="$(basename -s .dSYM "$source")" + binary_name="$(ls "$source/Contents/Resources/DWARF")" + binary="${DERIVED_FILES_DIR}/${basename}.dSYM/Contents/Resources/DWARF/${binary_name}" # Strip invalid architectures so "fat" simulator / device frameworks work on device if [[ "$(file "$binary")" == *"Mach-O "*"dSYM companion"* ]]; then - strip_invalid_archs "$binary" + strip_invalid_archs "$binary" "$warn_missing_arch" fi if [[ $STRIP_BINARY_RETVAL == 1 ]]; then # Move the stripped file into its final destination. - echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" - rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --links --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.dSYM" "${DWARF_DSYM_FOLDER_PATH}" else # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. - touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.dSYM" fi fi } @@ -135,13 +137,16 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" + warn_missing_arch=${2:-true} # Get architectures for current target binary binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" # Intersect them with the architectures we are building for intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" # If there are no archs supported by this binary then warn the user if [[ -z "$intersected_archs" ]]; then - echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + if [[ "$warn_missing_arch" == "true" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + fi STRIP_BINARY_RETVAL=0 return fi @@ -159,22 +164,51 @@ strip_invalid_archs() { STRIP_BINARY_RETVAL=1 } +install_artifact() { + artifact="$1" + base="$(basename "$artifact")" + case $base in + *.framework) + install_framework "$artifact" + ;; + *.dSYM) + # Suppress arch warnings since XCFrameworks will include many dSYM files + install_dsym "$artifact" "false" + ;; + *.bcsymbolmap) + install_bcsymbolmap "$artifact" + ;; + *) + echo "error: Unrecognized artifact "$artifact"" + ;; + esac +} + +copy_artifacts() { + file_list="$1" + while read artifact; do + install_artifact "$artifact" + done <$file_list +} + +ARTIFACT_LIST_FILE="${BUILT_PRODUCTS_DIR}/cocoapods-artifacts-${CONFIGURATION}.txt" +if [ -r "${ARTIFACT_LIST_FILE}" ]; then + copy_artifacts "${ARTIFACT_LIST_FILE}" +fi if [[ "$CONFIGURATION" == "Debug" ]]; then install_framework "${BUILT_PRODUCTS_DIR}/EmptyPage/EmptyPage.framework" - install_framework "${BUILT_PRODUCTS_DIR}/Hue/Hue.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" - install_framework "${BUILT_PRODUCTS_DIR}/Stone/Stone.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Stuart/Stuart.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then install_framework "${BUILT_PRODUCTS_DIR}/EmptyPage/EmptyPage.framework" - install_framework "${BUILT_PRODUCTS_DIR}/Hue/Hue.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" - install_framework "${BUILT_PRODUCTS_DIR}/Stone/Stone.framework" + install_framework "${BUILT_PRODUCTS_DIR}/Stuart/Stuart.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then wait 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 550e8dc..091454f 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}/Hue" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/Stem" "${PODS_CONFIGURATION_BUILD_DIR}/Stone" +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" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage/EmptyPage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.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}/Stone/Stone.framework/Headers" +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" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "EmptyPage" -framework "Hue" -framework "QuartzCore" -framework "SVProgressHUD" -framework "SnapKit" -framework "Stem" -framework "Stone" -framework "UIKit" +OTHER_LDFLAGS = $(inherited) -framework "EmptyPage" -framework "Foundation" -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 550e8dc..091454f 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}/Hue" "${PODS_CONFIGURATION_BUILD_DIR}/SVProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/Stem" "${PODS_CONFIGURATION_BUILD_DIR}/Stone" +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" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/EmptyPage/EmptyPage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/Hue/Hue.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}/Stone/Stone.framework/Headers" +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" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -framework "EmptyPage" -framework "Hue" -framework "QuartzCore" -framework "SVProgressHUD" -framework "SnapKit" -framework "Stem" -framework "Stone" -framework "UIKit" +OTHER_LDFLAGS = $(inherited) -framework "EmptyPage" -framework "Foundation" -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/Gemfile b/Gemfile index 8a036ac..f604693 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://gems.ruby-china.com" -gem 'cocoapods', '1.8.0' +gem 'cocoapods', '1.9.0' plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock index c89e871..34c6159 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,21 @@ GEM remote: https://gems.ruby-china.com/ specs: - CFPropertyList (3.0.1) + CFPropertyList (3.0.2) activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - algoliasearch (1.27.0) + algoliasearch (1.27.1) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.0) + cocoapods (1.9.0) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.0) + cocoapods-core (= 1.9.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -30,43 +30,50 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.0) + xcodeproj (>= 1.14.0, < 2.0) + cocoapods-core (1.9.0) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) - concurrent-ruby (~> 1.0) + concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) + netrc (~> 0.11) + typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.2.2) + cocoapods-downloader (1.3.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) cocoapods-stats (1.1.0) - cocoapods-trunk (1.4.0) + cocoapods-trunk (1.4.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) escape (0.0.4) + ethon (0.12.0) + ffi (>= 1.3.0) + ffi (1.12.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - json (2.2.0) - minitest (5.12.0) + json (2.3.0) + minitest (5.14.0) molinillo (0.6.6) nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) ruby-macho (1.4.0) thread_safe (0.3.6) - tzinfo (1.2.5) + typhoeus (1.3.1) + ethon (>= 0.9.0) + tzinfo (1.2.7) thread_safe (~> 0.1) - xcodeproj (1.12.0) + xcodeproj (1.15.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -77,7 +84,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.8.0) + cocoapods (= 1.9.0) BUNDLED WITH 1.17.2