Merge pull request #78 from fabionuno/lottie-ios-152

Update to Lottie iOS 1.5.2
Baseflow · Jul 26, 2017 · 3e14e99 · 3e14e99
2 parents 7e75a10 + e774d7b
commit 3e14e99
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 12 deletions.
diff --git a/Examples/Example.iOS/Example.iOS.csproj b/Examples/Example.iOS/Example.iOS.csproj
@@ -21,14 +21,14 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <MtouchFastDev>true</MtouchFastDev>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <IOSDebuggerPort>38424</IOSDebuggerPort>
     <MtouchLink>None</MtouchLink>
-    <MtouchArch>x86_64</MtouchArch>
+    <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchTlsProvider>Default</MtouchTlsProvider>
     <PlatformTarget>x86</PlatformTarget>
+    <MtouchExtraArgs></MtouchExtraArgs>
+    <MtouchFloat32>true</MtouchFloat32>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>pdbonly</DebugType>
@@ -37,8 +37,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>
@@ -54,8 +52,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
@@ -74,8 +70,6 @@
     <DeviceSpecificBuild>true</DeviceSpecificBuild>
     <MtouchDebug>true</MtouchDebug>
     <MtouchFastDev>true</MtouchFastDev>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>

diff --git a/Lottie.iOS/ApiDefinition.cs b/Lottie.iOS/ApiDefinition.cs
@@ -12,6 +12,10 @@ interface LOTAnimationTransitionController : IUIViewControllerAnimatedTransition
         // -(instancetype)initWithAnimationNamed:(NSString *)animation fromLayerNamed:(NSString *)fromLayer toLayerNamed:(NSString *)toLayer;
         [Export("initWithAnimationNamed:fromLayerNamed:toLayerNamed:")]
         IntPtr Constructor(string animation, string fromLayer, string toLayer);
+
+        //
+		[Export("initWithAnimationNamed:fromLayerNamed:toLayerNamed:inBundle:")]
+		IntPtr Constructor(string animation, string fromLayer, string toLayer, NSBundle bundle);
     }
 
     // typedef void (^LOTAnimationCompletionBlock)(BOOL);
@@ -36,10 +40,21 @@ interface LOTAnimationView
         [Export("animationFromJSON:")]
         LOTAnimationView AnimationFromJSON(NSDictionary animationJSON);
 
-        // -(instancetype)initWithContentsOfURL:(NSURL *)url;
-        [Export("initWithContentsOfURL:")]
+		// +(instancetype)animationFromJSON:(NSDictionary *)animationJSON inBundle:(NSBundle *)bundle;
+		[Static]
+		[Export("animationFromJSON:inBundle:")]
+		LOTAnimationView AnimationFromJSON(NSDictionary animationJSON, NSBundle bundle);
+
+
+		// -(instancetype)initWithContentsOfURL:(NSURL *)url;
+		[Export("initWithContentsOfURL:")]
         IntPtr Constructor(NSUrl url);
 
+		// +(instancetype)animationWithFilePath:(NSString *)filePath;
+		[Static]
+		[Export("animationWithFilePath:")]
+		LOTAnimationView AnimationWithFilePath(string filePath);
+
         // @property (readonly, nonatomic) BOOL isAnimationPlaying;
         [Export("isAnimationPlaying")]
         bool IsAnimationPlaying { get; }

diff --git a/Lottie.iOS/libLottie.a b/Lottie.iOS/libLottie.a
diff --git a/Lottie.macOS/ApiDefinition.cs b/Lottie.macOS/ApiDefinition.cs
@@ -28,6 +28,11 @@ interface LOTAnimationView
         [Export("animationFromJSON:")]
         LOTAnimationView AnimationFromJSON(NSDictionary animationJSON);
 
+		// +(instancetype)animationFromJSON:(NSDictionary *)animationJSON inBundle:(NSBundle *)bundle;
+		[Static]
+		[Export("animationFromJSON:inBundle:")]
+		LOTAnimationView AnimationFromJSON(NSDictionary animationJSON, NSBundle bundle);
+
         // -(instancetype)initWithContentsOfURL:(NSURL *)url;
         [Export("initWithContentsOfURL:")]
         IntPtr Constructor(NSUrl url);

diff --git a/Lottie.macOS/libLottie.a b/Lottie.macOS/libLottie.a
diff --git a/Lottie.tvOS/libLottie.a b/Lottie.tvOS/libLottie.a
diff --git a/nuspec/Com.Airbnb.iOS.Lottie.nuspec b/nuspec/Com.Airbnb.iOS.Lottie.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Com.Airbnb.iOS.Lottie</id>
-        <version>1.5.1.1</version>
+        <version>1.5.2.0</version>
         <title>Lottie for Xamarin.iOS, macOS and tvOS</title>
         <authors>Martijn van Dijk</authors>
         <owners>Martijn van Dijk</owners>