diff --git a/vtm-ios-example/build.gradle b/vtm-ios-example/build.gradle index 89eb52f7..c90cf4b0 100644 --- a/vtm-ios-example/build.gradle +++ b/vtm-ios-example/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { jcenter() + maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1-SNAPSHOT' } } diff --git a/vtm-ios/build.gradle b/vtm-ios/build.gradle index a57e6da8..b9480167 100644 --- a/vtm-ios/build.gradle +++ b/vtm-ios/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { jcenter() + maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1-SNAPSHOT' } } diff --git a/vtm-ios/natives/SVGgh.framework.dSYM/Contents/Resources/DWARF/SVGgh b/vtm-ios/natives/SVGgh.framework.dSYM/Contents/Resources/DWARF/SVGgh old mode 100755 new mode 100644 index c6a4e257..14b35d0d Binary files a/vtm-ios/natives/SVGgh.framework.dSYM/Contents/Resources/DWARF/SVGgh and b/vtm-ios/natives/SVGgh.framework.dSYM/Contents/Resources/DWARF/SVGgh differ diff --git a/vtm-ios/natives/SVGgh.framework/Headers/GHControlFactory.h b/vtm-ios/natives/SVGgh.framework/Headers/GHControlFactory.h index c375b8eb..11aa8996 100644 --- a/vtm-ios/natives/SVGgh.framework/Headers/GHControlFactory.h +++ b/vtm-ios/natives/SVGgh.framework/Headers/GHControlFactory.h @@ -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)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; diff --git a/vtm-ios/natives/SVGgh.framework/Headers/SVGContext.h b/vtm-ios/natives/SVGgh.framework/Headers/SVGContext.h index fefa0d26..18210cd4 100644 --- a/vtm-ios/natives/SVGgh.framework/Headers/SVGContext.h +++ b/vtm-ios/natives/SVGgh.framework/Headers/SVGContext.h @@ -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*)listOfClasses entityName:(nullable NSString*)entityName; diff --git a/vtm-ios/natives/SVGgh.framework/Headers/SVGDocumentView.h b/vtm-ios/natives/SVGgh.framework/Headers/SVGDocumentView.h index 525fc8b5..b95a7ace 100644 --- a/vtm-ios/natives/SVGgh.framework/Headers/SVGDocumentView.h +++ b/vtm-ios/natives/SVGgh.framework/Headers/SVGDocumentView.h @@ -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 diff --git a/vtm-ios/natives/SVGgh.framework/Headers/SVGParser.h b/vtm-ios/natives/SVGgh.framework/Headers/SVGParser.h index 19bcbe01..6fdd3e96 100644 --- a/vtm-ios/natives/SVGgh.framework/Headers/SVGParser.h +++ b/vtm-ios/natives/SVGgh.framework/Headers/SVGParser.h @@ -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 diff --git a/vtm-ios/natives/SVGgh.framework/Info.plist b/vtm-ios/natives/SVGgh.framework/Info.plist index e6c48faa..037612b7 100644 Binary files a/vtm-ios/natives/SVGgh.framework/Info.plist and b/vtm-ios/natives/SVGgh.framework/Info.plist differ diff --git a/vtm-ios/natives/SVGgh.framework/SVGgh b/vtm-ios/natives/SVGgh.framework/SVGgh index c6a4e257..2805e546 100755 Binary files a/vtm-ios/natives/SVGgh.framework/SVGgh and b/vtm-ios/natives/SVGgh.framework/SVGgh differ diff --git a/vtm-ios/natives/SVGgh.framework/_CodeSignature/CodeResources b/vtm-ios/natives/SVGgh.framework/_CodeSignature/CodeResources new file mode 100644 index 00000000..f424a782 --- /dev/null +++ b/vtm-ios/natives/SVGgh.framework/_CodeSignature/CodeResources @@ -0,0 +1,406 @@ + + + + + files + + Headers/GHButton.h + + Yo70QMvylnV/tGNngg/dxwCC+Es= + + Headers/GHCSSStyle.h + + /KLi1TX1SrM6jopjQQBiHZm78/o= + + Headers/GHControl.h + + p3mMe9yH8rJD8Wm20c3Jd8lxCME= + + Headers/GHControlFactory.h + + a7H0B3wnhh76HiQKYHA2jGl6tk4= + + Headers/GHImageCache.h + + L3yqnld65EyxF+ZVm7agQKAwg08= + + Headers/GHRenderable.h + + k5uJ1lR+jjohQboiKl361vlWrPU= + + Headers/GHSegmentedControl.h + + 102VOHKDPJ/8BdnCba45Ido3ES0= + + Headers/SVGContext.h + + fYKblLtFBEOZBWKITmzeqxkB3wA= + + Headers/SVGDocumentView.h + + rQdMJag3XRMM0BrzxhBRVDCkECI= + + Headers/SVGParser.h + + kTsoaz1ZJ15TgzKXvxTFxWzjdOM= + + Headers/SVGPathGenerator.h + + mpIHrojH98DFrfoA1ur9U5rUUGE= + + Headers/SVGPrinter.h + + 8TpTqQL/mSb4Ja8jrSy9CYsrps8= + + Headers/SVGRenderer.h + + aVwIN13G4/FxE5oBMAhhVBzpuvk= + + Headers/SVGRendererLayer.h + + NYdrKdLUEhBB1Q1faRR/VkukMMY= + + Headers/SVGTabBarItem.h + + T6N+3S6IK3TPlToQWW/8fbYToao= + + Headers/SVGgh.h + + FhA5aS1gL+U2oztDy+ZAYAMbsQY= + + Headers/SVGghLoader.h + + xtYyyVEweMoAbmxnHJ3OLrTpB+c= + + Headers/SVGtoPDFConverter.h + + PYmLqlyOd/ZpkVp082ncU6Hhr08= + + Info.plist + + Ekf8hDNYwrf/YAzxlZyyfB58pCE= + + Modules/module.modulemap + + OvyNeJvLF4DKiaZWfAOhFhapEM8= + + + files2 + + Headers/GHButton.h + + hash + + Yo70QMvylnV/tGNngg/dxwCC+Es= + + hash2 + + e02JL9wz0/bvHZu9Mh0GvmUPm/1CWWkp6AM6AXjTWvw= + + + Headers/GHCSSStyle.h + + hash + + /KLi1TX1SrM6jopjQQBiHZm78/o= + + hash2 + + ThA3cD29qgXA7zxdYA4DdFwDV9Lz51HLEmPYwrSSGkQ= + + + Headers/GHControl.h + + hash + + p3mMe9yH8rJD8Wm20c3Jd8lxCME= + + hash2 + + wP2cK5Oo1eQAvri8ETIEqUTNmg0lmJ+rARoPs2DdPYQ= + + + Headers/GHControlFactory.h + + hash + + a7H0B3wnhh76HiQKYHA2jGl6tk4= + + hash2 + + 55SvszA5H4fH9r5fJfkP2hsGBUHP3dgUWeGzTgaqVM0= + + + Headers/GHImageCache.h + + hash + + L3yqnld65EyxF+ZVm7agQKAwg08= + + hash2 + + VjCYQ2OKSb5dgzejm1ykbJV99xz0zM0GdYNrBZ36gp4= + + + Headers/GHRenderable.h + + hash + + k5uJ1lR+jjohQboiKl361vlWrPU= + + hash2 + + 3b3LzhL3i3jVdQDNj2x7O8t9hNnghbkWUhoXw6JWQJQ= + + + Headers/GHSegmentedControl.h + + hash + + 102VOHKDPJ/8BdnCba45Ido3ES0= + + hash2 + + zNsVaFFe63wL2AaCOhdJ+FzacSKT7fgxQ9K6TMLGL7w= + + + Headers/SVGContext.h + + hash + + fYKblLtFBEOZBWKITmzeqxkB3wA= + + hash2 + + 7BISlxYEV6x9kQFS15ufHja8Q+26HD5NjXYaTDJyIEI= + + + Headers/SVGDocumentView.h + + hash + + rQdMJag3XRMM0BrzxhBRVDCkECI= + + hash2 + + uq16udgICqUPRBxMJr1B1C0sijIlFLtPhngwJeqRntE= + + + Headers/SVGParser.h + + hash + + kTsoaz1ZJ15TgzKXvxTFxWzjdOM= + + hash2 + + nL9jnqsL5GmWqqjE8CTk0VM9ysXla1JmKXUhoc9zJew= + + + Headers/SVGPathGenerator.h + + hash + + mpIHrojH98DFrfoA1ur9U5rUUGE= + + hash2 + + aCtFKiBFUHUMLTLS9KnMVfuz/JBhq/huj2tIXKT/t6g= + + + Headers/SVGPrinter.h + + hash + + 8TpTqQL/mSb4Ja8jrSy9CYsrps8= + + hash2 + + WZ3fWe7ZgJl6A8hKCphqIzD7fCdUsYsqi6ju4DSyvmQ= + + + Headers/SVGRenderer.h + + hash + + aVwIN13G4/FxE5oBMAhhVBzpuvk= + + hash2 + + 1FPgcUwZeZO91+/cpZg2gIHqAb+cOO9n9AcoIDu71QY= + + + Headers/SVGRendererLayer.h + + hash + + NYdrKdLUEhBB1Q1faRR/VkukMMY= + + hash2 + + 4vLnO1fPqCOatqPuYa+wsiksl1d21S7E2eXzVKeH0mQ= + + + Headers/SVGTabBarItem.h + + hash + + T6N+3S6IK3TPlToQWW/8fbYToao= + + hash2 + + FZKHWXa9wHb65sGsLAgVbX/IHlqu7zP4Jc4C6Fz71k0= + + + Headers/SVGgh.h + + hash + + FhA5aS1gL+U2oztDy+ZAYAMbsQY= + + hash2 + + K7FvEVgrwXFf8fYXUC1Z28mYShSPC2GIrNE0Q4jvPMs= + + + Headers/SVGghLoader.h + + hash + + xtYyyVEweMoAbmxnHJ3OLrTpB+c= + + hash2 + + eAmiKTkaGKhWeYrt4GzqMyXKWxvpJSrJe0aowwF858w= + + + Headers/SVGtoPDFConverter.h + + hash + + PYmLqlyOd/ZpkVp082ncU6Hhr08= + + hash2 + + aPPmosLWJKuzNygim1G+NZNMbZ67Jndy3J7vneUEeqQ= + + + Modules/module.modulemap + + hash + + OvyNeJvLF4DKiaZWfAOhFhapEM8= + + hash2 + + CmWiPcMFYwuE9f+Q49hr18AoV6Ol0PT3grO8cewWpnc= + + + + rules + + ^ + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^ + + weight + 20 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + +