From f9b05cd50eb5cfc147eb5d97e4e930516db88574 Mon Sep 17 00:00:00 2001
From: xmk <289203664@qq.com>
Date: Mon, 21 Jan 2019 11:14:27 +0800
Subject: [PATCH 1/3] update buildTool, supportLib and designLib to 28.0.0

---
 app/build.gradle        | 9 +++++----
 likebutton/build.gradle | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e493384..e96c4bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,9 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.1"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.0"
+//    buildToolsVersion "28.0.0"
 
     lintOptions {
         abortOnError false
@@ -26,8 +27,8 @@ android {
 
 dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:appcompat-v7:27.0.1'
-    compile 'com.android.support:design:27.0.1'
+    compile 'com.android.support:appcompat-v7:28.0.0'
+    compile 'com.android.support:design:28.0.0'
     compile project(':likebutton')
     //compile 'com.github.jd-alexander:LikeButton:0.1.6'
     compile 'com.jakewharton:butterknife:8.8.1'
diff --git a/likebutton/build.gradle b/likebutton/build.gradle
index 9e82dc1..80920ed 100644
--- a/likebutton/build.gradle
+++ b/likebutton/build.gradle
@@ -4,8 +4,8 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.jd-alexander'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.1"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.0"
 
     lintOptions {
         abortOnError false
@@ -29,5 +29,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:27.0.1'
+    compile 'com.android.support:appcompat-v7:28.0.0'
 }

From 7eff5734e43f7b6db49d1b5d297ba0ba3fffd074 Mon Sep 17 00:00:00 2001
From: xmk <289203664@qq.com>
Date: Mon, 21 Jan 2019 11:16:47 +0800
Subject: [PATCH 2/3] support tint for likeDrawable, unlikeDrawable and
 built-in icons(heart,star,etc.), vector drawable tint included.

---
 .travis.yml                                   |  6 +--
 app/src/main/res/layout/content_main.xml      |  3 ++
 .../src/main/java/com/like/LikeButton.java    | 49 +++++++++++++++++--
 likebutton/src/main/java/com/like/Utils.java  |  2 +-
 likebutton/src/main/res/values/attrs.xml      |  2 +
 5 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8149f33..182c7a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 before_install:
  - chmod +x gradlew
-  - yes | sdkmanager "platforms;android-27"
+  - yes | sdkmanager "platforms;android-28"
   
 language: android
 jdk: oraclejdk8
@@ -8,8 +8,8 @@ jdk: oraclejdk8
 android:
   components:
     - tools
-    - build-tools-27.0.1
-    - android-27
+    - build-tools-28.0.0
+    - android-28
     - extra-android-support
     - extra-android-m2repository
     - extra-google-m2repository
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 8e53747..068726a 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -63,8 +63,11 @@
             app:dots_primary_color="@android:color/holo_green_dark"
             app:dots_secondary_color="@android:color/holo_green_light"
             app:icon_size="22dp"
+            app:unlike_drawable_tint="#262626"
+            app:like_drawable_tint="#69F0AE"
             app:like_drawable="@drawable/ic_android_green_500_24dp"
             app:unlike_drawable="@drawable/ic_android_grey_500_24dp" />
+
     </LinearLayout>
     <Button
         android:id="@+id/button"
diff --git a/likebutton/src/main/java/com/like/LikeButton.java b/likebutton/src/main/java/com/like/LikeButton.java
index 83b42bf..34a2757 100644
--- a/likebutton/src/main/java/com/like/LikeButton.java
+++ b/likebutton/src/main/java/com/like/LikeButton.java
@@ -7,10 +7,13 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.support.annotation.ColorInt;
 import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.graphics.drawable.DrawableCompat;
+import android.support.v7.content.res.AppCompatResources;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -53,6 +56,12 @@ public class LikeButton extends FrameLayout implements View.OnClickListener {
     private Drawable likeDrawable;
     private Drawable unLikeDrawable;
 
+    private boolean hasLikeDrawableTintColor=false;
+    private boolean hasUnlikeDrawableTintColor=false;
+
+    private @ColorInt int likeDrawableTintColor;
+    private @ColorInt int unLikeDrawableTintColor;
+
     public LikeButton(Context context) {
         this(context, null);
     }
@@ -90,6 +99,16 @@ private void init(Context context, AttributeSet attrs, int defStyle) {
 
         String iconType = array.getString(R.styleable.LikeButton_icon_type);
 
+        hasLikeDrawableTintColor=array.hasValue(R.styleable.LikeButton_like_drawable_tint);
+        if(hasLikeDrawableTintColor){
+            likeDrawableTintColor=array.getColor(R.styleable.LikeButton_like_drawable_tint,0);
+        }
+
+        hasUnlikeDrawableTintColor=array.hasValue(R.styleable.LikeButton_unlike_drawable_tint);
+        if(hasUnlikeDrawableTintColor){
+            unLikeDrawableTintColor=array.getColor(R.styleable.LikeButton_unlike_drawable_tint,0);
+        }
+
         likeDrawable = getDrawableFromResource(array, R.styleable.LikeButton_like_drawable);
 
         if (likeDrawable != null)
@@ -142,7 +161,7 @@ private void init(Context context, AttributeSet attrs, int defStyle) {
     private Drawable getDrawableFromResource(TypedArray array, int styleableIndexId) {
         int id = array.getResourceId(styleableIndexId, -1);
 
-        return (-1 != id) ? ContextCompat.getDrawable(getContext(), id) : null;
+        return (-1 != id) ? AppCompatResources.getDrawable(getContext(), id) : null;
     }
 
     /**
@@ -289,17 +308,31 @@ public boolean onTouchEvent(MotionEvent event) {
      * @param resId
      */
     public void setLikeDrawableRes(@DrawableRes int resId) {
-        likeDrawable = ContextCompat.getDrawable(getContext(), resId);
+        likeDrawable = AppCompatResources.getDrawable(getContext(), resId);
 
         if (iconSize != 0) {
             likeDrawable = Utils.resizeDrawable(getContext(), likeDrawable, iconSize, iconSize);
         }
+        tintDrawable(likeDrawable,hasLikeDrawableTintColor,likeDrawableTintColor);
 
         if (isChecked) {
             icon.setImageDrawable(likeDrawable);
         }
     }
 
+    private void tintDrawable(Drawable drawable,boolean needTint,@ColorInt int tintColor){
+    	if(needTint){
+//    	    if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP){
+//    	        drawable.setTint(tintColor);
+//		        drawable.invalidateSelf();
+//    	    }else{
+                drawable = DrawableCompat.wrap(drawable).mutate();
+		        DrawableCompat.setTint(drawable,tintColor);
+		        drawable.invalidateSelf();
+//            }
+	    }
+    }
+
     /**
      * This drawable is shown when the button is in a liked state.
      *
@@ -311,6 +344,7 @@ public void setLikeDrawable(Drawable likeDrawable) {
         if (iconSize != 0) {
             this.likeDrawable = Utils.resizeDrawable(getContext(), likeDrawable, iconSize, iconSize);
         }
+        tintDrawable(this.likeDrawable,hasLikeDrawableTintColor,likeDrawableTintColor);
 
         if (isChecked) {
             icon.setImageDrawable(this.likeDrawable);
@@ -323,11 +357,12 @@ public void setLikeDrawable(Drawable likeDrawable) {
      * @param resId
      */
     public void setUnlikeDrawableRes(@DrawableRes int resId) {
-        unLikeDrawable = ContextCompat.getDrawable(getContext(), resId);
+        unLikeDrawable = AppCompatResources.getDrawable(getContext(), resId);
 
         if (iconSize != 0) {
             unLikeDrawable = Utils.resizeDrawable(getContext(), unLikeDrawable, iconSize, iconSize);
         }
+        tintDrawable(unLikeDrawable,hasUnlikeDrawableTintColor,unLikeDrawableTintColor);
 
         if (!isChecked) {
             icon.setImageDrawable(unLikeDrawable);
@@ -345,6 +380,7 @@ public void setUnlikeDrawable(Drawable unLikeDrawable) {
         if (iconSize != 0) {
             this.unLikeDrawable = Utils.resizeDrawable(getContext(), unLikeDrawable, iconSize, iconSize);
         }
+        tintDrawable(this.unLikeDrawable,hasUnlikeDrawableTintColor,unLikeDrawableTintColor);
 
         if (!isChecked) {
             icon.setImageDrawable(this.unLikeDrawable);
@@ -391,6 +427,8 @@ public void setIconSizePx(int iconSize) {
         setEffectsViewSize();
         this.unLikeDrawable = Utils.resizeDrawable(getContext(), unLikeDrawable, iconSize, iconSize);
         this.likeDrawable = Utils.resizeDrawable(getContext(), likeDrawable, iconSize, iconSize);
+	    tintDrawable(likeDrawable,hasLikeDrawableTintColor,likeDrawableTintColor);
+	    tintDrawable(unLikeDrawable,hasUnlikeDrawableTintColor,unLikeDrawableTintColor);
     }
 
     /**
@@ -487,6 +525,11 @@ public void setCircleEndColorRes(@ColorRes int circleEndColor) {
         circleView.setEndColor(this.circleEndColor);
     }
 
+    public void setCircleEndColorInt(@ColorInt int circleEndColor) {
+        this.circleEndColor = circleEndColor;
+        circleView.setEndColor(circleEndColor);
+    }
+
     /**
      * This function updates the dots view and the circle
      * view with the respective sizes based on the size
diff --git a/likebutton/src/main/java/com/like/Utils.java b/likebutton/src/main/java/com/like/Utils.java
index c6fb6f8..9601b76 100644
--- a/likebutton/src/main/java/com/like/Utils.java
+++ b/likebutton/src/main/java/com/like/Utils.java
@@ -48,7 +48,7 @@ public static Bitmap getBitmap(Drawable drawable, int width, int height) {
             return ((BitmapDrawable) drawable).getBitmap();
         } else if (drawable instanceof VectorDrawableCompat) {
             return getBitmap((VectorDrawableCompat) drawable, width, height);
-        } else if (drawable instanceof VectorDrawable) {
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && drawable instanceof VectorDrawable) {
             return getBitmap((VectorDrawable) drawable, width, height);
         } else {
             throw new IllegalArgumentException("Unsupported drawable type");
diff --git a/likebutton/src/main/res/values/attrs.xml b/likebutton/src/main/res/values/attrs.xml
index c8e87c4..05fce32 100644
--- a/likebutton/src/main/res/values/attrs.xml
+++ b/likebutton/src/main/res/values/attrs.xml
@@ -5,6 +5,8 @@
         <attr name="icon_size" format="dimension|reference"/>
         <attr name="like_drawable" format="reference" />
         <attr name="unlike_drawable" format="reference" />
+        <attr name="like_drawable_tint" format="color" />
+        <attr name="unlike_drawable_tint" format="color" />
         <attr name="dots_primary_color" format="color|reference" />
         <attr name="dots_secondary_color" format="color|reference" />
         <attr name="circle_start_color" format="color|reference" />

From 8b117b4cc6f687b5395e78058bb8140cb82cb991 Mon Sep 17 00:00:00 2001
From: xmk <289203664@qq.com>
Date: Mon, 21 Jan 2019 17:29:09 +0800
Subject: [PATCH 3/3] add getter and setter for tint colors

---
 .../java/com/like/example/MainActivity.java   |  5 +++
 app/src/main/res/layout/content_main.xml      |  2 -
 .../src/main/java/com/like/LikeButton.java    | 38 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/like/example/MainActivity.java b/app/src/main/java/com/like/example/MainActivity.java
index fd7461c..5b71027 100644
--- a/app/src/main/java/com/like/example/MainActivity.java
+++ b/app/src/main/java/com/like/example/MainActivity.java
@@ -1,6 +1,7 @@
 package com.like.example;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
@@ -35,6 +36,8 @@ public class MainActivity extends AppCompatActivity implements OnLikeListener,
     LikeButton thumbButton;
     @BindView(R.id.smile_button)
     LikeButton smileButton;
+    @BindView(R.id.vector_android_button)
+    LikeButton vectorButton;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -57,6 +60,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         thumbButton.setLiked(true);
 
+        vectorButton.setLikeDrawableTintColor(Color.GREEN);
+        vectorButton.setUnLikeDrawableTintColor(Color.BLACK);
         usingCustomIcons();
 
     }
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 068726a..c1905c5 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -63,8 +63,6 @@
             app:dots_primary_color="@android:color/holo_green_dark"
             app:dots_secondary_color="@android:color/holo_green_light"
             app:icon_size="22dp"
-            app:unlike_drawable_tint="#262626"
-            app:like_drawable_tint="#69F0AE"
             app:like_drawable="@drawable/ic_android_green_500_24dp"
             app:unlike_drawable="@drawable/ic_android_grey_500_24dp" />
 
diff --git a/likebutton/src/main/java/com/like/LikeButton.java b/likebutton/src/main/java/com/like/LikeButton.java
index 34a2757..d97f353 100644
--- a/likebutton/src/main/java/com/like/LikeButton.java
+++ b/likebutton/src/main/java/com/like/LikeButton.java
@@ -320,7 +320,43 @@ public void setLikeDrawableRes(@DrawableRes int resId) {
         }
     }
 
-    private void tintDrawable(Drawable drawable,boolean needTint,@ColorInt int tintColor){
+    public boolean hasLikeDrawableTintColor() {
+        return hasLikeDrawableTintColor;
+    }
+
+    public void setHasLikeDrawableTintColor(boolean hasLikeDrawableTintColor) {
+        this.hasLikeDrawableTintColor = hasLikeDrawableTintColor;
+    }
+
+    public boolean hasUnlikeDrawableTintColor() {
+        return hasUnlikeDrawableTintColor;
+    }
+
+    public void setHasUnlikeDrawableTintColor(boolean hasUnlikeDrawableTintColor) {
+        this.hasUnlikeDrawableTintColor = hasUnlikeDrawableTintColor;
+    }
+
+    public int getLikeDrawableTintColor() {
+        return likeDrawableTintColor;
+    }
+
+    public void setLikeDrawableTintColor(int likeDrawableTintColor) {
+        this.likeDrawableTintColor = likeDrawableTintColor;
+        hasLikeDrawableTintColor = true;
+        tintDrawable(likeDrawable,hasLikeDrawableTintColor,likeDrawableTintColor);
+    }
+
+    public int getUnLikeDrawableTintColor() {
+        return unLikeDrawableTintColor;
+    }
+
+    public void setUnLikeDrawableTintColor(int unLikeDrawableTintColor) {
+        this.unLikeDrawableTintColor = unLikeDrawableTintColor;
+        hasUnlikeDrawableTintColor = true;
+        tintDrawable(unLikeDrawable,hasUnlikeDrawableTintColor,unLikeDrawableTintColor);
+    }
+
+    private void tintDrawable(Drawable drawable, boolean needTint, @ColorInt int tintColor){
     	if(needTint){
 //    	    if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.LOLLIPOP){
 //    	        drawable.setTint(tintColor);