modify annotation,add proguard rules

Author: ThirtyDegreesRay

README.md

@@ -6,10 +6,8 @@
 
 ```java
 public class ExampleActivity extends Activity{
-    @AutoAccess(dataName = "name")
-    String name;
-    @AutoAccess(dataName = "description")
-    String description;
+    @AutoAccess String name;
+    @AutoAccess String description;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -65,9 +63,13 @@ Then, apply the 'android-apt' plugin in your module-level build.gradle and add t
     }
 
     dependencies {
-        compile 'com.thirtydegreesray:dataautoaccess:1.2.1'
-        apt 'com.thirtydegreesray:dataautoaccess-compiler:1.2.1'
+        compile 'com.thirtydegreesray:dataautoaccess:1.2.2'
+        apt 'com.thirtydegreesray:dataautoaccess-compiler:1.2.2'
     }
+    
+##Proguard
+    -keep class com.thirtydegreesray.dataautoaccess.** { *; }
+    -keep class **$$DataAccessor { *; }
 
 ##License
     Copyright 2016 ThirtyDegreesRay

dataautoaccess-annotations/src/main/java/com/thirtydegreesray/dataautoaccess/annotation/AutoAccess.java

@@ -1,22 +1,24 @@
 package com.thirtydegreesray.dataautoaccess.annotation;
 
-import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
 /**
  * data auto access<br>
  * set this inject, the object will save automatic save when onSaveInstanceState, and get data when onCreate<br>
  *
  * Created by ThirtyDegreesRay on 2016/9/6 09:35
  */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
+@Target(FIELD)
+@Retention(CLASS)
 public @interface AutoAccess {
     /**
-     * the access key of the filed, must be unique in one class
+     * the access key of the filed, must be unique in one class<br>
+     * if don't set this value, use field name as default key
      * @return dataName
      */
-    String dataName() ;
+    String dataName() default "";
 }

dataautoaccess-compiler/src/main/java/com/thirtydegreesray/dataautoaccess/compiler/AutoAccessClass.java

@@ -69,7 +69,7 @@ private void generateGetDataCode(StringBuilder java){
         for(FieldAutoAccess field : fields){
             java.append("\t").append("target.").append(field.getFieldName())
                     .append(" = ")
-                    .append("DataAutoAccess.getCastData(").append("\"").append(field.getDataName()).append("\"")
+                    .append("DataAutoAccess.getCastData(").append("\"").append(field.getFiledKey()).append("\"")
                     .append(", ").append("dataStore").append(");\n");
         }
         java.append("}\n");
@@ -82,12 +82,12 @@ private void generateSaveDataCode(StringBuilder java){
             //type ArrayList
             if(putPreCode.equals("")){
                 java.append("\t").append("DataAutoAccess.saveArrayList(")
-                        .append("\"").append(field.getDataName()).append("\"").append(", ")
+                        .append("\"").append(field.getFiledKey()).append("\"").append(", ")
                         .append("target.").append(field.getFieldName()).append(", ")
                         .append("dataStore").append(");\n");
             }else{
                 java.append("\t").append("dataStore.").append(putPreCode)
-                        .append("(").append("\"").append(field.getDataName()).append("\"").append(", ")
+                        .append("(").append("\"").append(field.getFiledKey()).append("\"").append(", ")
                         .append("target.").append(field.getFieldName()).append(");\n");
             }
         }

dataautoaccess-compiler/src/main/java/com/thirtydegreesray/dataautoaccess/compiler/FieldAutoAccess.java

@@ -27,4 +27,8 @@ public String getDataName() {
     public String getFieldType() {
         return fieldType;
     }
+
+    public String getFiledKey(){
+        return dataName== null || dataName.equals("") ? fieldName : dataName;
+    }
 }

dataautoaccess/src/main/java/com/thirtydegreesray/dataautoaccess/DataAutoAccess.java

@@ -13,7 +13,10 @@
  * Android bundle data auto access.<br>
  *USE<br>
  * <pre><code>
- *       public class BaseActivity extends Activity {
+ *       public class ExampleActivity extends Activity {
+ *          {@literal @}AutoAccess String name;
+ *          {@literal @}AutoAccess String description;
+ *
  *          {@literal @}Override
  *           protected void onCreate(@Nullable Bundle savedInstanceState) {
  *               super.onCreate(savedInstanceState);
@@ -25,6 +28,7 @@
  *                   data = savedInstanceState;
  *               }
  *               DataAutoAccess.getData(this, data);
+ *               //TODO use fields...
  *           }
  *
  *          {@literal @}Override
@@ -37,10 +41,10 @@
  * </code></pre>
  *
  * <pre><code>
- *     public class ExampleActivity extends BaseActivity {
- *          {@literal @}AutoAccess(dataName = "name") String name;
- *          {@literal @}AutoAccess(dataName = "description") String description;
- *     }
+ *      Intent intent = new Intent(this, ExampleActivity.class);
+ *      intent.putExtra("name", "DataAutoAccess");
+ *      intent.putExtra("description", "Android bundle data auto access.");
+ *      startActivity(intent);
  * </code></pre>
  *
  * Created by ThirtyDegreesRay on 2016/9/6 09:35

gradle.properties

@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME = 1.2.1
-VERSION_CODE = 11
+VERSION_NAME = 1.2.2
+VERSION_CODE = 12
 

sample/build.gradle

@@ -17,7 +17,11 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

sample/proguard-rules.pro

@@ -15,3 +15,8 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+#DataAutoAccess
+-keep class com.thirtydegreesray.dataautoaccess.** { *; }
+-keep class **$$DataAccessor { *; }
+#DataAutoAccess

sample/src/main/java/com/thirtydegreesray/dataautoaccess/sample/ExampleActivity.java

@@ -14,10 +14,8 @@
 
 public class ExampleActivity extends BaseActivity {
 
-    @AutoAccess(dataName = "name")
-    String name;
-    @AutoAccess(dataName = "description")
-    String description;
+    @AutoAccess String name;
+    @AutoAccess String description;
 
     private TextView tvName;
     private TextView tvDescription;

sample/src/main/java/com/thirtydegreesray/dataautoaccess/sample/TestClass.java

@@ -9,69 +9,40 @@
 import java.util.ArrayList;
 
 /**
- * Created by YuYunHao on 2016/9/5 17:45
+ * Created by ThirtyDegreesRay on 2016/9/5 17:45
  */
 
 public class TestClass {
 
-    @AutoAccess(dataName = "field1")
-    String field1 ;
-    @AutoAccess(dataName = "field2")
-    int field2 ;
-    @AutoAccess(dataName = "field3")
-    boolean field3 ;
-    @AutoAccess(dataName = "field4")
-    double field4 ;
-    @AutoAccess(dataName = "field5")
-    float field5 ;
-    @AutoAccess(dataName = "field6")
-    long field6 ;
-    @AutoAccess(dataName = "field7")
-    byte field7 ;
-    @AutoAccess(dataName = "field8")
-    char field8 ;
-    @AutoAccess(dataName = "field9")
-    short field9 ;
-    @AutoAccess(dataName = "field1")
-    Parcelable field10 ;
-    @AutoAccess(dataName = "field11")
-    Serializable field11 ;
-    @AutoAccess(dataName = "field12")
-    Bundle field12 ;
-    @AutoAccess(dataName = "field28")
-    CharSequence field28 ;
-
-
-    @AutoAccess(dataName = "field13")
-    ArrayList<String> field13 = new ArrayList<>();
-    @AutoAccess(dataName = "field14")
-    ArrayList<Integer> field14 = new ArrayList<>();
-    @AutoAccess(dataName = "field15")
-    ArrayList<? extends Parcelable> field15 = new ArrayList<>();
-    @AutoAccess(dataName = "field26")
-    ArrayList<? extends CharSequence> field26 = new ArrayList<>();
-
-    @AutoAccess(dataName = "field16")
-    String[] field16 ;
-    @AutoAccess(dataName = "field17")
-    int[] field17 ;
-    @AutoAccess(dataName = "field18")
-    boolean[] field18 ;
-    @AutoAccess(dataName = "field19")
-    double[] field19 ;
-    @AutoAccess(dataName = "field20")
-    float[] field20 ;
-    @AutoAccess(dataName = "field21")
-    long[] field21 ;
-    @AutoAccess(dataName = "field22")
-    byte[] field22 ;
-    @AutoAccess(dataName = "field23")
-    char[] field23 ;
-    @AutoAccess(dataName = "field24")
-    short[] field24 ;
-    @AutoAccess(dataName = "field25")
-    Parcelable[] field25 ;
-    @AutoAccess(dataName = "field27")
-    CharSequence[] field27 ;
+    @AutoAccess String field1 ;
+    @AutoAccess int field2 ;
+    @AutoAccess boolean field3 ;
+    @AutoAccess double field4 ;
+    @AutoAccess float field5 ;
+    @AutoAccess long field6 ;
+    @AutoAccess byte field7 ;
+    @AutoAccess char field8 ;
+    @AutoAccess short field9 ;
+    @AutoAccess Parcelable field10 ;
+    @AutoAccess Serializable field11 ;
+    @AutoAccess Bundle field12 ;
+    @AutoAccess CharSequence field28 ;
+
+    @AutoAccess ArrayList<String> field13 = new ArrayList<>();
+    @AutoAccess ArrayList<Integer> field14 = new ArrayList<>();
+    @AutoAccess ArrayList<? extends Parcelable> field15 = new ArrayList<>();
+    @AutoAccess ArrayList<? extends CharSequence> field26 = new ArrayList<>();
+
+    @AutoAccess String[] field16 ;
+    @AutoAccess int[] field17 ;
+    @AutoAccess boolean[] field18 ;
+    @AutoAccess double[] field19 ;
+    @AutoAccess float[] field20 ;
+    @AutoAccess long[] field21 ;
+    @AutoAccess byte[] field22 ;
+    @AutoAccess char[] field23 ;
+    @AutoAccess short[] field24 ;
+    @AutoAccess Parcelable[] field25 ;
+    @AutoAccess CharSequence[] field27 ;
 
 }