Skip to content

Commit

Permalink
Lottie 2.0.0 Android
Browse files Browse the repository at this point in the history
  • Loading branch information
m1ga committed Jun 9, 2017
1 parent d992021 commit 81a88e0
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The Titanium modules use external libraries
|---|---|---|---|
| [Facebooks Keyframes](https://github.com/facebookincubator/Keyframes) | Android | 1.0.0 | 2017/02/11 |
| [Facebooks Keyframes](https://github.com/facebookincubator/Keyframes) | iOS | 1.0.0 | 2017/02/11 |
| [Airbnb Lottie](https://github.com/airbnb/lottie-android) | Android | 2.0.0-beta4 | 2017/05/01 |
| [Airbnb Lottie](https://github.com/airbnb/lottie-android) | Android | 2.0.0 | 2017/06/09 |
| [Airbnb Lottie](https://github.com/airbnb/lottie-ios) | iOS | 1.5.1 | 2017/03/18 |


Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 1.0.6
version: 1.1.0
apiversion: 3
architectures: armeabi-v7a x86
description: ti.animation
Expand Down
4 changes: 0 additions & 4 deletions android/platform/android/res/values/ids.xml

This file was deleted.

19 changes: 14 additions & 5 deletions android/platform/android/res/values/values.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="LottieAnimationView">
<attr name="lottie_fileName" format="string"/>
<attr name="lottie_autoPlay" format="boolean" />
<attr name="lottie_loop" format="boolean" />
<declare-styleable name="LottieAnimationView">
<attr format="string" name="lottie_fileName"/>
<attr format="boolean" name="lottie_autoPlay"/>
<attr format="boolean" name="lottie_loop"/>
<attr format="string" name="lottie_imageAssetsFolder"/>
<attr format="float" name="lottie_progress"/>
<attr format="boolean" name="lottie_enableMergePathsForKitKatAndAbove"/>
<attr format="enum" name="lottie_cacheStrategy">
<enum name="none" value="0"/>
<enum name="weak" value="1"/>
<enum name="strong" value="2"/>
</attr>
<attr format="color" name="lottie_colorFilter"/><attr format="float" name="lottie_scale"/>
</declare-styleable>
<item name="lottie_layer_name" type="id" />
<item name="lottie_layer_name" type="id"/>
</resources>

0 comments on commit 81a88e0

Please sign in to comment.