Skip to content

Commit 509f1c2

Browse files
committed
Move ColorSet Ojbective-C classes into a static library.
1 parent 5844ca9 commit 509f1c2

File tree

11 files changed

+292
-125
lines changed

11 files changed

+292
-125
lines changed

ColorSet.xcodeproj/project.pbxproj

Lines changed: 153 additions & 124 deletions
Large diffs are not rendered by default.

ColorSet/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<key>CFBundleShortVersionString</key>
4141
<string>1.0.0</string>
4242
<key>CFBundleVersion</key>
43-
<string>15</string>
43+
<string>16</string>
4444
<key>LSMinimumSystemVersion</key>
4545
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
4646
<key>NSHumanReadableCopyright</key>

ColorSetKit/NSColor+ColorSetKit.m

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
/*******************************************************************************
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2018 Jean-David Gadina - www.imazing.com
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
******************************************************************************/
24+
25+
#import "NSColor+ColorSetKit.h"
26+
#import "ColorSet.h"
27+
#import "ColorPair.h"
28+
29+
static ColorSet * MainColorSet = nil;
30+
static NSLock * Lock = nil;
31+
32+
@implementation NSColor( ColorSetKit )
33+
34+
+ ( nullable NSColor * )colorFromColorSet: ( NSString * )name
35+
{
36+
static dispatch_once_t once;
37+
static BOOL ( ^ isDark )( void );
38+
39+
dispatch_once
40+
(
41+
&once,
42+
^( void )
43+
{
44+
Lock = [ NSLock new ];
45+
isDark = ^
46+
{
47+
return NO;
48+
};
49+
}
50+
);
51+
52+
[ Lock lock ];
53+
54+
if( MainColorSet == nil )
55+
{
56+
MainColorSet = [ [ ColorSet alloc ] initWithPath: [ [ NSBundle mainBundle ] pathForResource: @"Colors" ofType: @"colorset" ] ];
57+
}
58+
59+
[ Lock unlock ];
60+
61+
{
62+
ColorPair * pair;
63+
64+
pair = [ MainColorSet.colors objectForKey: name ];
65+
66+
if( pair != nil )
67+
{
68+
return ( pair.variant != nil && isDark() ) ? pair.variant : pair.color;
69+
}
70+
}
71+
72+
return nil;
73+
}
74+
75+
@end
File renamed without changes.
File renamed without changes.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*******************************************************************************
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2018 Jean-David Gadina - www.imazing.com
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
******************************************************************************/
24+
25+
#import <ColorSetKit/ColorSet.h>
26+
#import <ColorSetKit/ColorSetStream.h>
27+
#import <ColorSetKit/ColorPair.h>
28+
#import <ColorSetKit/NSColor+ColorSetKit.h>
File renamed without changes.

0 commit comments

Comments
 (0)