Merge pull request #16 from wkh237/master

Fix non-integer size property error
maxs15 · May 20, 2016 · a086c78 · a086c78
2 parents 93243e6 + 46b58c7
commit a086c78
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 47 deletions.
diff --git a/android/.gitignore b/android/.gitignore
@@ -53,3 +53,4 @@ Thumbs.db
 .idea/tasks.xml
 .idea/vcs.xml
 .idea/workspace.xml
+.idea/misc.xml
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
diff --git a/android/src/main/java/com/react/rnspinkit/RNSpinkit.java b/android/src/main/java/com/react/rnspinkit/RNSpinkit.java
@@ -47,7 +47,7 @@ public class RNSpinkit extends SimpleViewManager<SpinKitView> {
 
     ReactApplicationContext mContext;
     Sprite mSprite = getSprite("");
-    int mSize = 48;
+    double mSize = 48;
 
     public RNSpinkit(ReactApplicationContext reactContext) {
         mContext = reactContext;
@@ -82,7 +82,7 @@ public void setColor(SpinKitView view, @Nullable String color) {
     }
 
     @ReactProp(name = "size")
-    public void setSize(SpinKitView view, @Nullable Integer size) {
+    public void setSize(SpinKitView view, @Nullable double size) {
         mSize = size;
         RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         view.setLayoutParams(params);

diff --git a/index.js b/index.js
@@ -37,8 +37,8 @@ class Spinkit extends React.Component {
 		if (!this.props.isVisible) return <View/>;
 		return (
 			<RNSpinkit
-				type={this.props.type}
-				size={this.props.size}
+				type={String(this.props.type)}
+				size={parseInt(this.props.size)}
 				color={this.props.color}
 				style={[size, this.props.style]}/>
 		);