fix not to call deprecated getDrawable in postLolipop

Manabu-GT · Manabu-GT · commit deed7871526d · 2015-03-29T01:12:00.000+09:00
diff --git a/build.gradle b/build.gradle
@@ -22,4 +22,7 @@ project.ext {
 
     ANDROID_MIN_SDK_VERSION = 8
     ANDROID_TARGET_SDK_VERSION = 22
+
+    // Google Stuffs
+    supportPackageVersion = "22.0.0"
 }
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -19,6 +19,8 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
+    // to support annotations such as @NonNull
+    compile "com.android.support:support-annotations:${supportPackageVersion}"
 }
 
 // for maven central deployment
diff --git a/lib/src/main/java/com/ms/square/android/expandabletextview/ExpandableTextView.java b/lib/src/main/java/com/ms/square/android/expandabletextview/ExpandableTextView.java
@@ -19,9 +19,12 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.SparseBooleanArray;
@@ -233,10 +236,10 @@ private void init(AttributeSet attrs) {
         mCollapseDrawable = typedArray.getDrawable(R.styleable.ExpandableTextView_collapseDrawable);
 
         if (mExpandDrawable == null) {
-            mExpandDrawable = getResources().getDrawable(R.drawable.ic_expand_small_holo_light, null);
+            mExpandDrawable = getDrawable(getResources(), R.drawable.ic_expand_small_holo_light);
         }
         if (mCollapseDrawable == null) {
-            mCollapseDrawable = getResources().getDrawable(R.drawable.ic_collapse_small_holo_light, null);
+            mCollapseDrawable = getDrawable(getResources(), R.drawable.ic_collapse_small_holo_light);
         }
 
         typedArray.recycle();
@@ -254,6 +257,10 @@ private static boolean isPostHoneycomb() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB;
     }
 
+    private static boolean isPostLolipop() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+    }
+
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     private static void applyAlphaAnimation(View view, float alpha) {
         if (isPostHoneycomb()) {
@@ -267,7 +274,16 @@ private static void applyAlphaAnimation(View view, float alpha) {
         }
     }
 
-    private static int getRealTextViewHeight(TextView textView) {
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    private static Drawable getDrawable(@NonNull Resources resources, @DrawableRes int resId) {
+        if (isPostLolipop()) {
+            return resources.getDrawable(resId, null);
+        } else {
+            return resources.getDrawable(resId);
+        }
+    }
+
+    private static int getRealTextViewHeight(@NonNull TextView textView) {
         int textHeight = textView.getLayout().getLineTop(textView.getLineCount());
         int padding = textView.getCompoundPaddingTop() + textView.getCompoundPaddingBottom();
         return textHeight + padding;

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,7 @@ project.ext {`
`22`	`22`
`23`	`23`	`ANDROID_MIN_SDK_VERSION = 8`
`24`	`24`	`ANDROID_TARGET_SDK_VERSION = 22`
	`25`	`+`
	`26`	`+ // Google Stuffs`
	`27`	`+ supportPackageVersion = "22.0.0"`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ android {`
`19`	`19`
`20`	`20`	`dependencies {`
`21`	`21`	`compile fileTree(dir: 'libs', include: ['*.jar'])`
	`22`	`+ // to support annotations such as @NonNull`
	`23`	`+ compile "com.android.support:support-annotations:${supportPackageVersion}"`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`// for maven central deployment`