Rename CoreColor API to avoid conflict with SwiftUI

Author: Kyle-Ye

Package.swift

@@ -111,6 +111,14 @@ let openSwiftUIExtensionTarget = Target.target(
     ],
     swiftSettings: sharedSwiftSettings
 )
+let cOpenSwiftUICoreTestTarget = Target.testTarget(
+    name: "cOpenSwiftUICoreTests",
+    dependencies: [
+        "COpenSwiftUICore",
+    ],
+    exclude: ["README.md"],
+    swiftSettings: sharedSwiftSettings
+)
 let openSwiftUICoreTestTarget = Target.testTarget(
     name: "OpenSwiftUICoreTests",
     dependencies: [
@@ -182,6 +190,7 @@ let package = Package(
         openSwiftUITarget,
         openSwiftUIExtensionTarget,
 
+        cOpenSwiftUICoreTestTarget,
         openSwiftUICoreTestTarget,
         openSwiftUITestTarget,
         openSwiftUICompatibilityTestTarget,
@@ -229,6 +238,8 @@ extension Target {
 if attributeGraphCondition {
     openSwiftUICoreTarget.addAGSettings()
     openSwiftUITarget.addAGSettings()
+    
+    cOpenSwiftUICoreTestTarget.addAGSettings()
     openSwiftUICoreTestTarget.addAGSettings()
     openSwiftUITestTarget.addAGSettings()
     openSwiftUICompatibilityTestTarget.addAGSettings()

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

@@ -1,11 +1,12 @@
 //
-//  CoreColor.h
-//  COpenSwiftUI
+//  OpenSwiftUICoreColor.h
+//  COpenSwiftUICore
+//
 //  Audited for RELEASE_2024
 //  Status: Complete
 
-#ifndef CoreColor_h
-#define CoreColor_h
+#ifndef OpenSwiftUICoreColor_h
+#define OpenSwiftUICoreColor_h
 
 #include "OpenSwiftUIBase.h"
 
@@ -20,15 +21,15 @@
 OPENSWIFTUI_ASSUME_NONNULL_BEGIN
 
 OPENSWIFTUI_EXPORT
-BOOL CoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha);
+BOOL OpenSwiftUICoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha);
 
 OPENSWIFTUI_EXPORT
-NSObject  * _Nullable CorePlatformColorForRGBA(BOOL system, CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha);
+NSObject  * _Nullable OpenSwiftUICorePlatformColorForRGBA(BOOL system, CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha);
 
 OPENSWIFTUI_EXPORT
-Class CoreColorGetKitColorClass(BOOL system);
+Class OpenSwiftUICoreColorGetKitColorClass(BOOL system);
 
-@interface CoreColor : NSObject
+@interface OpenSwiftUICoreColor : NSObject
 
 + (nullable NSObject *)colorWithSystem:(BOOL)system cgColor: (CGColorRef)cgColor;
 + (nullable NSObject *)blackColorWithSystem:(BOOL)system;
@@ -51,12 +52,12 @@ Class CoreColorGetKitColorClass(BOOL system);
 - (void)setFill;
 - (void)setStroke;
 - (CGColorRef)CGColor;
-- (CoreColor *)colorWithAlphaComponent:(CGFloat)alpha;
+- (OpenSwiftUICoreColor *)colorWithAlphaComponent:(CGFloat)alpha;
 
 @end
 
 OPENSWIFTUI_ASSUME_NONNULL_END
 
 #endif
 
-#endif /* CoreColor_h */
+#endif /* OpenSwiftUICoreColor_h */

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

@@ -1,26 +1,27 @@
 //
-//  CoreColor.h
-//  COpenSwiftUI
+//  OpenSwiftUICoreColor.h
+//  COpenSwiftUICore
+//
 //  Audited for RELEASE_2024
 //  Status: Complete
 
-#include "CoreColor.h"
+#include "OpenSwiftUICoreColor.h"
 
 #if OPENSWIFTUI_TARGET_OS_DARWIN
-#include "CoreGraphicsContext.h"
+#include "OpenSwiftUICoreGraphicsContext.h"
 
-Class CoreColorClass(BOOL isAppKitBased);
+Class OpenSwiftUICoreColorClass(BOOL isAppKitBased);
 
 #if OPENSWIFTUI_TARGET_OS_OSX
 id NSColorSpaceForCGColorSpace(CGColorSpaceRef cgColorSpace);
 Class NSColorSpaceClass(void);
 #endif
 
-BOOL CoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha) {
+BOOL OpenSwiftUICoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CGFloat *green, CGFloat *blue, CGFloat *alpha) {
     if (!color) {
         return NO;
     }
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     if (!colorClass) {
         return NO;
     }
@@ -40,8 +41,8 @@ BOOL CoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CG
     return ((BOOL (*)(id, SEL))[color methodForSelector:@selector(getRed:green:blue:alpha:)])(color, @selector(getRed:green:blue:alpha:));
 }
 
-NSObject *CorePlatformColorForRGBA(BOOL system, CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha) {
-    Class colorClass = CoreColorClass(system);
+NSObject *OpenSwiftUICorePlatformColorForRGBA(BOOL system, CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha) {
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     if (!colorClass) {
         return nil;
     }
@@ -54,11 +55,11 @@ BOOL CoreColorPlatformColorGetComponents(BOOL system, id color, CGFloat *red, CG
     return [[colorClass alloc] initWithRed:red green:green blue:blue alpha:alpha];
 }
 
-Class CoreColorGetKitColorClass(BOOL system) {
-    CoreColorClass(system);
+Class OpenSwiftUICoreColorGetKitColorClass(BOOL system) {
+    OpenSwiftUICoreColorClass(system);
 }
 
-Class CoreColorClass(BOOL system) {
+Class OpenSwiftUICoreColorClass(BOOL system) {
     static BOOL isValid = false;
     static Class colorClass;
     static dispatch_once_t once;
@@ -101,89 +102,89 @@ Class NSColorSpaceClass(void) {
 }
 #endif
 
-@interface CoreColor () {
+@interface OpenSwiftUICoreColor () {
     CGColorRef _color;
 }
 @end
 
-@implementation CoreColor
+@implementation OpenSwiftUICoreColor
 
 + (NSObject *)colorWithSystem:(BOOL)system cgColor: (CGColorRef)cgColor {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     if (colorClass) {
         return [colorClass colorWithCGColor: cgColor];
     } else {
-        return [[CoreColor alloc] initWithCGColor: cgColor];
+        return [[OpenSwiftUICoreColor alloc] initWithCGColor: cgColor];
     }
 }
 
 + (NSObject *)blackColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass blackColor];
 }
 
 + (NSObject *)systemRedColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemRedColor];
 }
 
 + (NSObject *)systemOrangeColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemOrangeColor];
 }
 
 + (NSObject *)systemYellowColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemYellowColor];
 }
 
 + (NSObject *)systemGreenColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemGreenColor];
 }
 
 + (NSObject *)systemTealColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemTealColor];
 }
 
 + (NSObject *)systemMintColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemMintColor];
 }
 
 + (NSObject *)systemCyanColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemCyanColor];
 }
 
 + (NSObject *)systemBlueColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemBlueColor];
 }
 
 + (NSObject *)systemIndigoColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemIndigoColor];
 }
 
 + (NSObject *)systemPurpleColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemPurpleColor];
 }
 
 + (NSObject *)systemPinkColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemPinkColor];
 }
 
 + (NSObject *)systemBrownColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemBrownColor];
 }
 
 + (NSObject *)systemGrayColorWithSystem:(BOOL)system {
-    Class colorClass = CoreColorClass(system);
+    Class colorClass = OpenSwiftUICoreColorClass(system);
     return [colorClass systemGrayColor];
 }
 
@@ -199,7 +200,7 @@ - (void)dealloc {
 }
 
 - (void)set {
-    CGContextRef context = CoreGraphicsContext.current.CGContext;
+    CGContextRef context = OpenSwiftUICoreGraphicsContext.current.CGContext;
     if (!context) {
         return;
     }
@@ -208,15 +209,15 @@ - (void)set {
 }
 
 - (void)setFill {
-    CGContextRef context = CoreGraphicsContext.current.CGContext;
+    CGContextRef context = OpenSwiftUICoreGraphicsContext.current.CGContext;
     if (!context) {
         return;
     }
     CGContextSetFillColorWithColor(context, self.CGColor);
 }
 
 - (void)setStroke {
-    CGContextRef context = CoreGraphicsContext.current.CGContext;
+    CGContextRef context = OpenSwiftUICoreGraphicsContext.current.CGContext;
     if (!context) {
         return;
     }
@@ -227,9 +228,9 @@ - (CGColorRef)CGColor {
     return _color;
 }
 
-- (CoreColor *)colorWithAlphaComponent:(CGFloat)alpha {
+- (OpenSwiftUICoreColor *)colorWithAlphaComponent:(CGFloat)alpha {
     CGColorRef newColor = CGColorCreateCopyWithAlpha(_color, alpha);
-    CoreColor *color = [[CoreColor alloc] initWithCGColor:newColor];
+    OpenSwiftUICoreColor *color = [[OpenSwiftUICoreColor alloc] initWithCGColor:newColor];
     CGColorRelease(newColor);
     return color;
 }

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

@@ -1,11 +1,12 @@
 //
-//  CoreGraphicsContext.h
-//  COpenSwiftUI
+//  OpenSwiftUICoreGraphicsContext.h
+//  COpenSwiftUICore
+//
 //  Audited for RELEASE_2024
 //  Status: Complete
 
-#ifndef CoreGraphicsContext_h
-#define CoreGraphicsContext_h
+#ifndef OpenSwiftUICoreGraphicsContext_h
+#define OpenSwiftUICoreGraphicsContext_h
 
 #include "OpenSwiftUIBase.h"
 
@@ -15,9 +16,9 @@
 
 OPENSWIFTUI_ASSUME_NONNULL_BEGIN
 
-@interface CoreGraphicsContext : NSObject
+@interface OpenSwiftUICoreGraphicsContext : NSObject
 
-@property (class, nonatomic, readonly) CoreGraphicsContext *current;
+@property (class, nonatomic, readonly) OpenSwiftUICoreGraphicsContext *current;
 @property (nonatomic, readonly) CGContextRef CGContext;
 
 - (instancetype)initWithCGContext:(CGContextRef)ctx;
@@ -30,4 +31,4 @@ OPENSWIFTUI_ASSUME_NONNULL_END
 
 #endif
 
-#endif /* CoreGraphicsContext_h */
+#endif /* OpenSwiftUICoreGraphicsContext_h */

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

@@ -1,27 +1,28 @@
 //
-//  CoreColor.h
-//  COpenSwiftUI
+//  OpenSwiftUICoreGraphicsContext.h
+//  COpenSwiftUICore
+//
 //  Audited for RELEASE_2024
 //  Status: WIP
 
-#include "CoreGraphicsContext.h"
+#include "OpenSwiftUICoreGraphicsContext.h"
 
 #if OPENSWIFTUI_TARGET_OS_DARWIN
 #include <Foundation/Foundation.h>
 
-static _Thread_local __unsafe_unretained CoreGraphicsContext * _current = NULL;
+static _Thread_local __unsafe_unretained OpenSwiftUICoreGraphicsContext * _current = NULL;
 
 IMP _pushContextIMP;
 IMP _popContextIMP;
 
-@interface CoreGraphicsContext () {
-    CoreGraphicsContext *_next;
+@interface OpenSwiftUICoreGraphicsContext () {
+    OpenSwiftUICoreGraphicsContext *_next;
     CGContextRef _ctx;
 }
 - (id)__createsImages;
 @end
 
-@implementation CoreGraphicsContext
+@implementation OpenSwiftUICoreGraphicsContext
 
 - (instancetype)initWithCGContext:(CGContextRef)ctx {
     static dispatch_once_t __once;
@@ -45,15 +46,15 @@ - (void)push {
     _next = _current;
     _current = self;
     if (_pushContextIMP != NULL && _popContextIMP != NULL) {
-        typedef BOOL (*FUNC)(id, SEL, CoreGraphicsContext *);
+        typedef BOOL (*FUNC)(id, SEL, OpenSwiftUICoreGraphicsContext *);
         ((FUNC)(_pushContextIMP))(NULL, @selector(pushContext:), _current);
     }
 }
 
 - (void)pop {
     _current = _next;
     if (_pushContextIMP != NULL && _popContextIMP != NULL) {
-        typedef BOOL (*FUNC)(id, SEL, CoreGraphicsContext *);
+        typedef BOOL (*FUNC)(id, SEL, OpenSwiftUICoreGraphicsContext *);
         ((FUNC)(_popContextIMP))(NULL, @selector(popContext:), _current);
     }
 }
@@ -66,7 +67,7 @@ - (CGContextRef)CGContext {
     return _ctx;
 }
 
-+ (CoreGraphicsContext *)current {
++ (OpenSwiftUICoreGraphicsContext *)current {
     return _current;
 }
 

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

@@ -1,6 +1,7 @@
 //
 //  ViewSystem.h
 //  COpenSwiftUICore
+//
 //  Audited for RELEASE_2024
 //  Status: Complete