make iOS 10.3 and Xcode 8.3 compatible (#345)

recompile SvgGh library with new code singature needed by iOS 10.3
This commit is contained in:
Andre Höpfner
2017-04-08 19:32:18 +02:00
committed by Emux
parent e1d17321c6
commit f0639972b4
10 changed files with 435 additions and 11 deletions

View File

@@ -195,7 +195,7 @@ typedef NSUInteger ColorScheme;
+(CGPathRef) newRoundRectPathForRect:(CGRect)aRect withRadius:(CGFloat) radius CF_RETURNS_RETAINED;
/*! @brief utility routine to find the location of an SVG document relative to a provided bundle
* @param an optional bundle containing the artwork
* @param mayBeNil optional bundle containing the artwork
* @param theArtworkPath subpath within a bundle does not include the .svg extension which is assumed.
*/
+(nullable NSURL*) locateArtworkForBundle:(nullable NSBundle*)mayBeNil atSubpath:(NSString*)theArtworkPath;
@@ -207,8 +207,7 @@ typedef NSUInteger ColorScheme;
+(nullable NSURL*) locateArtworkForObject:(id<NSObject>)anObject atSubpath:(NSString*)theArtworkPath; // for compatibility
/*! @brief utility routine to locate a URL inside your project when using Interface Builder's IB_DESIGNABLE service
* @param anObject for instance a GHButton
* @param theArtworkPath subpath within a bundle does not include the .svg extension which is assumed.
* @param artworkSubPath subpath within a bundle does not include the .svg extension which is assumed.
*/
+(nullable NSURL*) findInterfaceBuilderArtwork:(NSString*)artworkSubPath;

View File

@@ -75,6 +75,17 @@ NS_ASSUME_NONNULL_BEGIN
/*! @brief the value for 'currentColor' at this moment in the process of visiting a document
*/
-(nullable UIColor*) currentColor;
/*! @brief the value for 'opacity' at this moment in the process of visiting a document
*/
-(CGFloat) opacity;
/*! @brief opacity is dependent (via inheritence) as you descend an SVG Document. This opacity is the place to keep track of updated opacity.
* @param the current opacity (defaults to 1.0)
*/
-(void) setOpacity:(CGFloat)opacity;
/*! @brief the active language expected by the user like 'en' or 'sp' or 'zh'
*/
-(nullable NSString*) isoLanguage;
@@ -89,7 +100,7 @@ NS_ASSUME_NONNULL_BEGIN
/*! @brief Look through the CSS attributes for a given styling attribute.
* @param attributeName the name of the attribute like 'line-width'
* @param className the name of the CSS class like 'background' or some other arbitrary item
* @param listOfClasses the name of the CSS class like 'background' or some other arbitrary item
* @param entityName the name of the entity like 'rect' or 'polyline'
*/
-(nullable NSString*) attributeNamed:(NSString*)attributeName classes:(nullable NSArray<NSString*>*)listOfClasses entityName:(nullable NSString*)entityName;

View File

@@ -68,8 +68,8 @@ IB_DESIGNABLE // Cocapods users should add the use_frameworks! directive if this
@interface SVGDocumentView : UIView
/*! @property artworkPath
* @brief the text contents of an SVG document can be accessed via 'User Defined RuntimeAttributes'
*/
* @brief the text contents of an SVG document can be accessed via 'User Defined RuntimeAttributes'. If you are using a .svgz file, include the file extension in the path.
*/
@property(nonatomic, strong) IBInspectable NSString* __nullable artworkPath;
/*! @property defaultColor

View File

@@ -42,12 +42,18 @@ NS_ASSUME_NONNULL_BEGIN
@property(strong, nonatomic, readonly) NSURL* __nullable svgURL;
/*! @brief init method which takes a URL reference to a .svg file
* @param url a reference to a standard .svg file
* @param url a reference to a standard .svg or .svgz file
*/
-(instancetype)initWithContentsOfURL:(NSURL *)url;
/*! @brief init method which takes a input stream from a SVG source
* @param inputStream a reference to a standard .svg or .svgz file
*/
-(instancetype)initWithInputStream:(NSInputStream *)inputStream;
/*! @brief init method which the name of a resource based SVG
* @param a string giving the name of the resource
* @param resourceName string giving the name of the resource. This may include a file extension, if ommitted `svg` will be used.
* @param bundle optional bundle to look in
* @commment might be from XCAsset data
*/
-(nullable instancetype) initWithResourceName:(NSString*)resourceName inBundle:(nullable NSBundle*)bundle;
@@ -66,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN
/*! @brief not allowing a standard init method
*/
-(nullable instancetype) init __attribute__((unavailable("init not available")));
-(instancetype) init __attribute__((unavailable("init not available")));
/*! @brief method to create a URL relative to the URL used to create this object (assuming use of a URL to create it)
* @param subPath relative path to this parser's svgURL