fixed errors that occurred when setting drawable via xml

Author: jd-alexander

app/src/main/res/layout/content_main.xml

@@ -31,8 +31,9 @@
             android:layout_height="wrap_content"/>
 
         <com.like.LikeButton
-            app:icon_type="thumb"
             app:icon_size="25dp"
+            app:like_drawable="@drawable/thumb_on"
+            app:unlike_drawable="@drawable/thumb_off"
             app:circle_start_color="@android:color/holo_blue_bright"
             app:circle_end_color="@android:color/holo_blue_dark"
             app:dots_primary_color="@android:color/holo_blue_light"

likebutton/src/main/java/com/like/LikeButton.java

@@ -68,6 +68,11 @@ public LikeButton(Context context, AttributeSet attrs, int defStyleAttr) {
      * @param defStyle
      */
     private void init(Context context, AttributeSet attrs, int defStyle) {
+        LayoutInflater.from(getContext()).inflate(R.layout.likeview, this, true);
+        icon = (ImageView) findViewById(R.id.icon);
+        dotsView = (DotsView) findViewById(R.id.dots);
+        circleView = (CircleView) findViewById(R.id.circle);
+
         final TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.LikeButton, defStyle, 0);
 
         iconSize = array.getDimensionPixelSize(R.styleable.LikeButton_icon_size, -1);
@@ -77,19 +82,20 @@ private void init(Context context, AttributeSet attrs, int defStyle) {
         String iconType = array.getString(R.styleable.LikeButton_icon_type);
 
         likeDrawable = array.getDrawable(R.styleable.LikeButton_like_drawable);
+
+        if(likeDrawable!=null)
+            setLikeDrawable(likeDrawable);
+
         unlikeDrawable = array.getDrawable(R.styleable.LikeButton_unlike_drawable);
 
+        if(unlikeDrawable!=null)
+            setUnlikeDrawable(unlikeDrawable);
 
         if (iconType != null)
             if (!iconType.isEmpty())
                 currentIcon = parseIconType(iconType);
 
 
-        LayoutInflater.from(getContext()).inflate(R.layout.likeview, this, true);
-        icon = (ImageView) findViewById(R.id.icon);
-        dotsView = (DotsView) findViewById(R.id.dots);
-        circleView = (CircleView) findViewById(R.id.circle);
-
         circleStartColor = array.getColor(R.styleable.LikeButton_circle_start_color, 0);
 
         if (circleStartColor != 0)