diff --git a/Chameleon.xcodeproj/project.pbxproj b/Chameleon.xcodeproj/project.pbxproj index 47bf45b..40e39ae 100644 --- a/Chameleon.xcodeproj/project.pbxproj +++ b/Chameleon.xcodeproj/project.pbxproj @@ -7,32 +7,42 @@ objects = { /* Begin PBXBuildFile section */ + 0C6D34721C07B98400A7BF83 /* Chameleon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 240093F81BB4517400932727 /* Chameleon.framework */; }; + 0C6D34731C07B98400A7BF83 /* Chameleon.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 240093F81BB4517400932727 /* Chameleon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 0C8DABA81C07AC3800B28FE2 /* UIAppearance+Swift.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8DABA61C07AC3800B28FE2 /* UIAppearance+Swift.m */; }; + 0C8DABAB1C07B00000B28FE2 /* UIImage+ChameleonPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935E21BB4D62500C30559 /* UIImage+ChameleonPrivate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0C8DABAC1C07B00800B28FE2 /* UIAppearance+Swift.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C8DABA51C07AC3800B28FE2 /* UIAppearance+Swift.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0C8DABB51C07B5EA00B28FE2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8DABB41C07B5EA00B28FE2 /* main.m */; }; + 0C8DABB81C07B5EA00B28FE2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8DABB71C07B5EA00B28FE2 /* AppDelegate.m */; }; + 0C8DABBB1C07B5EA00B28FE2 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0C8DABBA1C07B5EA00B28FE2 /* ViewController.m */; }; + 0C8DABBE1C07B5EA00B28FE2 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C8DABBC1C07B5EA00B28FE2 /* Main.storyboard */; }; + 0C8DABC01C07B5EA00B28FE2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0C8DABBF1C07B5EA00B28FE2 /* Assets.xcassets */; }; + 0C8DABC31C07B5EA00B28FE2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C8DABC11C07B5EA00B28FE2 /* LaunchScreen.storyboard */; }; 240093FC1BB4517400932727 /* Chameleon.h in Headers */ = {isa = PBXBuildFile; fileRef = 240093FB1BB4517400932727 /* Chameleon.h */; settings = {ATTRIBUTES = (Public, ); }; }; 245935EC1BB4D62500C30559 /* Chameleon_.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935D41BB4D62500C30559 /* Chameleon_.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245935ED1BB4D62500C30559 /* Chameleon_.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935D51BB4D62500C30559 /* Chameleon_.m */; settings = {ASSET_TAGS = (); }; }; + 245935ED1BB4D62500C30559 /* Chameleon_.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935D51BB4D62500C30559 /* Chameleon_.m */; }; 245935EE1BB4D62500C30559 /* ChameleonConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935D61BB4D62500C30559 /* ChameleonConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245935EF1BB4D62500C30559 /* ChameleonConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935D71BB4D62500C30559 /* ChameleonConstants.m */; settings = {ASSET_TAGS = (); }; }; + 245935EF1BB4D62500C30559 /* ChameleonConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935D71BB4D62500C30559 /* ChameleonConstants.m */; }; 245935F01BB4D62500C30559 /* ChameleonEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935D81BB4D62500C30559 /* ChameleonEnums.h */; settings = {ATTRIBUTES = (Public, ); }; }; 245935F11BB4D62500C30559 /* ChameleonMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935D91BB4D62500C30559 /* ChameleonMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; 245935F21BB4D62500C30559 /* NSArray+Chameleon.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935DA1BB4D62500C30559 /* NSArray+Chameleon.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245935F31BB4D62500C30559 /* NSArray+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935DB1BB4D62500C30559 /* NSArray+Chameleon.m */; settings = {ASSET_TAGS = (); }; }; + 245935F31BB4D62500C30559 /* NSArray+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935DB1BB4D62500C30559 /* NSArray+Chameleon.m */; }; 245935F41BB4D62500C30559 /* UIButton+Chameleon.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935DC1BB4D62500C30559 /* UIButton+Chameleon.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245935F51BB4D62500C30559 /* UIButton+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935DD1BB4D62500C30559 /* UIButton+Chameleon.m */; settings = {ASSET_TAGS = (); }; }; + 245935F51BB4D62500C30559 /* UIButton+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935DD1BB4D62500C30559 /* UIButton+Chameleon.m */; }; 245935F61BB4D62500C30559 /* UIColor+Chameleon.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935DE1BB4D62500C30559 /* UIColor+Chameleon.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245935F71BB4D62500C30559 /* UIColor+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935DF1BB4D62500C30559 /* UIColor+Chameleon.m */; settings = {ASSET_TAGS = (); }; }; + 245935F71BB4D62500C30559 /* UIColor+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935DF1BB4D62500C30559 /* UIColor+Chameleon.m */; }; 245935F81BB4D62500C30559 /* UIColor+ChameleonPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935E01BB4D62500C30559 /* UIColor+ChameleonPrivate.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245935F91BB4D62500C30559 /* UIColor+ChameleonPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E11BB4D62500C30559 /* UIColor+ChameleonPrivate.m */; settings = {ASSET_TAGS = (); }; }; - 245935FA1BB4D62500C30559 /* UIImage+ChameleonPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935E21BB4D62500C30559 /* UIImage+ChameleonPrivate.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245935FB1BB4D62500C30559 /* UIImage+ChameleonPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E31BB4D62500C30559 /* UIImage+ChameleonPrivate.m */; settings = {ASSET_TAGS = (); }; }; + 245935F91BB4D62500C30559 /* UIColor+ChameleonPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E11BB4D62500C30559 /* UIColor+ChameleonPrivate.m */; }; + 245935FB1BB4D62500C30559 /* UIImage+ChameleonPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E31BB4D62500C30559 /* UIImage+ChameleonPrivate.m */; }; 245935FC1BB4D62500C30559 /* UILabel+Chameleon.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935E41BB4D62500C30559 /* UILabel+Chameleon.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245935FD1BB4D62500C30559 /* UILabel+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E51BB4D62500C30559 /* UILabel+Chameleon.m */; settings = {ASSET_TAGS = (); }; }; + 245935FD1BB4D62500C30559 /* UILabel+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E51BB4D62500C30559 /* UILabel+Chameleon.m */; }; 245935FE1BB4D62500C30559 /* UINavigationController+Chameleon.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935E61BB4D62500C30559 /* UINavigationController+Chameleon.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245935FF1BB4D62500C30559 /* UINavigationController+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E71BB4D62500C30559 /* UINavigationController+Chameleon.m */; settings = {ASSET_TAGS = (); }; }; + 245935FF1BB4D62500C30559 /* UINavigationController+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E71BB4D62500C30559 /* UINavigationController+Chameleon.m */; }; 245936001BB4D62500C30559 /* UIView+ChameleonPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935E81BB4D62500C30559 /* UIView+ChameleonPrivate.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245936011BB4D62500C30559 /* UIView+ChameleonPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E91BB4D62500C30559 /* UIView+ChameleonPrivate.m */; settings = {ASSET_TAGS = (); }; }; + 245936011BB4D62500C30559 /* UIView+ChameleonPrivate.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935E91BB4D62500C30559 /* UIView+ChameleonPrivate.m */; }; 245936021BB4D62500C30559 /* UIViewController+Chameleon.h in Headers */ = {isa = PBXBuildFile; fileRef = 245935EA1BB4D62500C30559 /* UIViewController+Chameleon.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 245936031BB4D62500C30559 /* UIViewController+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935EB1BB4D62500C30559 /* UIViewController+Chameleon.m */; settings = {ASSET_TAGS = (); }; }; - 245936051BB4D62D00C30559 /* ChameleonShorthand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 245936041BB4D62D00C30559 /* ChameleonShorthand.swift */; settings = {ASSET_TAGS = (); }; }; + 245936031BB4D62500C30559 /* UIViewController+Chameleon.m in Sources */ = {isa = PBXBuildFile; fileRef = 245935EB1BB4D62500C30559 /* UIViewController+Chameleon.m */; }; + 245936051BB4D62D00C30559 /* ChameleonShorthand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 245936041BB4D62D00C30559 /* ChameleonShorthand.swift */; }; 247EB8AA1BB61EB3009B4904 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 247EB8A91BB61EB3009B4904 /* AppDelegate.swift */; }; 247EB8AC1BB61EB3009B4904 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 247EB8AB1BB61EB3009B4904 /* ViewController.swift */; }; 247EB8AF1BB61EB3009B4904 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 247EB8AD1BB61EB3009B4904 /* Main.storyboard */; }; @@ -41,7 +51,43 @@ 247EB8B91BB61F76009B4904 /* Chameleon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 240093F81BB4517400932727 /* Chameleon.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 0C6D34741C07B98400A7BF83 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 240093EF1BB4517400932727 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 240093F71BB4517400932727; + remoteInfo = Chameleon; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 0C6D34761C07B98400A7BF83 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 0C6D34731C07B98400A7BF83 /* Chameleon.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ + 0C8DABA51C07AC3800B28FE2 /* UIAppearance+Swift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIAppearance+Swift.h"; path = "../Pod/Classes/Objective-C/UIAppearance+Swift.h"; sourceTree = ""; }; + 0C8DABA61C07AC3800B28FE2 /* UIAppearance+Swift.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIAppearance+Swift.m"; path = "../Pod/Classes/Objective-C/UIAppearance+Swift.m"; sourceTree = ""; }; + 0C8DABB11C07B5EA00B28FE2 /* ChameleonDemo-Objc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChameleonDemo-Objc.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 0C8DABB41C07B5EA00B28FE2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 0C8DABB61C07B5EA00B28FE2 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + 0C8DABB71C07B5EA00B28FE2 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + 0C8DABB91C07B5EA00B28FE2 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; + 0C8DABBA1C07B5EA00B28FE2 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; + 0C8DABBD1C07B5EA00B28FE2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 0C8DABBF1C07B5EA00B28FE2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 0C8DABC21C07B5EA00B28FE2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 0C8DABC41C07B5EA00B28FE2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 240093F81BB4517400932727 /* Chameleon.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Chameleon.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 240093FB1BB4517400932727 /* Chameleon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Chameleon.h; sourceTree = ""; }; 240093FD1BB4517400932727 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -80,6 +126,14 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 0C8DABAE1C07B5EA00B28FE2 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 0C6D34721C07B98400A7BF83 /* Chameleon.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 240093F41BB4517400932727 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -98,11 +152,36 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0C8DABB21C07B5EA00B28FE2 /* ChameleonDemo-Objc */ = { + isa = PBXGroup; + children = ( + 0C8DABB61C07B5EA00B28FE2 /* AppDelegate.h */, + 0C8DABB71C07B5EA00B28FE2 /* AppDelegate.m */, + 0C8DABB91C07B5EA00B28FE2 /* ViewController.h */, + 0C8DABBA1C07B5EA00B28FE2 /* ViewController.m */, + 0C8DABBC1C07B5EA00B28FE2 /* Main.storyboard */, + 0C8DABBF1C07B5EA00B28FE2 /* Assets.xcassets */, + 0C8DABC11C07B5EA00B28FE2 /* LaunchScreen.storyboard */, + 0C8DABC41C07B5EA00B28FE2 /* Info.plist */, + 0C8DABB31C07B5EA00B28FE2 /* Supporting Files */, + ); + path = "ChameleonDemo-Objc"; + sourceTree = ""; + }; + 0C8DABB31C07B5EA00B28FE2 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 0C8DABB41C07B5EA00B28FE2 /* main.m */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; 240093EE1BB4517400932727 = { isa = PBXGroup; children = ( 240093FA1BB4517400932727 /* Chameleon */, 247EB8A81BB61EB3009B4904 /* ChameleonDemo */, + 0C8DABB21C07B5EA00B28FE2 /* ChameleonDemo-Objc */, 240093F91BB4517400932727 /* Products */, ); sourceTree = ""; @@ -112,6 +191,7 @@ children = ( 240093F81BB4517400932727 /* Chameleon.framework */, 247EB8A71BB61EB3009B4904 /* ChameleonDemo.app */, + 0C8DABB11C07B5EA00B28FE2 /* ChameleonDemo-Objc.app */, ); name = Products; sourceTree = ""; @@ -120,6 +200,7 @@ isa = PBXGroup; children = ( 245936041BB4D62D00C30559 /* ChameleonShorthand.swift */, + 240093FB1BB4517400932727 /* Chameleon.h */, 245935D41BB4D62500C30559 /* Chameleon_.h */, 245935D51BB4D62500C30559 /* Chameleon_.m */, 245935D61BB4D62500C30559 /* ChameleonConstants.h */, @@ -144,7 +225,8 @@ 245935E91BB4D62500C30559 /* UIView+ChameleonPrivate.m */, 245935EA1BB4D62500C30559 /* UIViewController+Chameleon.h */, 245935EB1BB4D62500C30559 /* UIViewController+Chameleon.m */, - 240093FB1BB4517400932727 /* Chameleon.h */, + 0C8DABA51C07AC3800B28FE2 /* UIAppearance+Swift.h */, + 0C8DABA61C07AC3800B28FE2 /* UIAppearance+Swift.m */, 240093FD1BB4517400932727 /* Info.plist */, ); path = Chameleon; @@ -183,13 +265,33 @@ 245935EE1BB4D62500C30559 /* ChameleonConstants.h in Headers */, 245935F81BB4D62500C30559 /* UIColor+ChameleonPrivate.h in Headers */, 245936021BB4D62500C30559 /* UIViewController+Chameleon.h in Headers */, - 245935FA1BB4D62500C30559 /* UIImage+ChameleonPrivate.h in Headers */, + 0C8DABAB1C07B00000B28FE2 /* UIImage+ChameleonPrivate.h in Headers */, + 0C8DABAC1C07B00800B28FE2 /* UIAppearance+Swift.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 0C8DABB01C07B5EA00B28FE2 /* ChameleonDemo-Objc */ = { + isa = PBXNativeTarget; + buildConfigurationList = 0C8DABC51C07B5EA00B28FE2 /* Build configuration list for PBXNativeTarget "ChameleonDemo-Objc" */; + buildPhases = ( + 0C8DABAD1C07B5EA00B28FE2 /* Sources */, + 0C8DABAE1C07B5EA00B28FE2 /* Frameworks */, + 0C8DABAF1C07B5EA00B28FE2 /* Resources */, + 0C6D34761C07B98400A7BF83 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 0C6D34751C07B98400A7BF83 /* PBXTargetDependency */, + ); + name = "ChameleonDemo-Objc"; + productName = "ChameleonDemo-Objc"; + productReference = 0C8DABB11C07B5EA00B28FE2 /* ChameleonDemo-Objc.app */; + productType = "com.apple.product-type.application"; + }; 240093F71BB4517400932727 /* Chameleon */ = { isa = PBXNativeTarget; buildConfigurationList = 240094001BB4517400932727 /* Build configuration list for PBXNativeTarget "Chameleon" */; @@ -235,6 +337,9 @@ LastUpgradeCheck = 0700; ORGANIZATIONNAME = "Vicc Alexander"; TargetAttributes = { + 0C8DABB01C07B5EA00B28FE2 = { + CreatedOnToolsVersion = 7.1.1; + }; 240093F71BB4517400932727 = { CreatedOnToolsVersion = 7.0; }; @@ -258,11 +363,22 @@ targets = ( 240093F71BB4517400932727 /* Chameleon */, 247EB8A61BB61EB3009B4904 /* ChameleonDemo */, + 0C8DABB01C07B5EA00B28FE2 /* ChameleonDemo-Objc */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 0C8DABAF1C07B5EA00B28FE2 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0C8DABC31C07B5EA00B28FE2 /* LaunchScreen.storyboard in Resources */, + 0C8DABC01C07B5EA00B28FE2 /* Assets.xcassets in Resources */, + 0C8DABBE1C07B5EA00B28FE2 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 240093F61BB4517400932727 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -283,6 +399,16 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 0C8DABAD1C07B5EA00B28FE2 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0C8DABBB1C07B5EA00B28FE2 /* ViewController.m in Sources */, + 0C8DABB81C07B5EA00B28FE2 /* AppDelegate.m in Sources */, + 0C8DABB51C07B5EA00B28FE2 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 240093F31BB4517400932727 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -296,6 +422,7 @@ 245936051BB4D62D00C30559 /* ChameleonShorthand.swift in Sources */, 245936031BB4D62500C30559 /* UIViewController+Chameleon.m in Sources */, 245935FF1BB4D62500C30559 /* UINavigationController+Chameleon.m in Sources */, + 0C8DABA81C07AC3800B28FE2 /* UIAppearance+Swift.m in Sources */, 245936011BB4D62500C30559 /* UIView+ChameleonPrivate.m in Sources */, 245935ED1BB4D62500C30559 /* Chameleon_.m in Sources */, 245935F71BB4D62500C30559 /* UIColor+Chameleon.m in Sources */, @@ -313,7 +440,31 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 0C6D34751C07B98400A7BF83 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 240093F71BB4517400932727 /* Chameleon */; + targetProxy = 0C6D34741C07B98400A7BF83 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ + 0C8DABBC1C07B5EA00B28FE2 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 0C8DABBD1C07B5EA00B28FE2 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 0C8DABC11C07B5EA00B28FE2 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 0C8DABC21C07B5EA00B28FE2 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; 247EB8AD1BB61EB3009B4904 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -333,6 +484,34 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 0C8DABC61C07B5EA00B28FE2 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + INFOPLIST_FILE = "ChameleonDemo-Objc/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.viccalexander.ChameleonDemo-Objc"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 0C8DABC71C07B5EA00B28FE2 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + INFOPLIST_FILE = "ChameleonDemo-Objc/Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.viccalexander.ChameleonDemo-Objc"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 240093FE1BB4517400932727 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -488,6 +667,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 0C8DABC51C07B5EA00B28FE2 /* Build configuration list for PBXNativeTarget "ChameleonDemo-Objc" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 0C8DABC61C07B5EA00B28FE2 /* Debug */, + 0C8DABC71C07B5EA00B28FE2 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 240093F21BB4517400932727 /* Build configuration list for PBXProject "Chameleon" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Chameleon/Chameleon.h b/Chameleon/Chameleon.h index 638c0f1..9573d11 100644 --- a/Chameleon/Chameleon.h +++ b/Chameleon/Chameleon.h @@ -23,6 +23,7 @@ FOUNDATION_EXPORT const unsigned char ChameleonVersionString[]; #import "UIColor+ChameleonPrivate.h" #import "UIImage+ChameleonPrivate.h" #import "UIView+ChameleonPrivate.h" +#import "UIAppearance+Swift.h" #import "NSArray+Chameleon.h" #import "UIColor+Chameleon.h" diff --git a/ChameleonDemo-Objc/AppDelegate.h b/ChameleonDemo-Objc/AppDelegate.h new file mode 100644 index 0000000..f98b054 --- /dev/null +++ b/ChameleonDemo-Objc/AppDelegate.h @@ -0,0 +1,18 @@ +// +// AppDelegate.h +// ChameleonDemo-Objc +// +// Created by Vicc Alexander on 11/26/15. +// Copyright © 2015 Vicc Alexander. All rights reserved. +// + +#import +@import Chameleon; + +@interface AppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + + +@end + diff --git a/ChameleonDemo-Objc/AppDelegate.m b/ChameleonDemo-Objc/AppDelegate.m new file mode 100644 index 0000000..079e6e3 --- /dev/null +++ b/ChameleonDemo-Objc/AppDelegate.m @@ -0,0 +1,51 @@ +// +// AppDelegate.m +// ChameleonDemo-Objc +// +// Created by Vicc Alexander on 11/26/15. +// Copyright © 2015 Vicc Alexander. All rights reserved. +// + +#import "AppDelegate.h" + +@interface AppDelegate () + +@end + +@implementation AppDelegate + + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + + //Set global theme + //[Chameleon setGlobalThemeUsingPrimaryColor:FlatMint withSecondaryColor:FlatBlue andContentStyle:UIContentStyleContrast]; + + [Chameleon setGlobalThemeUsingPrimaryColor:FlatMint withContentStyle:UIContentStyleContrast]; + + + return YES; +} + +- (void)applicationWillResignActive:(UIApplication *)application { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. +} + +- (void)applicationDidEnterBackground:(UIApplication *)application { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. +} + +- (void)applicationWillEnterForeground:(UIApplication *)application { + // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. +} + +- (void)applicationDidBecomeActive:(UIApplication *)application { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. +} + +- (void)applicationWillTerminate:(UIApplication *)application { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. +} + +@end diff --git a/ChameleonDemo-Objc/Assets.xcassets/AppIcon.appiconset/Contents.json b/ChameleonDemo-Objc/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..118c98f --- /dev/null +++ b/ChameleonDemo-Objc/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,38 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ChameleonDemo-Objc/Base.lproj/LaunchScreen.storyboard b/ChameleonDemo-Objc/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..2e721e1 --- /dev/null +++ b/ChameleonDemo-Objc/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ChameleonDemo-Objc/Base.lproj/Main.storyboard b/ChameleonDemo-Objc/Base.lproj/Main.storyboard new file mode 100644 index 0000000..d19da11 --- /dev/null +++ b/ChameleonDemo-Objc/Base.lproj/Main.storyboard @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ChameleonDemo-Objc/Info.plist b/ChameleonDemo-Objc/Info.plist new file mode 100644 index 0000000..9f9e6e8 --- /dev/null +++ b/ChameleonDemo-Objc/Info.plist @@ -0,0 +1,42 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/ChameleonDemo-Objc/ViewController.h b/ChameleonDemo-Objc/ViewController.h new file mode 100644 index 0000000..19f22f5 --- /dev/null +++ b/ChameleonDemo-Objc/ViewController.h @@ -0,0 +1,16 @@ +// +// ViewController.h +// ChameleonDemo-Objc +// +// Created by Vicc Alexander on 11/26/15. +// Copyright © 2015 Vicc Alexander. All rights reserved. +// + +#import +@import Chameleon; + +@interface ViewController : UIViewController + + +@end + diff --git a/ChameleonDemo-Objc/ViewController.m b/ChameleonDemo-Objc/ViewController.m new file mode 100644 index 0000000..bde8350 --- /dev/null +++ b/ChameleonDemo-Objc/ViewController.m @@ -0,0 +1,32 @@ +// +// ViewController.m +// ChameleonDemo-Objc +// +// Created by Vicc Alexander on 11/26/15. +// Copyright © 2015 Vicc Alexander. All rights reserved. +// + +#import "ViewController.h" + +@interface ViewController () + +@end + +@implementation ViewController + +- (void)viewDidLoad { + + //Super + [super viewDidLoad]; + + //Set View Background + self.view.backgroundColor = FlatYellow; +} + +- (void)didReceiveMemoryWarning { + + //Super + [super didReceiveMemoryWarning]; +} + +@end diff --git a/ChameleonDemo-Objc/main.m b/ChameleonDemo-Objc/main.m new file mode 100644 index 0000000..d4ec6e3 --- /dev/null +++ b/ChameleonDemo-Objc/main.m @@ -0,0 +1,16 @@ +// +// main.m +// ChameleonDemo-Objc +// +// Created by Vicc Alexander on 11/26/15. +// Copyright © 2015 Vicc Alexander. All rights reserved. +// + +#import +#import "AppDelegate.h" + +int main(int argc, char * argv[]) { + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/ChameleonDemo/Base.lproj/Main.storyboard b/ChameleonDemo/Base.lproj/Main.storyboard index aeadfff..a483fab 100644 --- a/ChameleonDemo/Base.lproj/Main.storyboard +++ b/ChameleonDemo/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + diff --git a/ChameleonDemo/Info.plist b/ChameleonDemo/Info.plist index 40c6215..fafee17 100644 --- a/ChameleonDemo/Info.plist +++ b/ChameleonDemo/Info.plist @@ -43,5 +43,7 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UIViewControllerBasedStatusBarAppearance + diff --git a/ChameleonDemo/ViewController.swift b/ChameleonDemo/ViewController.swift index c550f12..9470986 100644 --- a/ChameleonDemo/ViewController.swift +++ b/ChameleonDemo/ViewController.swift @@ -17,6 +17,4 @@ class ViewController: UIViewController { view.backgroundColor = FlatYellow() } - } - diff --git a/Pod/Classes/Objective-C/Chameleon.h b/Pod/Classes/Objective-C/Chameleon.h index 638c0f1..9573d11 100644 --- a/Pod/Classes/Objective-C/Chameleon.h +++ b/Pod/Classes/Objective-C/Chameleon.h @@ -23,6 +23,7 @@ FOUNDATION_EXPORT const unsigned char ChameleonVersionString[]; #import "UIColor+ChameleonPrivate.h" #import "UIImage+ChameleonPrivate.h" #import "UIView+ChameleonPrivate.h" +#import "UIAppearance+Swift.h" #import "NSArray+Chameleon.h" #import "UIColor+Chameleon.h" diff --git a/Pod/Classes/Objective-C/Chameleon_.m b/Pod/Classes/Objective-C/Chameleon_.m index 6dba813..4aab5a2 100644 --- a/Pod/Classes/Objective-C/Chameleon_.m +++ b/Pod/Classes/Objective-C/Chameleon_.m @@ -9,6 +9,7 @@ #import "Chameleon_.h" #import "UILabel+Chameleon.h" #import "UIButton+Chameleon.h" +#import "UIAppearance+Swift.h" @implementation Chameleon @@ -344,11 +345,18 @@ + (void)customizeImagePickerControllerWithPrimaryColor:(UIColor *)primaryColor w } } - [[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UIView class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; - [[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UIView class],[UIImagePickerController class]]] setTintColor:contentColor]; - [[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; - [[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class],[UIImagePickerController class]]] setTintColor:contentColor]; - [[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UITableViewCell class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + //Workaround for Swift http://stackoverflow.com/a/28765193 + [[UIButton appearanceWhenContainedWithin:@[[UIView class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + [[UIButton appearanceWhenContainedWithin:@[[UIView class],[UIImagePickerController class]]] setTintColor:ClearColor]; + [[UIButton appearanceWhenContainedWithin:@[[UINavigationBar class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + [[UIButton appearanceWhenContainedWithin:@[[UINavigationBar class],[UIImagePickerController class]]] setTintColor:contentColor]; + [[UIButton appearanceWhenContainedWithin:@[[UITableViewCell class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UIView class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UIView class],[UIImagePickerController class]]] setTintColor:contentColor]; + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class],[UIImagePickerController class]]] setTintColor:contentColor]; + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UITableViewCell class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; } diff --git a/Pod/Classes/Objective-C/UIAppearance+Swift.h b/Pod/Classes/Objective-C/UIAppearance+Swift.h new file mode 100644 index 0000000..2d43ceb --- /dev/null +++ b/Pod/Classes/Objective-C/UIAppearance+Swift.h @@ -0,0 +1,17 @@ +// +// UIAppearance+Swift.h +// Chameleon +// +// Created by Vicc Alexander on 11/26/15. +// Copyright © 2015 Vicc Alexander. All rights reserved. +// + +#import + +@interface UIView (UIViewAppearance_Swift) + +// @param containers An array of Class < UIAppearanceContainer > +// http://stackoverflow.com/a/28765193 ++ (instancetype)appearanceWhenContainedWithin:(NSArray *)containers; + +@end \ No newline at end of file diff --git a/Pod/Classes/Objective-C/UIAppearance+Swift.m b/Pod/Classes/Objective-C/UIAppearance+Swift.m new file mode 100644 index 0000000..d0854a1 --- /dev/null +++ b/Pod/Classes/Objective-C/UIAppearance+Swift.m @@ -0,0 +1,32 @@ +// +// UIAppearance+Swift.m +// Chameleon +// +// Created by Vicc Alexander on 11/26/15. +// Copyright © 2015 Vicc Alexander. All rights reserved. +// + +#import "UIAppearance+Swift.h" + +@implementation UIView (UIViewAppearance_Swift) + ++ (instancetype)appearanceWhenContainedWithin: (NSArray *)containers { + + NSUInteger count = containers.count; + NSAssert(count <= 10, @"The count of containers greater than 10 is not supported."); + + return [self appearanceWhenContainedIn: + count > 0 ? containers[0] : nil, + count > 1 ? containers[1] : nil, + count > 2 ? containers[2] : nil, + count > 3 ? containers[3] : nil, + count > 4 ? containers[4] : nil, + count > 5 ? containers[5] : nil, + count > 6 ? containers[6] : nil, + count > 7 ? containers[7] : nil, + count > 8 ? containers[8] : nil, + count > 9 ? containers[9] : nil, + nil]; +} + +@end diff --git a/Pod/Classes/Objective-C/UIViewController+Chameleon.m b/Pod/Classes/Objective-C/UIViewController+Chameleon.m index 394edd5..3fab805 100644 --- a/Pod/Classes/Objective-C/UIViewController+Chameleon.m +++ b/Pod/Classes/Objective-C/UIViewController+Chameleon.m @@ -19,6 +19,7 @@ #import "UIView+ChameleonPrivate.h" #import "UILabel+Chameleon.h" #import "UIButton+Chameleon.h" +#import "UIAppearance+Swift.h" @interface UIViewController () @@ -173,6 +174,7 @@ - (void)setThemeUsingPrimaryColor:(UIColor *)primaryColor [[self class] customizeSwitchWithPrimaryColor:primaryColor]; [[self class] customizeTabBarWithBarTintColor:FlatWhite andTintColor:primaryColor]; [[self class] customizeToolbarWithPrimaryColor:primaryColor withContentStyle:contentStyle]; + [[self class] customizeImagePickerControllerWithPrimaryColor:primaryColor withContentStyle:contentStyle]; } - (void)setThemeUsingPrimaryColor:(UIColor *)primaryColor @@ -208,6 +210,7 @@ - (void)setThemeUsingPrimaryColor:(UIColor *)primaryColor [[self class] customizeSwitchWithPrimaryColor:primaryColor andSecondaryColor:secondaryColor]; [[self class] customizeTabBarWithBarTintColor:FlatWhite andTintColor:primaryColor]; [[self class] customizeToolbarWithPrimaryColor:primaryColor withContentStyle:contentStyle]; + [[self class] customizeImagePickerControllerWithPrimaryColor:primaryColor withContentStyle:contentStyle]; } - (void)setThemeUsingPrimaryColor:(UIColor *)primaryColor @@ -247,6 +250,7 @@ - (void)setThemeUsingPrimaryColor:(UIColor *)primaryColor [[self class] customizeSwitchWithPrimaryColor:primaryColor andSecondaryColor:secondaryColor]; [[self class] customizeTabBarWithBarTintColor:FlatWhite andTintColor:primaryColor]; [[self class] customizeToolbarWithPrimaryColor:primaryColor withContentStyle:contentStyle]; + [[self class] customizeImagePickerControllerWithPrimaryColor:primaryColor withContentStyle:contentStyle]; } #pragma mark - UIBarButtonItem @@ -410,6 +414,44 @@ + (void)customizeButtonWithPrimaryColor:(UIColor *)primaryColor } +#pragma mark - UIImagePickerController + ++ (void)customizeImagePickerControllerWithPrimaryColor:(UIColor *)primaryColor withContentStyle:(UIContentStyle)contentStyle { + + UIColor *contentColor; + switch (contentStyle) { + case UIContentStyleContrast: { + contentColor = ContrastColor(primaryColor, NO); + break; + } + case UIContentStyleLight: { + contentColor = [UIColor whiteColor]; + break; + } + case UIContentStyleDark: { + contentColor = FlatBlackDark; + break; + } + default: { + contentColor = ContrastColor(primaryColor, NO); + break; + } + } + + //Workaround for Swift http://stackoverflow.com/a/28765193 + [[UIButton appearanceWhenContainedWithin:@[[UIView class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + [[UIButton appearanceWhenContainedWithin:@[[UIView class],[UIImagePickerController class]]] setTintColor:ClearColor]; + [[UIButton appearanceWhenContainedWithin:@[[UINavigationBar class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + [[UIButton appearanceWhenContainedWithin:@[[UINavigationBar class],[UIImagePickerController class]]] setTintColor:contentColor]; + [[UIButton appearanceWhenContainedWithin:@[[UITableViewCell class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UIView class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UIView class],[UIImagePickerController class]]] setTintColor:contentColor]; + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class],[UIImagePickerController class]]] setTintColor:contentColor]; + //[[UIButton appearanceWhenContainedInInstancesOfClasses:@[[UITableViewCell class],[UIImagePickerController class]]] setBackgroundColor:ClearColor]; +} + #pragma mark - UILabel + (void)customizeLabelWithPrimaryColor:(UIColor *)primaryColor diff --git a/Pod/Classes/Swift/ChameleonShorthand.swift b/Pod/Classes/Swift/ChameleonShorthand.swift index 7e8b21c..ed333ea 100755 --- a/Pod/Classes/Swift/ChameleonShorthand.swift +++ b/Pod/Classes/Swift/ChameleonShorthand.swift @@ -61,7 +61,7 @@ public func RandomFlatColorWithShade(shade: UIShadeStyle) -> UIColor { - returns: A UIColor object in the HSB colorspace. */ -public func ContrastColorOf(backgroundColor: UIColor, _ returnFlat: Bool) -> UIColor { +public func ContrastColorOf(backgroundColor: UIColor, returnFlat: Bool) -> UIColor { return UIColor(contrastingBlackOrWhiteColorOn: backgroundColor, isFlat: returnFlat) } @@ -74,7 +74,7 @@ public func ContrastColorOf(backgroundColor: UIColor, _ returnFlat: Bool) -> UIC - returns: A UIColor object using colorWithPattern. */ -public func GradientColor(gradientStyle: UIGradientStyle, _ frame: CGRect, _ colors: [UIColor]) -> UIColor { +public func GradientColor(gradientStyle: UIGradientStyle, frame: CGRect, colors: [UIColor]) -> UIColor { return UIColor(gradientStyle: gradientStyle, withFrame: frame, andColors: colors) } @@ -106,7 +106,7 @@ Generates and creates an array of 5 color objects in the HSB colorspace from the - returns: An array of 5 color objects in the HSB colorspace. */ -public func ColorSchemeOf(colorSchemeType:ColorScheme, _ color:UIColor, _ isFlatScheme:Bool) -> [UIColor] { +public func ColorSchemeOf(colorSchemeType:ColorScheme, color:UIColor, isFlatScheme:Bool) -> [UIColor] { return NSArray(ofColorsWithColorScheme: colorSchemeType, usingColor: color, withFlatScheme: isFlatScheme) as! [UIColor] } @@ -118,7 +118,7 @@ Generates and creates an array of 5 color objects in the HSB colorspace that app - returns: An array of 5 color objects in the HSB colorspace. */ -public func ColorsFromImage(image: UIImage, _ withFlatScheme: Bool) -> [UIColor] { +public func ColorsFromImage(image: UIImage, withFlatScheme: Bool) -> [UIColor] { // TODO: Remove forced casting return NSArray(ofColorsFromImage: UIImage(), withFlatScheme: true) as! [UIColor] }