androidannotations · WonderCsabo · May 22, 2015 · May 21, 2015
diff --git a/...notations/androidannotations/src/main/java/org/androidannotations/handler/ResHandler.java b/...notations/androidannotations/src/main/java/org/androidannotations/handler/ResHandler.java
@@ -22,6 +22,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.type.TypeMirror;

+import org.androidannotations.annotations.res.DrawableRes;
 import org.androidannotations.annotations.res.HtmlRes;
 import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.CanonicalNameConstants;
@@ -88,9 +89,15 @@ public void process(Element element, EComponentHolder holder) {
 			// Special case for @HtmlRes
 			if (element.getAnnotation(HtmlRes.class) != null) {
 				methodBody.assign(ref(fieldName), classes().HTML.staticInvoke("fromHtml").arg(invoke(holder.getResourcesRef(), resourceMethodName).arg(idRef)));
+			} else if (element.getAnnotation(DrawableRes.class) != null && hasContextCompatInClasspath()) {
+				methodBody.assign(ref(fieldName), classes().CONTEXT_COMPAT.staticInvoke("getDrawable").arg(holder.getContextRef()).arg(idRef));
 			} else {
 				methodBody.assign(ref(fieldName), invoke(holder.getResourcesRef(), resourceMethodName).arg(idRef));
 			}
 		}
 	}
+
+	protected boolean hasContextCompatInClasspath() {
+		return processingEnvironment().getElementUtils().getTypeElement(CanonicalNameConstants.CONTEXT_COMPAT) != null;
+	}
 }
diff --git a/...ndroidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java b/...ndroidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
@@ -116,6 +116,7 @@ public final class CanonicalNameConstants {
 	public static final String SUPPORT_V4_PREFERENCE_FRAGMENT = "android.support.v4.preference.PreferenceFragment";
 	public static final String MACHINARIUS_V4_PREFERENCE_FRAGMENT = "com.github.machinarius.preferencefragment.PreferenceFragment";
 	public static final String ACTIVITY_COMPAT = "android.support.v4.app.ActivityCompat";
+	public static final String CONTEXT_COMPAT = "android.support.v4.content.ContextCompat";
 	public static final String PREFERENCE = "android.preference.Preference";
 	public static final String PREFERENCE_CHANGE_LISTENER = "android.preference.Preference.OnPreferenceChangeListener";
 	public static final String PREFERENCE_CLICK_LISTENER = "android.preference.Preference.OnPreferenceClickListener";

diff --git a/...ations/androidannotations/src/main/java/org/androidannotations/process/ProcessHolder.java b/...ations/androidannotations/src/main/java/org/androidannotations/process/ProcessHolder.java
@@ -122,6 +122,7 @@ public class Classes {
 		public final JClass BUILD_VERSION = refClass(CanonicalNameConstants.BUILD_VERSION);
 		public final JClass BUILD_VERSION_CODES = refClass(CanonicalNameConstants.BUILD_VERSION_CODES);
 		public final JClass ACTIVITY_COMPAT = refClass(CanonicalNameConstants.ACTIVITY_COMPAT);
+		public final JClass CONTEXT_COMPAT = refClass(CanonicalNameConstants.CONTEXT_COMPAT);
 		public final JClass APP_WIDGET_MANAGER = refClass(CanonicalNameConstants.APP_WIDGET_MANAGER);

 		public final JClass PREFERENCE = refClass(CanonicalNameConstants.PREFERENCE);

diff --git a/...roidannotations/src/test/java/org/androidannotations/generation/ActivityWithDrawable.java b/...roidannotations/src/test/java/org/androidannotations/generation/ActivityWithDrawable.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.androidannotations.generation;
+
+
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.res.DrawableRes;
+
+import android.app.Activity;
+import android.graphics.drawable.Drawable;
+
+@EActivity
+public class ActivityWithDrawable extends Activity {
+	@DrawableRes(R.drawable.myDrawable)
+	Drawable myDrawable;
+}
diff --git a/...nnotations/src/test/java/org/androidannotations/generation/ContextCompatDrawableTest.java b/...nnotations/src/test/java/org/androidannotations/generation/ContextCompatDrawableTest.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.androidannotations.generation;
+
+import java.io.File;
+
+import org.androidannotations.AndroidAnnotationProcessor;
+import org.androidannotations.utils.AAProcessorTestHelper;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ContextCompatDrawableTest extends AAProcessorTestHelper {
+
+	private static final String DRAWABLE_SIGNATURE = ".*myDrawable = resources_\\.getDrawable\\(drawable\\.myDrawable\\);.*";
+	private static final String DRAWABLE_VIA_SUPPORT_SIGNATURE = ".*myDrawable = ContextCompat\\.getDrawable\\(this, drawable\\.myDrawable\\);.*";
+
+	@Before
+	public void setUp() {
+		addProcessor(AndroidAnnotationProcessor.class);
+		addManifestProcessorParameter(ContextCompatDrawableTest.class, "AndroidManifestForDrawable.xml");
+	}
+
+	@Test
+	public void activityCompilesWithRegularDrawable() {
+		CompileResult result = compileFiles(ActivityWithDrawable.class);
+		File generatedFile = toGeneratedFile(ActivityWithDrawable.class);
+
+		assertCompilationSuccessful(result);
+		assertGeneratedClassMatches(generatedFile, DRAWABLE_SIGNATURE);
+	}
+
+	@Test
+	public void activityCompilesWithContextCompatDrawable() {
+		// To simulate android support v4 in classpath, we add
+		// android.support.v4.content.ContextCompat
+		// in classpath
+		CompileResult result = compileFiles(toPath(ContextCompatDrawableTest.class, "ContextCompat.java"), ActivityWithDrawable.class);
+		File generatedFile = toGeneratedFile(ActivityWithDrawable.class);
+
+		assertCompilationSuccessful(result);
+		assertGeneratedClassMatches(generatedFile, DRAWABLE_VIA_SUPPORT_SIGNATURE);
+	}
+}
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/R.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/R.java
@@ -0,0 +1,7 @@
+package org.androidannotations.generation;
+
+public class R {
+	public static final class drawable {
+		public static final int myDrawable = 0x7f06000a;
+	}
+}
diff --git a/...tions/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawable.xml b/...tions/src/test/resources/org/androidannotations/generation/AndroidManifestForDrawable.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not
+    use this file except in compliance with the License. You may obtain a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed To in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and limitations under
+    the License.
+
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.androidannotations.generation"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <application>
+        <activity android:name="org.androidannotations.generation.ActivityWithDrawable_" />
+    </application>
+
+</manifest>
diff --git a/...ndroidannotations/src/test/resources/org/androidannotations/generation/ContextCompat.java b/...ndroidannotations/src/test/resources/org/androidannotations/generation/ContextCompat.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (C) 2010-2015 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package android.support.v4.content;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+public class ContextCompat {
+
+	public static Drawable getDrawable(Context context, int id) {
+		return null;
+	}
+}