Fix the import issue for user who does not use umbrella header SVGKit.h. Make some cross-platform define inside pch files to avoid effect user's custom define

Author: dreampiggy

SVGKitLibrary/SVGKit-iOS/SVGKit-Prefix.pch

@@ -7,6 +7,8 @@
 #import <CocoaLumberjack/CocoaLumberjack.h>
 #import "SVGKDefine.h"
 
+// These macro is only used inside framework project, does not expose to public header and effect user's define
+
 #define SVGKIT_LOG_CONTEXT 556
 
 #define SVGKitLogError(frmt, ...) LOG_MAYBE(NO, LOG_LEVEL_DEF, DDLogFlagError, SVGKIT_LOG_CONTEXT, nil, __PRETTY_FUNCTION__, frmt, ##__VA_ARGS__)
@@ -20,4 +22,10 @@ static const int ddLogLevel = DDLogLevelVerbose;
 #else
 static const int ddLogLevel = DDLogLevelWarning;
 #endif
+
+#if SVGKIT_MAC
+#define NSStringFromCGRect(rect) NSStringFromRect(rect)
+#define NSStringFromCGSize(size) NSStringFromSize(size)
+#define NSStringFromCGPoint(point) NSStringFromPoint(point)
+#endif
 #endif

Source/DOM classes/SVG-DOM/SVGRect.h

@@ -41,9 +41,3 @@ CGRect CGRectFromSVGRect( SVGRect rect );
 CGSize CGSizeFromSVGRect( SVGRect rect );
 
 NSString * _Nonnull NSStringFromSVGRect( SVGRect rect );
-
-#if SVGKIT_MAC
-NSString * _Nonnull NSStringFromCGRect( CGRect rect );
-NSString * _Nonnull NSStringFromCGSize( CGSize size );
-NSString * _Nonnull NSStringFromCGPoint( CGPoint point );
-#endif

Source/DOM classes/SVG-DOM/SVGRect.m

@@ -1,7 +1,4 @@
 #import "SVGRect.h"
-#if SVGKIT_UIKIT
-#import <UIKit/UIKit.h>
-#endif
 
 BOOL SVGRectIsInitialized( SVGRect rect )
 {
@@ -41,17 +38,3 @@ CGSize CGSizeFromSVGRect( SVGRect rect )
  return NSStringFromCGRect(cgRect);
 #endif
 }
-
-#if SVGKIT_MAC
-NSString * NSStringFromCGRect( CGRect rect ) {
- return NSStringFromRect(rect);
-}
-
-NSString * _Nonnull NSStringFromCGSize( CGSize size ) {
- return NSStringFromSize(size);
-}
-
-NSString * NSStringFromCGPoint( CGPoint point ) {
- return NSStringFromPoint(point);
-}
-#endif

Source/DOM classes/Unported or Partial DOM/SVGLinearGradientElement.m

@@ -9,11 +9,6 @@
 #import "SVGLinearGradientElement.h"
 #import "SVGElement_ForParser.h"
 #import "SVGGradientLayer.h"
-#if SVGKIT_UIKIT
-#import <UIKit/UIKit.h>
-#else
-#import <AppKit/AppKit.h>
-#endif
 
 @interface SVGLinearGradientElement ()
 

Source/DOM classes/Unported or Partial DOM/SVGRadialGradientElement.m

@@ -10,11 +10,6 @@
 #import "SVGElement_ForParser.h"
 #import "SVGUtils.h"
 #import "SVGGradientLayer.h"
-#if SVGKIT_UIKIT
-#import <UIKit/UIKit.h>
-#else
-#import <AppKit/AppKit.h>
-#endif
 
 // `kCAGradientLayerRadial` this symbol is available since iOS 3.2/tvOS 9.0/macOS 10.6, but it's not externed to public header until Xcode 10 with iOS 12 SDK, so we define it for user who still use old SDK version.
 #if (__IPHONE_OS_VERSION_MAX_ALLOWED && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_12_0) || (__TV_OS_VERSION_MAX_ALLOWED && __TV_OS_VERSION_MAX_ALLOWED < __TVOS_12_0) || (__MAC_OS_X_VERSION_MAX_ALLOWED && __MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_14)

Source/DOM classes/Unported or Partial DOM/SVGTextElement.m

@@ -1,11 +1,6 @@
 #import "SVGTextElement.h"
 
 #import <CoreText/CoreText.h>
-#if SVGKIT_MAC
-#import <AppKit/AppKit.h>
-#else
-#import <UIKit/UIKit.h>
-#endif
 #import "SVGElement_ForParser.h" // to resolve Xcode circular dependencies; in long term, parsing SHOULD NOT HAPPEN inside any class whose name starts "SVG" (because those are reserved classes for the SVG Spec)
 #import "SVGGradientLayer.h"
 #import "SVGHelperUtilities.h"

Source/QuartzCore additions/CALayerWithClipRender.m

@@ -7,11 +7,6 @@
 //
 
 #import "CALayerWithClipRender.h"
-#if SVGKIT_MAC
-#import <AppKit/AppKit.h>
-#else
-#import <UIKit/UIKit.h>
-#endif
 
 @implementation CALayerWithClipRender
 

Source/SVGKDefine.h

@@ -63,4 +63,10 @@
 #endif
 #endif
 
+#if SVGKIT_MAC
+#import <AppKit/AppKit.h>
+#else
+#import <UIKit/UIKit.h>
+#endif
+
 #endif /* SVGKDefine_h */

Source/SVGKImage.h

@@ -35,12 +35,7 @@
  
  */
 
-#if SVGKIT_MAC
-#import <AppKit/AppKit.h>
-#else
-#import <UIKit/UIKit.h>
-#endif
-
+#import "SVGKDefine.h"
 #import "SVGKParser.h" // needed for asynchronous loading method-signature
 
 @class SVGDocument;

Source/SVGKit.h

@@ -19,17 +19,8 @@
 
 #define V_1_COMPATIBILITY_COMPILE_CALAYEREXPORTER_CLASS 0
 
-#ifndef SVGKIT_LOG_CONTEXT
- #define SVGKIT_LOG_CONTEXT 556
-#endif
-
 
 // MARK: - Framework Header File Content
-#if SVGKIT_MAC
-#import <AppKit/AppKit.h>
-#else
-#import <UIKit/UIKit.h>
-#endif
 
 @interface SVGKit : NSObject