diff --git a/Cocoapods/KnightWatson.podspec b/Cocoapods/KnightWatson.podspec index 17f5bc3..fe52846 100644 --- a/Cocoapods/KnightWatson.podspec +++ b/Cocoapods/KnightWatson.podspec @@ -6,7 +6,7 @@ Pod::Spec.new do |spec| spec.homepage = 'https://github.com/coppercash/KnightWatson' spec.author = { 'CopperCash' => 'coderdreamer@gmail.com' } spec.source = { :git => 'https://github.com/coppercash/KnightWatson.git', :tag => spec.version } - spec.source_files = 'KNWTheme/*.{h,m}', 'KNWTheme/Arguments/*.{h,m}' + spec.source_files = 'KNWTheme/*.{h,m}' spec.exclude_files = 'KNWTheme/KNWTheme.h' spec.requires_arc = true spec.platform = :ios, "7.0" diff --git a/Demo/KNWThemeDemo/KNWThemeDemo.xcodeproj/project.pbxproj b/Demo/KNWThemeDemo/KNWThemeDemo.xcodeproj/project.pbxproj index f72a39a..8c13cf1 100644 --- a/Demo/KNWThemeDemo/KNWThemeDemo.xcodeproj/project.pbxproj +++ b/Demo/KNWThemeDemo/KNWThemeDemo.xcodeproj/project.pbxproj @@ -14,14 +14,12 @@ BE2A93921C9D0A700036E2F8 /* NSDictionary+KNWObjectArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = BE2A93911C9D0A700036E2F8 /* NSDictionary+KNWObjectArgument.m */; }; BE2A93951C9D0F430036E2F8 /* NSLayoutConstraint+Convenient.m in Sources */ = {isa = PBXBuildFile; fileRef = BE2A93941C9D0F430036E2F8 /* NSLayoutConstraint+Convenient.m */; }; BE2A93981C9D34B90036E2F8 /* UIColor+LightAndDark.m in Sources */ = {isa = PBXBuildFile; fileRef = BE2A93971C9D34B90036E2F8 /* UIColor+LightAndDark.m */; }; - BE2A939B1C9D41040036E2F8 /* KNWAUIImage.m in Sources */ = {isa = PBXBuildFile; fileRef = BE2A939A1C9D41040036E2F8 /* KNWAUIImage.m */; }; BED35CA51C8B1B2900B7F298 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BED35CA41C8B1B2900B7F298 /* main.m */; }; BED35CA81C8B1B2900B7F298 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = BED35CA71C8B1B2900B7F298 /* AppDelegate.m */; }; BED35CAB1C8B1B2900B7F298 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BED35CAA1C8B1B2900B7F298 /* ViewController.m */; }; BED35CAE1C8B1B2900B7F298 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BED35CAC1C8B1B2900B7F298 /* Main.storyboard */; }; BED35CB01C8B1B2900B7F298 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BED35CAF1C8B1B2900B7F298 /* Assets.xcassets */; }; BED35CB31C8B1B2900B7F298 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BED35CB11C8B1B2900B7F298 /* LaunchScreen.storyboard */; }; - BEF893FD1CA0309700CF5E22 /* KNWACGColorRef.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF893FC1CA0309700CF5E22 /* KNWACGColorRef.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -39,8 +37,6 @@ BE2A93941C9D0F430036E2F8 /* NSLayoutConstraint+Convenient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSLayoutConstraint+Convenient.m"; sourceTree = ""; }; BE2A93961C9D34B90036E2F8 /* UIColor+LightAndDark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+LightAndDark.h"; sourceTree = ""; }; BE2A93971C9D34B90036E2F8 /* UIColor+LightAndDark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+LightAndDark.m"; sourceTree = ""; }; - BE2A93991C9D41040036E2F8 /* KNWAUIImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KNWAUIImage.h; sourceTree = ""; }; - BE2A939A1C9D41040036E2F8 /* KNWAUIImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWAUIImage.m; sourceTree = ""; }; BED35CA01C8B1B2900B7F298 /* KNWThemeDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KNWThemeDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; BED35CA41C8B1B2900B7F298 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; BED35CA61C8B1B2900B7F298 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -51,8 +47,6 @@ BED35CAF1C8B1B2900B7F298 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; BED35CB21C8B1B2900B7F298 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; BED35CB41C8B1B2900B7F298 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BEF893FB1CA0309700CF5E22 /* KNWACGColorRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KNWACGColorRef.h; sourceTree = ""; }; - BEF893FC1CA0309700CF5E22 /* KNWACGColorRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWACGColorRef.m; sourceTree = ""; }; D7BBD4D2C0E88369407F448D /* Pods-KNWThemeDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KNWThemeDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-KNWThemeDemo/Pods-KNWThemeDemo.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -96,10 +90,6 @@ BE2A93941C9D0F430036E2F8 /* NSLayoutConstraint+Convenient.m */, BE2A93961C9D34B90036E2F8 /* UIColor+LightAndDark.h */, BE2A93971C9D34B90036E2F8 /* UIColor+LightAndDark.m */, - BE2A93991C9D41040036E2F8 /* KNWAUIImage.h */, - BE2A939A1C9D41040036E2F8 /* KNWAUIImage.m */, - BEF893FB1CA0309700CF5E22 /* KNWACGColorRef.h */, - BEF893FC1CA0309700CF5E22 /* KNWACGColorRef.m */, BE231E931C9EEEB70082F3C8 /* NSValue+KNWTheme.h */, BE231E941C9EEEB70082F3C8 /* NSValue+KNWTheme.m */, BE231E901C9ED7000082F3C8 /* UIColor+Hex.h */, @@ -274,9 +264,7 @@ files = ( BED35CAB1C8B1B2900B7F298 /* ViewController.m in Sources */, BE231E951C9EEEB70082F3C8 /* NSValue+KNWTheme.m in Sources */, - BEF893FD1CA0309700CF5E22 /* KNWACGColorRef.m in Sources */, BE2A93921C9D0A700036E2F8 /* NSDictionary+KNWObjectArgument.m in Sources */, - BE2A939B1C9D41040036E2F8 /* KNWAUIImage.m in Sources */, BE2A93951C9D0F430036E2F8 /* NSLayoutConstraint+Convenient.m in Sources */, BE231E921C9ED7000082F3C8 /* UIColor+Hex.m in Sources */, BE2A93981C9D34B90036E2F8 /* UIColor+LightAndDark.m in Sources */, diff --git a/Demo/KNWThemeDemo/Source/KNWACGColorRef.h b/Demo/KNWThemeDemo/Source/KNWACGColorRef.h deleted file mode 100644 index f2b1c06..0000000 --- a/Demo/KNWThemeDemo/Source/KNWACGColorRef.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// KNWACGColorRef.h -// KNWThemeDemo -// -// Created by William on 3/21/16. -// Copyright © 2016 coppercash. All rights reserved. -// - -#import -#import - -@class UIColor; - -@interface KNWACGColorRef : NSObject - -@property (readonly, strong, nonatomic) NSDictionary *colorsByTheme; -- (instancetype)initWithColorsByTheme:(NSDictionary *)colors; - -@end diff --git a/Demo/KNWThemeDemo/Source/KNWACGColorRef.m b/Demo/KNWThemeDemo/Source/KNWACGColorRef.m deleted file mode 100644 index 3a1b2b4..0000000 --- a/Demo/KNWThemeDemo/Source/KNWACGColorRef.m +++ /dev/null @@ -1,33 +0,0 @@ -// -// KNWACGColorRef.m -// KNWThemeDemo -// -// Created by William on 3/21/16. -// Copyright © 2016 coppercash. All rights reserved. -// - -#import "KNWACGColorRef.h" -#import -#import -#import - -@implementation KNWACGColorRef - -- (instancetype)initWithColorsByTheme:(NSDictionary *)colors { - if (self = [super init]) { - _colorsByTheme = colors; - } - return self; -} - -- (void)knw_invocation:(NSInvocation *)invocation - setArgumentAtIndex:(NSUInteger)index - withThemeContext:(KNWThemeContext *)context -{ - CGColorRef - color = _colorsByTheme[context.theme].CGColor; - [invocation setArgument:&color - atIndex:index]; -} - -@end diff --git a/Demo/KNWThemeDemo/Source/KNWAUIImage.h b/Demo/KNWThemeDemo/Source/KNWAUIImage.h deleted file mode 100644 index 711c8fd..0000000 --- a/Demo/KNWThemeDemo/Source/KNWAUIImage.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// KNWAUIImage.h -// KNWThemeDemo -// -// Created by William on 3/19/16. -// Copyright © 2016 coppercash. All rights reserved. -// - -#import -#import - -@interface KNWAUIImage : NSObject - -@property (strong, readonly, nonatomic) NSDictionary *imageNamesByTheme; -- (instancetype)initWithImageNamesByTheme:(NSDictionary *)names; - -@end diff --git a/Demo/KNWThemeDemo/Source/KNWAUIImage.m b/Demo/KNWThemeDemo/Source/KNWAUIImage.m deleted file mode 100644 index 8440f44..0000000 --- a/Demo/KNWThemeDemo/Source/KNWAUIImage.m +++ /dev/null @@ -1,28 +0,0 @@ -// -// KNWAUIImage.m -// KNWThemeDemo -// -// Created by William on 3/19/16. -// Copyright © 2016 coppercash. All rights reserved. -// - -#import "KNWAUIImage.h" -#import -#import - -@implementation KNWAUIImage - -- (instancetype)initWithImageNamesByTheme:(NSDictionary *)names -{ - if (self = [super init]) { - _imageNamesByTheme = names; - } - return self; -} - -- (id)knw_valueWithThemeContext:(KNWThemeContext *)context -{ - return [UIImage imageNamed:_imageNamesByTheme[context.theme]]; -} - -@end diff --git a/KNWTheme.xcodeproj/project.pbxproj b/KNWTheme.xcodeproj/project.pbxproj index 09a1b54..4fbefcf 100644 --- a/KNWTheme.xcodeproj/project.pbxproj +++ b/KNWTheme.xcodeproj/project.pbxproj @@ -17,14 +17,6 @@ BE51E4161C40A16B00691F0D /* NSInvocation+KNWTheme.m in Sources */ = {isa = PBXBuildFile; fileRef = BE51E40A1C40A16B00691F0D /* NSInvocation+KNWTheme.m */; }; BE51E4171C40A16B00691F0D /* NSObject+KNWThemable.h in Headers */ = {isa = PBXBuildFile; fileRef = BE51E40B1C40A16B00691F0D /* NSObject+KNWThemable.h */; }; BE51E4181C40A16B00691F0D /* NSObject+KNWThemable.m in Sources */ = {isa = PBXBuildFile; fileRef = BE51E40C1C40A16B00691F0D /* NSObject+KNWThemable.m */; }; - BE5531EE1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.h in Headers */ = {isa = PBXBuildFile; fileRef = BE5531EA1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.h */; }; - BE5531EF1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5531EB1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.m */; }; - BE5531F01CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.h in Headers */ = {isa = PBXBuildFile; fileRef = BE5531EC1CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.h */; }; - BE5531F11CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5531ED1CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.m */; }; - BE5531F61CA2E69800871C73 /* KNWACGColorRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BE5531F21CA2E69800871C73 /* KNWACGColorRef.h */; }; - BE5531F71CA2E69800871C73 /* KNWACGColorRef.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5531F31CA2E69800871C73 /* KNWACGColorRef.m */; }; - BE5531F81CA2E69800871C73 /* KNWAUIImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BE5531F41CA2E69800871C73 /* KNWAUIImage.h */; }; - BE5531F91CA2E69800871C73 /* KNWAUIImage.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5531F51CA2E69800871C73 /* KNWAUIImage.m */; }; BEB2C12E1C79959500FD3DF4 /* KNWThemedObjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB2C12D1C79959500FD3DF4 /* KNWThemedObjectTests.m */; }; BEB2C1301C799CD000FD3DF4 /* KNWArgument.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB2C12F1C799CD000FD3DF4 /* KNWArgument.h */; }; BEB2C1371C799EC100FD3DF4 /* NSDictionary+KNWObjectArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB2C1361C799EC100FD3DF4 /* NSDictionary+KNWObjectArgument.m */; }; @@ -32,6 +24,14 @@ BEB2C13D1C79ADD900FD3DF4 /* KNWThemedArgument.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB2C13B1C79ADD900FD3DF4 /* KNWThemedArgument.h */; }; BEB2C13E1C79ADD900FD3DF4 /* KNWThemedArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB2C13C1C79ADD900FD3DF4 /* KNWThemedArgument.m */; }; BEB2C1411C79B7EE00FD3DF4 /* KNWThemedArgumentTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB2C1401C79B7EE00FD3DF4 /* KNWThemedArgumentTests.m */; }; + BEB2C4D01CA4356700AA4034 /* KNWACGColorRef.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB2C4C81CA4356700AA4034 /* KNWACGColorRef.h */; }; + BEB2C4D11CA4356700AA4034 /* KNWACGColorRef.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB2C4C91CA4356700AA4034 /* KNWACGColorRef.m */; }; + BEB2C4D21CA4356700AA4034 /* KNWAUIImage.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB2C4CA1CA4356700AA4034 /* KNWAUIImage.h */; }; + BEB2C4D31CA4356700AA4034 /* KNWAUIImage.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB2C4CB1CA4356700AA4034 /* KNWAUIImage.m */; }; + BEB2C4D41CA4356700AA4034 /* NSArray+KNWObjectArgument.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB2C4CC1CA4356700AA4034 /* NSArray+KNWObjectArgument.h */; }; + BEB2C4D51CA4356700AA4034 /* NSArray+KNWObjectArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB2C4CD1CA4356700AA4034 /* NSArray+KNWObjectArgument.m */; }; + BEB2C4D61CA4356700AA4034 /* NSDictionary+KNWObjectArgument.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB2C4CE1CA4356700AA4034 /* NSDictionary+KNWObjectArgument.h */; }; + BEB2C4D71CA4356700AA4034 /* NSDictionary+KNWObjectArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB2C4CF1CA4356700AA4034 /* NSDictionary+KNWObjectArgument.m */; }; BEB5649F1C5E087700FB7434 /* KNWThemedInvocation.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB5649D1C5E087700FB7434 /* KNWThemedInvocation.h */; }; BEB564A01C5E087700FB7434 /* KNWThemedInvocation.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB5649E1C5E087700FB7434 /* KNWThemedInvocation.m */; }; BEC7DD3D1C42AAE8005A0955 /* KNWNonObjectArgumentsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC7DD3C1C42AAE8005A0955 /* KNWNonObjectArgumentsTests.m */; }; @@ -61,14 +61,6 @@ BE51E40A1C40A16B00691F0D /* NSInvocation+KNWTheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSInvocation+KNWTheme.m"; sourceTree = ""; }; BE51E40B1C40A16B00691F0D /* NSObject+KNWThemable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+KNWThemable.h"; sourceTree = ""; }; BE51E40C1C40A16B00691F0D /* NSObject+KNWThemable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+KNWThemable.m"; sourceTree = ""; }; - BE5531EA1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+KNWObjectArgument.h"; sourceTree = ""; }; - BE5531EB1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+KNWObjectArgument.m"; sourceTree = ""; }; - BE5531EC1CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+KNWObjectArgument.h"; sourceTree = ""; }; - BE5531ED1CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+KNWObjectArgument.m"; sourceTree = ""; }; - BE5531F21CA2E69800871C73 /* KNWACGColorRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KNWACGColorRef.h; sourceTree = ""; }; - BE5531F31CA2E69800871C73 /* KNWACGColorRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWACGColorRef.m; sourceTree = ""; }; - BE5531F41CA2E69800871C73 /* KNWAUIImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KNWAUIImage.h; sourceTree = ""; }; - BE5531F51CA2E69800871C73 /* KNWAUIImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWAUIImage.m; sourceTree = ""; }; BEB2C12D1C79959500FD3DF4 /* KNWThemedObjectTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWThemedObjectTests.m; sourceTree = ""; }; BEB2C12F1C799CD000FD3DF4 /* KNWArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KNWArgument.h; sourceTree = ""; }; BEB2C1351C799EC100FD3DF4 /* NSDictionary+KNWObjectArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+KNWObjectArgument.h"; sourceTree = ""; }; @@ -78,6 +70,14 @@ BEB2C13B1C79ADD900FD3DF4 /* KNWThemedArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KNWThemedArgument.h; sourceTree = ""; }; BEB2C13C1C79ADD900FD3DF4 /* KNWThemedArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWThemedArgument.m; sourceTree = ""; }; BEB2C1401C79B7EE00FD3DF4 /* KNWThemedArgumentTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWThemedArgumentTests.m; sourceTree = ""; }; + BEB2C4C81CA4356700AA4034 /* KNWACGColorRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KNWACGColorRef.h; sourceTree = ""; }; + BEB2C4C91CA4356700AA4034 /* KNWACGColorRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWACGColorRef.m; sourceTree = ""; }; + BEB2C4CA1CA4356700AA4034 /* KNWAUIImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KNWAUIImage.h; sourceTree = ""; }; + BEB2C4CB1CA4356700AA4034 /* KNWAUIImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWAUIImage.m; sourceTree = ""; }; + BEB2C4CC1CA4356700AA4034 /* NSArray+KNWObjectArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+KNWObjectArgument.h"; sourceTree = ""; }; + BEB2C4CD1CA4356700AA4034 /* NSArray+KNWObjectArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+KNWObjectArgument.m"; sourceTree = ""; }; + BEB2C4CE1CA4356700AA4034 /* NSDictionary+KNWObjectArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+KNWObjectArgument.h"; sourceTree = ""; }; + BEB2C4CF1CA4356700AA4034 /* NSDictionary+KNWObjectArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+KNWObjectArgument.m"; sourceTree = ""; }; BEB5649D1C5E087700FB7434 /* KNWThemedInvocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KNWThemedInvocation.h; sourceTree = ""; }; BEB5649E1C5E087700FB7434 /* KNWThemedInvocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWThemedInvocation.m; sourceTree = ""; }; BEC7DD3C1C42AAE8005A0955 /* KNWNonObjectArgumentsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KNWNonObjectArgumentsTests.m; sourceTree = ""; }; @@ -108,21 +108,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - BE5531E91CA2E5BF00871C73 /* Arguments */ = { - isa = PBXGroup; - children = ( - BE5531F21CA2E69800871C73 /* KNWACGColorRef.h */, - BE5531F31CA2E69800871C73 /* KNWACGColorRef.m */, - BE5531F41CA2E69800871C73 /* KNWAUIImage.h */, - BE5531F51CA2E69800871C73 /* KNWAUIImage.m */, - BE5531EA1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.h */, - BE5531EB1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.m */, - BE5531EC1CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.h */, - BE5531ED1CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.m */, - ); - path = Arguments; - sourceTree = ""; - }; BEB2C1341C799EB400FD3DF4 /* Utils */ = { isa = PBXGroup; children = ( @@ -134,6 +119,21 @@ path = Utils; sourceTree = ""; }; + BEB2C4D81CA4356C00AA4034 /* Arguments */ = { + isa = PBXGroup; + children = ( + BEB2C4C81CA4356700AA4034 /* KNWACGColorRef.h */, + BEB2C4C91CA4356700AA4034 /* KNWACGColorRef.m */, + BEB2C4CA1CA4356700AA4034 /* KNWAUIImage.h */, + BEB2C4CB1CA4356700AA4034 /* KNWAUIImage.m */, + BEB2C4CC1CA4356700AA4034 /* NSArray+KNWObjectArgument.h */, + BEB2C4CD1CA4356700AA4034 /* NSArray+KNWObjectArgument.m */, + BEB2C4CE1CA4356700AA4034 /* NSDictionary+KNWObjectArgument.h */, + BEB2C4CF1CA4356700AA4034 /* NSDictionary+KNWObjectArgument.m */, + ); + name = Arguments; + sourceTree = ""; + }; BEC95E261C32BE7600BA7237 = { isa = PBXGroup; children = ( @@ -155,7 +155,7 @@ BEC95E321C32BE7600BA7237 /* KNWTheme */ = { isa = PBXGroup; children = ( - BE5531E91CA2E5BF00871C73 /* Arguments */, + BEB2C4D81CA4356C00AA4034 /* Arguments */, BEC95E331C32BE7600BA7237 /* KNWTheme.h */, BE2A938B1C9CFFC60036E2F8 /* KnightWatson.h */, BE51E4031C40A16B00691F0D /* KNWThemeContext.h */, @@ -197,18 +197,18 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + BEB2C4D21CA4356700AA4034 /* KNWAUIImage.h in Headers */, BE51E4171C40A16B00691F0D /* NSObject+KNWThemable.h in Headers */, BEC95E341C32BE7600BA7237 /* KNWTheme.h in Headers */, BE51E40F1C40A16B00691F0D /* KNWThemeContext.h in Headers */, BEB2C13D1C79ADD900FD3DF4 /* KNWThemedArgument.h in Headers */, BE2A938C1C9CFFC60036E2F8 /* KnightWatson.h in Headers */, - BE5531F61CA2E69800871C73 /* KNWACGColorRef.h in Headers */, + BEB2C4D41CA4356700AA4034 /* NSArray+KNWObjectArgument.h in Headers */, + BEB2C4D01CA4356700AA4034 /* KNWACGColorRef.h in Headers */, BE51E4151C40A16B00691F0D /* NSInvocation+KNWTheme.h in Headers */, - BE5531EE1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.h in Headers */, - BE5531F01CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.h in Headers */, BEB5649F1C5E087700FB7434 /* KNWThemedInvocation.h in Headers */, - BE5531F81CA2E69800871C73 /* KNWAUIImage.h in Headers */, BEB2C1301C799CD000FD3DF4 /* KNWArgument.h in Headers */, + BEB2C4D61CA4356700AA4034 /* NSDictionary+KNWObjectArgument.h in Headers */, BE51E40D1C40A16B00691F0D /* KNWThemableObjectProxy.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -309,16 +309,16 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + BEB2C4D51CA4356700AA4034 /* NSArray+KNWObjectArgument.m in Sources */, BEB2C13E1C79ADD900FD3DF4 /* KNWThemedArgument.m in Sources */, BEB564A01C5E087700FB7434 /* KNWThemedInvocation.m in Sources */, - BE5531F91CA2E69800871C73 /* KNWAUIImage.m in Sources */, + BEB2C4D31CA4356700AA4034 /* KNWAUIImage.m in Sources */, BE51E4101C40A16B00691F0D /* KNWThemeContext.m in Sources */, - BE5531F71CA2E69800871C73 /* KNWACGColorRef.m in Sources */, BE51E4181C40A16B00691F0D /* NSObject+KNWThemable.m in Sources */, - BE5531EF1CA2E5EB00871C73 /* NSArray+KNWObjectArgument.m in Sources */, + BEB2C4D71CA4356700AA4034 /* NSDictionary+KNWObjectArgument.m in Sources */, BE51E4161C40A16B00691F0D /* NSInvocation+KNWTheme.m in Sources */, - BE5531F11CA2E5EB00871C73 /* NSDictionary+KNWObjectArgument.m in Sources */, BE51E40E1C40A16B00691F0D /* KNWThemableObjectProxy.m in Sources */, + BEB2C4D11CA4356700AA4034 /* KNWACGColorRef.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/KNWTheme/Arguments/KNWACGColorRef.h b/KNWTheme/KNWACGColorRef.h similarity index 100% rename from KNWTheme/Arguments/KNWACGColorRef.h rename to KNWTheme/KNWACGColorRef.h diff --git a/KNWTheme/Arguments/KNWACGColorRef.m b/KNWTheme/KNWACGColorRef.m similarity index 100% rename from KNWTheme/Arguments/KNWACGColorRef.m rename to KNWTheme/KNWACGColorRef.m diff --git a/KNWTheme/Arguments/KNWAUIImage.h b/KNWTheme/KNWAUIImage.h similarity index 100% rename from KNWTheme/Arguments/KNWAUIImage.h rename to KNWTheme/KNWAUIImage.h diff --git a/KNWTheme/Arguments/KNWAUIImage.m b/KNWTheme/KNWAUIImage.m similarity index 100% rename from KNWTheme/Arguments/KNWAUIImage.m rename to KNWTheme/KNWAUIImage.m diff --git a/KNWTheme/KNWTheme.h b/KNWTheme/KNWTheme.h index 2c5aac5..5753d52 100644 --- a/KNWTheme/KNWTheme.h +++ b/KNWTheme/KNWTheme.h @@ -20,3 +20,7 @@ FOUNDATION_EXPORT const unsigned char KNWThemeVersionString[]; #import #import #import +#import +#import +#import +#import diff --git a/KNWTheme/KnightWatson.h b/KNWTheme/KnightWatson.h index 88094a9..1675a79 100644 --- a/KNWTheme/KnightWatson.h +++ b/KNWTheme/KnightWatson.h @@ -10,3 +10,7 @@ #import #import #import +#import +#import +#import +#import diff --git a/KNWTheme/Arguments/NSArray+KNWObjectArgument.h b/KNWTheme/NSArray+KNWObjectArgument.h similarity index 100% rename from KNWTheme/Arguments/NSArray+KNWObjectArgument.h rename to KNWTheme/NSArray+KNWObjectArgument.h diff --git a/KNWTheme/Arguments/NSArray+KNWObjectArgument.m b/KNWTheme/NSArray+KNWObjectArgument.m similarity index 100% rename from KNWTheme/Arguments/NSArray+KNWObjectArgument.m rename to KNWTheme/NSArray+KNWObjectArgument.m diff --git a/KNWTheme/Arguments/NSDictionary+KNWObjectArgument.h b/KNWTheme/NSDictionary+KNWObjectArgument.h similarity index 100% rename from KNWTheme/Arguments/NSDictionary+KNWObjectArgument.h rename to KNWTheme/NSDictionary+KNWObjectArgument.h diff --git a/KNWTheme/Arguments/NSDictionary+KNWObjectArgument.m b/KNWTheme/NSDictionary+KNWObjectArgument.m similarity index 100% rename from KNWTheme/Arguments/NSDictionary+KNWObjectArgument.m rename to KNWTheme/NSDictionary+KNWObjectArgument.m