androidannotations · WonderCsabo · Nov 15, 2015 · Nov 15, 2015 · Nov 15, 2015 · Nov 15, 2015
diff --git a/...ns-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultRes.java b/...ns-api/src/main/java/org/androidannotations/annotations/sharedpreferences/DefaultRes.java
@@ -31,6 +31,36 @@
  * The annotation value must be one of R.* fields. If the value is not set, the
  * method name will be used as the R.* field name.
  * </p>
+ * <table summary="Mapping of return types to thier resource types">
+ * <tr>
+ * <th>Return Type</th>
+ * <th>Resource Type</th>
+ * </tr>
+ * <tr>
+ * <td>String</td>
+ * <td>R.string.*</td>
+ * </tr>
+ * <tr>
+ * <td>int</td>
+ * <td>R.integer.*</td>
+ * </tr>
+ * <tr>
+ * <td>long</td>
+ * <td>R.integer.*</td>
+ * </tr>
+ * <tr>
+ * <td>float</td>
+ * <td>R.integer.*</td>
+ * </tr>
+ * <tr>
+ * <td>boolean</td>
+ * <td>R.bool.*</td>
+ * </tr>
+ * <tr>
+ * <td>Set&lt;String&gt;</td>
+ * <td>R.array.*</td>
+ * </tr>
+ * </table>
  * <p>
  * The key of the preference will be the method name by default. This can be
  * overridden by specifying a string resource with the {@link #keyRes()}

diff --git a/...re/androidannotations-test/src/main/java/org/androidannotations/test/prefs/SomePrefs.java b/...re/androidannotations-test/src/main/java/org/androidannotations/test/prefs/SomePrefs.java
@@ -21,6 +21,7 @@
 import org.androidannotations.annotations.sharedpreferences.DefaultFloat;
 import org.androidannotations.annotations.sharedpreferences.DefaultInt;
 import org.androidannotations.annotations.sharedpreferences.DefaultLong;
+import org.androidannotations.annotations.sharedpreferences.DefaultRes;
 import org.androidannotations.annotations.sharedpreferences.DefaultString;
 import org.androidannotations.annotations.sharedpreferences.DefaultStringSet;
 import org.androidannotations.annotations.sharedpreferences.SharedPref;
@@ -60,4 +61,7 @@ public interface SomePrefs {
 
 	@DefaultStringSet({})
 	Set<String> emtpyStringSet();
+
+	@DefaultRes(R.array.planets_array)
+	Set<String> planetsStringSet();
 }
diff --git a/...idannotations-test/src/test/java/org/androidannotations/test/prefs/PrefsActivityTest.java b/...idannotations-test/src/test/java/org/androidannotations/test/prefs/PrefsActivityTest.java
@@ -238,4 +238,19 @@ public void getStringSetEmptySetDefaultValue() {
 
 		assertThat(somePrefs.types().get()).isEmpty();
 	}
+
+	@Test
+	public void getStringSetEmptyWithDefaultValue() {
+		sharedPref.edit().clear().commit();
+
+		assertThat(somePrefs.emtpyStringSet().get()).isEmpty();
+	}
+
+	@Test
+	public void getStringSetWithDefaultRes() {
+		sharedPref.edit().clear().commit();
+
+		assertThat(somePrefs.planetsStringSet().get().size()).isEqualTo(8);
+		assertThat(somePrefs.planetsStringSet().get()).contains("Earth");
+	}
 }
diff --git a/...tations/src/main/java/org/androidannotations/internal/core/handler/SharedPrefHandler.java b/...tations/src/main/java/org/androidannotations/internal/core/handler/SharedPrefHandler.java
@@ -96,7 +96,7 @@ private static final class DefaultPrefInfo<T> {
 			put("int", new DefaultPrefInfo<>(DefaultInt.class, IntPrefField.class, IRClass.Res.INTEGER, 0, "intField"));
 			put("long", new DefaultPrefInfo<>(DefaultLong.class, LongPrefField.class, IRClass.Res.INTEGER, 0L, "longField"));
 			put(CanonicalNameConstants.STRING, new DefaultPrefInfo<>(DefaultString.class, StringPrefField.class, IRClass.Res.STRING, "", "stringField"));
-			put(CanonicalNameConstants.STRING_SET, new DefaultPrefInfo<Set<String>>(DefaultStringSet.class, StringSetPrefField.class, null, null, "stringSetField"));
+			put(CanonicalNameConstants.STRING_SET, new DefaultPrefInfo<Set<String>>(DefaultStringSet.class, StringSetPrefField.class, IRClass.Res.ARRAY, null, "stringSetField"));
 		}
 	};
 
@@ -322,10 +322,21 @@ private IJExpression extractResValue(SharedPrefHolder holder, Element method, IR
 		case STRING:
 			resourceGetMethodName = "getString";
 			break;
+		case ARRAY:
+			resourceGetMethodName = "getStringArray";
+			break;
 		default:
 			break;
 		}
-		return holder.getContextField().invoke("getResources").invoke(resourceGetMethodName).arg(idRef);
+
+		JInvocation resourceInvocation = holder.getContextField().invoke("getResources").invoke(resourceGetMethodName).arg(idRef);
+
+		if (IRClass.Res.ARRAY.equals(res)) {
+			JInvocation asList = getClasses().ARRAYS.staticInvoke("asList");
+			JInvocation newHashMap = JExpr._new(getClasses().HASH_SET.narrow(getClasses().STRING));
+			resourceInvocation = newHashMap.arg(asList.arg(resourceInvocation));
+		}
+		return resourceInvocation;
 	}
 
 	private IJExpression newEmptyStringHashSet() {