Skip to content

Commit a93fef3

Browse files
committed
Rename CoreColor API to avoid conflict with SwiftUI
1 parent cdcc9f6 commit a93fef3

File tree

11 files changed

+108
-70
lines changed

11 files changed

+108
-70
lines changed

Package.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,14 @@ let openSwiftUIExtensionTarget = Target.target(
111111
],
112112
swiftSettings: sharedSwiftSettings
113113
)
114+
let cOpenSwiftUICoreTestTarget = Target.testTarget(
115+
name: "cOpenSwiftUICoreTests",
116+
dependencies: [
117+
"COpenSwiftUICore",
118+
],
119+
exclude: ["README.md"],
120+
swiftSettings: sharedSwiftSettings
121+
)
114122
let openSwiftUICoreTestTarget = Target.testTarget(
115123
name: "OpenSwiftUICoreTests",
116124
dependencies: [
@@ -182,6 +190,7 @@ let package = Package(
182190
openSwiftUITarget,
183191
openSwiftUIExtensionTarget,
184192

193+
cOpenSwiftUICoreTestTarget,
185194
openSwiftUICoreTestTarget,
186195
openSwiftUITestTarget,
187196
openSwiftUICompatibilityTestTarget,
@@ -229,6 +238,8 @@ extension Target {
229238
if attributeGraphCondition {
230239
openSwiftUICoreTarget.addAGSettings()
231240
openSwiftUITarget.addAGSettings()
241+
242+
cOpenSwiftUICoreTestTarget.addAGSettings()
232243
openSwiftUICoreTestTarget.addAGSettings()
233244
openSwiftUITestTarget.addAGSettings()
234245
openSwiftUICompatibilityTestTarget.addAGSettings()

Sources/COpenSwiftUICore/Overlay/CoreGraphics/CoreColor.h renamed to Sources/COpenSwiftUICore/Overlay/CoreGraphics/OpenSwiftUICoreColor.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
//
2-
// CoreColor.h
3-
// COpenSwiftUI
2+
// OpenSwiftUICoreColor.h
3+
// COpenSwiftUICore
4+
//
45
// Audited for RELEASE_2024
56
// Status: Complete
67

7-
#ifndef CoreColor_h
8-
#define CoreColor_h
8+
#ifndef OpenSwiftUICoreColor_h
9+
#define OpenSwiftUICoreColor_h
910

1011
#include "OpenSwiftUIBase.h"
1112

@@ -20,15 +21,15 @@
2021
OPENSWIFTUI_ASSUME_NONNULL_BEGIN
2122

2223
OPENSWIFTUI_EXPORT
23-
BOOL CoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha);
24+
BOOL OpenSwiftUICoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha);
2425

2526
OPENSWIFTUI_EXPORT
26-
NSObject * _Nullable CorePlatformColorForRGBA(BOOL system, CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha);
27+
NSObject * _Nullable OpenSwiftUICorePlatformColorForRGBA(BOOL system, CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha);
2728

2829
OPENSWIFTUI_EXPORT
29-
Class CoreColorGetKitColorClass(BOOL system);
30+
Class OpenSwiftUICoreColorGetKitColorClass(BOOL system);
3031

31-
@interface CoreColor : NSObject
32+
@interface OpenSwiftUICoreColor : NSObject
3233

3334
+ (nullable NSObject *)colorWithSystem:(BOOL)system cgColor: (CGColorRef)cgColor;
3435
+ (nullable NSObject *)blackColorWithSystem:(BOOL)system;
@@ -51,12 +52,12 @@ Class CoreColorGetKitColorClass(BOOL system);
5152
- (void)setFill;
5253
- (void)setStroke;
5354
- (CGColorRef)CGColor;
54-
- (CoreColor *)colorWithAlphaComponent:(CGFloat)alpha;
55+
- (OpenSwiftUICoreColor *)colorWithAlphaComponent:(CGFloat)alpha;
5556

5657
@end
5758

5859
OPENSWIFTUI_ASSUME_NONNULL_END
5960

6061
#endif
6162

62-
#endif /* CoreColor_h */
63+
#endif /* OpenSwiftUICoreColor_h */

Sources/COpenSwiftUICore/Overlay/CoreGraphics/CoreColor.m renamed to Sources/COpenSwiftUICore/Overlay/CoreGraphics/OpenSwiftUICoreColor.m

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
//
2-
// CoreColor.h
3-
// COpenSwiftUI
2+
// OpenSwiftUICoreColor.h
3+
// COpenSwiftUICore
4+
//
45
// Audited for RELEASE_2024
56
// Status: Complete
67

7-
#include "CoreColor.h"
8+
#include "OpenSwiftUICoreColor.h"
89

910
#if OPENSWIFTUI_TARGET_OS_DARWIN
10-
#include "CoreGraphicsContext.h"
11+
#include "OpenSwiftUICoreGraphicsContext.h"
1112

12-
Class CoreColorClass(BOOL isAppKitBased);
13+
Class OpenSwiftUICoreColorClass(BOOL isAppKitBased);
1314

1415
#if OPENSWIFTUI_TARGET_OS_OSX
1516
id NSColorSpaceForCGColorSpace(CGColorSpaceRef cgColorSpace);
1617
Class NSColorSpaceClass(void);
1718
#endif
1819

19-
BOOL CoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha) {
20+
BOOL OpenSwiftUICoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha) {
2021
if (!color) {
2122
return NO;
2223
}
23-
Class colorClass = CoreColorClass(system);
24+
Class colorClass = OpenSwiftUICoreColorClass(system);
2425
if (!colorClass) {
2526
return NO;
2627
}
@@ -40,8 +41,8 @@ BOOL CoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CG
4041
return ((BOOL (*)(id, SEL))[color methodForSelector:@selector(getRed:green:blue:alpha:)])(color, @selector(getRed:green:blue:alpha:));
4142
}
4243

43-
NSObject *CorePlatformColorForRGBA(BOOL system, CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha) {
44-
Class colorClass = CoreColorClass(system);
44+
NSObject *OpenSwiftUICorePlatformColorForRGBA(BOOL system, CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha) {
45+
Class colorClass = OpenSwiftUICoreColorClass(system);
4546
if (!colorClass) {
4647
return nil;
4748
}
@@ -54,11 +55,11 @@ BOOL CoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CG
5455
return [[colorClass alloc] initWithRed:red green:green blue:blue alpha:alpha];
5556
}
5657

57-
Class CoreColorGetKitColorClass(BOOL system) {
58-
CoreColorClass(system);
58+
Class OpenSwiftUICoreColorGetKitColorClass(BOOL system) {
59+
OpenSwiftUICoreColorClass(system);
5960
}
6061

61-
Class CoreColorClass(BOOL system) {
62+
Class OpenSwiftUICoreColorClass(BOOL system) {
6263
static BOOL isValid = false;
6364
static Class colorClass;
6465
static dispatch_once_t once;
@@ -101,89 +102,89 @@ Class NSColorSpaceClass(void) {
101102
}
102103
#endif
103104

104-
@interface CoreColor () {
105+
@interface OpenSwiftUICoreColor () {
105106
CGColorRef _color;
106107
}
107108
@end
108109

109-
@implementation CoreColor
110+
@implementation OpenSwiftUICoreColor
110111

111112
+ (NSObject *)colorWithSystem:(BOOL)system cgColor: (CGColorRef)cgColor {
112-
Class colorClass = CoreColorClass(system);
113+
Class colorClass = OpenSwiftUICoreColorClass(system);
113114
if (colorClass) {
114115
return [colorClass colorWithCGColor: cgColor];
115116
} else {
116-
return [[CoreColor alloc] initWithCGColor: cgColor];
117+
return [[OpenSwiftUICoreColor alloc] initWithCGColor: cgColor];
117118
}
118119
}
119120

120121
+ (NSObject *)blackColorWithSystem:(BOOL)system {
121-
Class colorClass = CoreColorClass(system);
122+
Class colorClass = OpenSwiftUICoreColorClass(system);
122123
return [colorClass blackColor];
123124
}
124125

125126
+ (NSObject *)systemRedColorWithSystem:(BOOL)system {
126-
Class colorClass = CoreColorClass(system);
127+
Class colorClass = OpenSwiftUICoreColorClass(system);
127128
return [colorClass systemRedColor];
128129
}
129130

130131
+ (NSObject *)systemOrangeColorWithSystem:(BOOL)system {
131-
Class colorClass = CoreColorClass(system);
132+
Class colorClass = OpenSwiftUICoreColorClass(system);
132133
return [colorClass systemOrangeColor];
133134
}
134135

135136
+ (NSObject *)systemYellowColorWithSystem:(BOOL)system {
136-
Class colorClass = CoreColorClass(system);
137+
Class colorClass = OpenSwiftUICoreColorClass(system);
137138
return [colorClass systemYellowColor];
138139
}
139140

140141
+ (NSObject *)systemGreenColorWithSystem:(BOOL)system {
141-
Class colorClass = CoreColorClass(system);
142+
Class colorClass = OpenSwiftUICoreColorClass(system);
142143
return [colorClass systemGreenColor];
143144
}
144145

145146
+ (NSObject *)systemTealColorWithSystem:(BOOL)system {
146-
Class colorClass = CoreColorClass(system);
147+
Class colorClass = OpenSwiftUICoreColorClass(system);
147148
return [colorClass systemTealColor];
148149
}
149150

150151
+ (NSObject *)systemMintColorWithSystem:(BOOL)system {
151-
Class colorClass = CoreColorClass(system);
152+
Class colorClass = OpenSwiftUICoreColorClass(system);
152153
return [colorClass systemMintColor];
153154
}
154155

155156
+ (NSObject *)systemCyanColorWithSystem:(BOOL)system {
156-
Class colorClass = CoreColorClass(system);
157+
Class colorClass = OpenSwiftUICoreColorClass(system);
157158
return [colorClass systemCyanColor];
158159
}
159160

160161
+ (NSObject *)systemBlueColorWithSystem:(BOOL)system {
161-
Class colorClass = CoreColorClass(system);
162+
Class colorClass = OpenSwiftUICoreColorClass(system);
162163
return [colorClass systemBlueColor];
163164
}
164165

165166
+ (NSObject *)systemIndigoColorWithSystem:(BOOL)system {
166-
Class colorClass = CoreColorClass(system);
167+
Class colorClass = OpenSwiftUICoreColorClass(system);
167168
return [colorClass systemIndigoColor];
168169
}
169170

170171
+ (NSObject *)systemPurpleColorWithSystem:(BOOL)system {
171-
Class colorClass = CoreColorClass(system);
172+
Class colorClass = OpenSwiftUICoreColorClass(system);
172173
return [colorClass systemPurpleColor];
173174
}
174175

175176
+ (NSObject *)systemPinkColorWithSystem:(BOOL)system {
176-
Class colorClass = CoreColorClass(system);
177+
Class colorClass = OpenSwiftUICoreColorClass(system);
177178
return [colorClass systemPinkColor];
178179
}
179180

180181
+ (NSObject *)systemBrownColorWithSystem:(BOOL)system {
181-
Class colorClass = CoreColorClass(system);
182+
Class colorClass = OpenSwiftUICoreColorClass(system);
182183
return [colorClass systemBrownColor];
183184
}
184185

185186
+ (NSObject *)systemGrayColorWithSystem:(BOOL)system {
186-
Class colorClass = CoreColorClass(system);
187+
Class colorClass = OpenSwiftUICoreColorClass(system);
187188
return [colorClass systemGrayColor];
188189
}
189190

@@ -199,7 +200,7 @@ - (void)dealloc {
199200
}
200201

201202
- (void)set {
202-
CGContextRef context = CoreGraphicsContext.current.CGContext;
203+
CGContextRef context = OpenSwiftUICoreGraphicsContext.current.CGContext;
203204
if (!context) {
204205
return;
205206
}
@@ -208,15 +209,15 @@ - (void)set {
208209
}
209210

210211
- (void)setFill {
211-
CGContextRef context = CoreGraphicsContext.current.CGContext;
212+
CGContextRef context = OpenSwiftUICoreGraphicsContext.current.CGContext;
212213
if (!context) {
213214
return;
214215
}
215216
CGContextSetFillColorWithColor(context, self.CGColor);
216217
}
217218

218219
- (void)setStroke {
219-
CGContextRef context = CoreGraphicsContext.current.CGContext;
220+
CGContextRef context = OpenSwiftUICoreGraphicsContext.current.CGContext;
220221
if (!context) {
221222
return;
222223
}
@@ -227,9 +228,9 @@ - (CGColorRef)CGColor {
227228
return _color;
228229
}
229230

230-
- (CoreColor *)colorWithAlphaComponent:(CGFloat)alpha {
231+
- (OpenSwiftUICoreColor *)colorWithAlphaComponent:(CGFloat)alpha {
231232
CGColorRef newColor = CGColorCreateCopyWithAlpha(_color, alpha);
232-
CoreColor *color = [[CoreColor alloc] initWithCGColor:newColor];
233+
OpenSwiftUICoreColor *color = [[OpenSwiftUICoreColor alloc] initWithCGColor:newColor];
233234
CGColorRelease(newColor);
234235
return color;
235236
}
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
//
2-
// CoreGraphicsContext.h
3-
// COpenSwiftUI
2+
// OpenSwiftUICoreGraphicsContext.h
3+
// COpenSwiftUICore
4+
//
45
// Audited for RELEASE_2024
56
// Status: Complete
67

7-
#ifndef CoreGraphicsContext_h
8-
#define CoreGraphicsContext_h
8+
#ifndef OpenSwiftUICoreGraphicsContext_h
9+
#define OpenSwiftUICoreGraphicsContext_h
910

1011
#include "OpenSwiftUIBase.h"
1112

@@ -15,9 +16,9 @@
1516

1617
OPENSWIFTUI_ASSUME_NONNULL_BEGIN
1718

18-
@interface CoreGraphicsContext : NSObject
19+
@interface OpenSwiftUICoreGraphicsContext : NSObject
1920

20-
@property (class, nonatomic, readonly) CoreGraphicsContext *current;
21+
@property (class, nonatomic, readonly) OpenSwiftUICoreGraphicsContext *current;
2122
@property (nonatomic, readonly) CGContextRef CGContext;
2223

2324
- (instancetype)initWithCGContext:(CGContextRef)ctx;
@@ -30,4 +31,4 @@ OPENSWIFTUI_ASSUME_NONNULL_END
3031

3132
#endif
3233

33-
#endif /* CoreGraphicsContext_h */
34+
#endif /* OpenSwiftUICoreGraphicsContext_h */

Sources/COpenSwiftUICore/Overlay/CoreGraphics/CoreGraphicsContext.m renamed to Sources/COpenSwiftUICore/Overlay/CoreGraphics/OpenSwiftUICoreGraphicsContext.m

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
//
2-
// CoreColor.h
3-
// COpenSwiftUI
2+
// OpenSwiftUICoreGraphicsContext.h
3+
// COpenSwiftUICore
4+
//
45
// Audited for RELEASE_2024
56
// Status: WIP
67

7-
#include "CoreGraphicsContext.h"
8+
#include "OpenSwiftUICoreGraphicsContext.h"
89

910
#if OPENSWIFTUI_TARGET_OS_DARWIN
1011
#include <Foundation/Foundation.h>
1112

12-
static _Thread_local __unsafe_unretained CoreGraphicsContext * _current = NULL;
13+
static _Thread_local __unsafe_unretained OpenSwiftUICoreGraphicsContext * _current = NULL;
1314

1415
IMP _pushContextIMP;
1516
IMP _popContextIMP;
1617

17-
@interface CoreGraphicsContext () {
18-
CoreGraphicsContext *_next;
18+
@interface OpenSwiftUICoreGraphicsContext () {
19+
OpenSwiftUICoreGraphicsContext *_next;
1920
CGContextRef _ctx;
2021
}
2122
- (id)__createsImages;
2223
@end
2324

24-
@implementation CoreGraphicsContext
25+
@implementation OpenSwiftUICoreGraphicsContext
2526

2627
- (instancetype)initWithCGContext:(CGContextRef)ctx {
2728
static dispatch_once_t __once;
@@ -45,15 +46,15 @@ - (void)push {
4546
_next = _current;
4647
_current = self;
4748
if (_pushContextIMP != NULL && _popContextIMP != NULL) {
48-
typedef BOOL (*FUNC)(id, SEL, CoreGraphicsContext *);
49+
typedef BOOL (*FUNC)(id, SEL, OpenSwiftUICoreGraphicsContext *);
4950
((FUNC)(_pushContextIMP))(NULL, @selector(pushContext:), _current);
5051
}
5152
}
5253

5354
- (void)pop {
5455
_current = _next;
5556
if (_pushContextIMP != NULL && _popContextIMP != NULL) {
56-
typedef BOOL (*FUNC)(id, SEL, CoreGraphicsContext *);
57+
typedef BOOL (*FUNC)(id, SEL, OpenSwiftUICoreGraphicsContext *);
5758
((FUNC)(_popContextIMP))(NULL, @selector(popContext:), _current);
5859
}
5960
}
@@ -66,7 +67,7 @@ - (CGContextRef)CGContext {
6667
return _ctx;
6768
}
6869

69-
+ (CoreGraphicsContext *)current {
70+
+ (OpenSwiftUICoreGraphicsContext *)current {
7071
return _current;
7172
}
7273

Sources/COpenSwiftUICore/ViewSystem.h renamed to Sources/COpenSwiftUICore/Util/ViewSystem.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//
22
// ViewSystem.h
33
// COpenSwiftUICore
4+
//
45
// Audited for RELEASE_2024
56
// Status: Complete
67

0 commit comments

Comments
 (0)