Update lottie to 2.2.0

fbshipit-source-id: 7f167c1
This commit is contained in:
Janic Duplessis
2017-09-07 19:01:30 +00:00
committed by Exponent GitHub Bot
parent fa824921c0
commit 9003d88767
8 changed files with 14 additions and 12 deletions

View File

@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
ss.dependency 'Fabric', '~> 1.6'
ss.dependency 'GoogleSignIn', '~> 3.0'
ss.dependency 'GoogleMaps', '~> 2.2.0'
ss.dependency 'lottie-ios', '~> 1.5.1'
ss.dependency 'lottie-ios', '~> 2.1.3'
ss.dependency 'GPUImage', '~> 0.1.7'
ss.dependency 'Branch', '~> 0.14.12'
end

View File

@@ -134,7 +134,7 @@ dependencies {
compile 'com.segment.analytics.android:analytics:4.+'
compile 'com.google.zxing:core:3.2.1'
compile 'net.openid:appauth:0.4.1'
compile 'com.airbnb.android:lottie:2.0.0-beta3'
compile 'com.airbnb.android:lottie:2.2.0'
compile 'io.branch.sdk.android:library:2.6.1'
compile('io.nlopez.smartlocation:library:3.2.11') {
transitive = false

View File

@@ -250,7 +250,7 @@ dependencies {
compile 'com.segment.analytics.android:analytics:4.+'
compile 'com.google.zxing:core:3.2.1'
compile 'net.openid:appauth:0.4.1'
compile 'com.airbnb.android:lottie:2.0.0-beta3'
compile 'com.airbnb.android:lottie:2.2.0'
compile 'io.branch.sdk.android:library:2.6.1'
compile('io.nlopez.smartlocation:library:3.2.11') {
transitive = false

View File

@@ -148,11 +148,7 @@ class JSONReadableArray extends JSONArray {
case Boolean:
return getBoolean(index);
case Number:
try {
return getInt(index);
} catch (Exception e) {
return getDouble(index);
}
case String:
return getString(index);
case Null:

View File

@@ -128,11 +128,7 @@ class JSONReadableMap extends JSONObject {
case Boolean:
return map.getBoolean(name);
case Number:
try {
return map.getInt(name);
} catch (Exception e) {
return map.getDouble(name);
}
case String:
return map.getString(name);
case Null:

View File

@@ -102,4 +102,9 @@ class LottieAnimationViewManager extends SimpleViewManager<LottieAnimationView>
public void setLoop(LottieAnimationView view, boolean loop) {
view.loop(loop);
}
@ReactProp(name = "imageAssetsFolder")
public void setImageAssetsFolder(LottieAnimationView view, String imageAssetsFolder) {
view.setImageAssetsFolder(imageAssetsFolder);
}
}

View File

@@ -15,6 +15,11 @@ public class LottiePackage implements ReactPackage {
return Collections.emptyList();
}
// Deprecated RN 0.47
public List<Class<? extends JavaScriptModule>> createJSModules() {
return Collections.emptyList();
}
@SuppressWarnings("rawtypes") @Override
public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
return Collections.<ViewManager>singletonList(new LottieAnimationViewManager());

View File

@@ -11,7 +11,7 @@
{ "name": "Fabric", "version": "~> 1.6" },
{ "name": "GoogleSignIn", "version": "~> 3.0" },
{ "name": "GoogleMaps", "version": "~> 2.2.0" },
{ "name": "lottie-ios", "version": "~> 1.5.1" },
{ "name": "lottie-ios", "version": "~> 2.1.3" },
{ "name": "GPUImage", "version": "~> 0.1.7" },
{ "name": "Branch", "version": "~> 0.14.12"}
]