Merge branch 'hotfix/fix_vector'

sangcomz · Sep 7, 2018 · 7fc459d · 7fc459d
2 parents 3933fea + 7c8279e
commit 7fc459d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/chameleon/build.gradle b/chameleon/build.gradle
@@ -12,6 +12,7 @@ android {
         versionName gradle.versionName
         versionCode gradle.versionCode
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary true
     }
 }
 

diff --git a/chameleon/src/main/java/xyz/sangcomz/chameleon/Chameleon.kt b/chameleon/src/main/java/xyz/sangcomz/chameleon/Chameleon.kt
@@ -63,7 +63,7 @@ open class Chameleon(context: Context?, attrs: AttributeSet?) : ConstraintLayout
                                 it.getString(R.styleable.Chameleon_emptySubText) ?: "empty content",
                                 it.getColor(R.styleable.Chameleon_emptySubTextColor, ContextCompat.getColor(context, R.color.colorSubText)),
                                 it.getDimension(R.styleable.Chameleon_emptySubTextSize, context.resources.getDimension(R.dimen.sub_text_size)),
-                                it.getDrawable(R.styleable.Chameleon_emptyDrawable)
+                                it.getResourceId(R.styleable.Chameleon_emptyDrawable, -1).getDrawable(context)
                                         ?: R.drawable.ic_empty.getDrawable(context),
                                 it.getString(R.styleable.Chameleon_emptyButtonText) ?: "retry",
                                 it.getColor(R.styleable.Chameleon_emptyButtonTextColor, ContextCompat.getColor(context, R.color.colorTitleText)),
@@ -76,7 +76,7 @@ open class Chameleon(context: Context?, attrs: AttributeSet?) : ConstraintLayout
                                 it.getString(R.styleable.Chameleon_errorSubText) ?: "error content",
                                 it.getColor(R.styleable.Chameleon_errorSubTextColor, ContextCompat.getColor(context, R.color.colorSubText)),
                                 it.getDimension(R.styleable.Chameleon_errorSubTextSize, context.resources.getDimension(R.dimen.sub_text_size)),
-                                it.getDrawable(R.styleable.Chameleon_errorDrawable)
+                                it.getResourceId(R.styleable.Chameleon_errorDrawable, -1).getDrawable(context)
                                         ?: R.drawable.ic_error.getDrawable(context),
                                 it.getString(R.styleable.Chameleon_errorButtonText) ?: "retry",
                                 it.getColor(R.styleable.Chameleon_errorButtonTextColor, ContextCompat.getColor(context, R.color.colorTitleText)),