diff --git a/attribouter/build.gradle b/attribouter/build.gradle index cd6e176..b197d09 100644 --- a/attribouter/build.gradle +++ b/attribouter/build.gradle @@ -1,5 +1,11 @@ apply plugin: 'com.android.library' +ext { + PUBLISH_GROUP_ID = 'me.jfenn' + PUBLISH_ARTIFACT_ID = 'attribouter' + PUBLISH_VERSION = '0.0.1' +} + android { compileSdkVersion 27 @@ -7,7 +13,7 @@ android { minSdkVersion 15 targetSdkVersion 27 versionCode 1 - versionName "1.0" + versionName "0.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -34,3 +40,5 @@ dependencies { implementation 'com.github.bumptech.glide:glide:4.6.1' annotationProcessor 'com.github.bumptech.glide:compiler:4.6.1' } + +apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle' diff --git a/attribouter/src/main/java/me/jfenn/attribouter/utils/ImageUtils.java b/attribouter/src/main/java/me/jfenn/attribouter/utils/ImageUtils.java index b64574a..1bfbcff 100644 --- a/attribouter/src/main/java/me/jfenn/attribouter/utils/ImageUtils.java +++ b/attribouter/src/main/java/me/jfenn/attribouter/utils/ImageUtils.java @@ -7,6 +7,7 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.VectorDrawable; +import android.os.Build; import android.support.graphics.drawable.VectorDrawableCompat; public class ImageUtils { @@ -14,7 +15,7 @@ public class ImageUtils { public static Bitmap drawableToBitmap(Drawable drawable) { if (drawable == null) drawable = new ColorDrawable(Color.TRANSPARENT); if (drawable instanceof BitmapDrawable) return ((BitmapDrawable) drawable).getBitmap(); - if (drawable instanceof VectorDrawableCompat || drawable instanceof VectorDrawable) { + if (drawable instanceof VectorDrawableCompat || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && drawable instanceof VectorDrawable)) { Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888); Canvas canvas = new Canvas(bitmap); drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());