From 8fb38774a173d9590b35b10672f39f6b15da9d5f Mon Sep 17 00:00:00 2001
From: ergashev <ebr163@mail.ru>
Date: Thu, 9 Feb 2017 12:53:53 +0400
Subject: [PATCH] fix float and dimmen attr covert

---
 .idea/gradle.xml                                     |  3 ++-
 .idea/modules.xml                                    |  4 ++++
 .idea/vcs.xml                                        |  6 ++++++
 .../attributesdispatcher/view/MyCustomView.java      |  8 ++++++++
 app/src/main/res/values/attrs.xml                    |  1 +
 .../internal/AttributesProcessor.java                | 12 ++++++------
 .../ebr163/attributesdispatcher/attr/DimenAttr.java  |  2 +-
 .../ebr163/attributesdispatcher/attr/FloatAttr.java  |  2 +-
 8 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d7d9fd1..13be4d3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 61ec6b8..0fb02e4 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,8 +3,12 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/AttributesDispatcher.iml" filepath="$PROJECT_DIR$/AttributesDispatcher.iml" />
+      <module fileurl="file://$PROJECT_DIR$/AttributesDispatcher.iml" filepath="$PROJECT_DIR$/AttributesDispatcher.iml" />
+      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/compiler.iml" filepath="$PROJECT_DIR$/compiler/compiler.iml" />
+      <module fileurl="file://$PROJECT_DIR$/compiler/compiler.iml" filepath="$PROJECT_DIR$/compiler/compiler.iml" />
+      <module fileurl="file://$PROJECT_DIR$/library/library.iml" filepath="$PROJECT_DIR$/library/library.iml" />
       <module fileurl="file://$PROJECT_DIR$/library/library.iml" filepath="$PROJECT_DIR$/library/library.iml" />
     </modules>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/ebr163/android/attributesdispatcher/view/MyCustomView.java b/app/src/main/java/com/ebr163/android/attributesdispatcher/view/MyCustomView.java
index ed2df65..630decb 100644
--- a/app/src/main/java/com/ebr163/android/attributesdispatcher/view/MyCustomView.java
+++ b/app/src/main/java/com/ebr163/android/attributesdispatcher/view/MyCustomView.java
@@ -8,6 +8,8 @@
 import com.ebr163.attributesdispatcher.Attribute;
 import com.ebr163.attributesdispatcher.CustomView;
 import com.ebr163.attributesdispatcher.attr.ColorAttr;
+import com.ebr163.attributesdispatcher.attr.DimenAttr;
+import com.ebr163.attributesdispatcher.attr.FloatAttr;
 import com.ebr163.attributesdispatcher.attr.StringAttr;
 
 
@@ -22,6 +24,8 @@ public class MyCustomView extends EditText {
     public int color;
     @StringAttr(value = "custom_text", defaultValue = "adasdasd")
     protected String text;
+    @DimenAttr(value = "custom_float")
+    protected float cfloat;
 
     public MyCustomView(Context context) {
         super(context);
@@ -37,6 +41,10 @@ public MyCustomView(Context context, AttributeSet attrs, int defStyleAttr) {
         MyCustomViewAttribute.init(this, attrs);
     }
 
+    @Attribute
+    protected void setCustomFloat(@FloatAttr(value = "custom_float") float attr) {
+    }
+
     @Attribute
     protected void setCustomAttr(@ColorAttr(value = "custom_color", defaultValue = Color.GREEN) int color) {
         this.setTextColor(color);
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7ac7c2d..a63ed0e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,5 +3,6 @@
     <declare-styleable name="MyCustomView">
         <attr name="custom_text" format="string" />
         <attr name="custom_color" format="color" />
+        <attr name="custom_float" format="dimension" />
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/compiler/src/main/java/com/ebr163/attributesdispatcher/internal/AttributesProcessor.java b/compiler/src/main/java/com/ebr163/attributesdispatcher/internal/AttributesProcessor.java
index 6c307a7..2877ce6 100644
--- a/compiler/src/main/java/com/ebr163/attributesdispatcher/internal/AttributesProcessor.java
+++ b/compiler/src/main/java/com/ebr163/attributesdispatcher/internal/AttributesProcessor.java
@@ -136,8 +136,8 @@ private void addInitTargetField(MethodSpec.Builder builder, CustomViewElement cu
             checkAnnotationFields(field, ColorAttr.class);
             String value = field.getAnnotation(ColorAttr.class).value();
             int defValue = field.getAnnotation(ColorAttr.class).defaultValue();
-            builder.addStatement("$N." + field.getSimpleName().toString() + " = $N.getColor($L.R.styleable.$L_$L, -1)", "target", "typedArray",
-                    customViewElement.appPackage, customViewElement.inputClassName, value);
+            builder.addStatement("$N." + field.getSimpleName().toString() + " = $N.getColor($L.R.styleable.$L_$L, $L)", "target", "typedArray",
+                    customViewElement.appPackage, customViewElement.inputClassName, value, defValue);
 
         }
 
@@ -146,7 +146,7 @@ private void addInitTargetField(MethodSpec.Builder builder, CustomViewElement cu
             String value = field.getAnnotation(DimenAttr.class).value();
             float defValue = field.getAnnotation(DimenAttr.class).defaultValue();
             builder.addStatement("$N." + field.getSimpleName().toString() + " = $N.getDimension($L.R.styleable.$L_$L, $L)", "target", "typedArray",
-                    customViewElement.appPackage, customViewElement.inputClassName, value, defValue);
+                    customViewElement.appPackage, customViewElement.inputClassName, value, String.valueOf(defValue) + "f");
         }
 
         for (Element field : customViewElement.floatElements) {
@@ -154,7 +154,7 @@ private void addInitTargetField(MethodSpec.Builder builder, CustomViewElement cu
             String value = field.getAnnotation(FloatAttr.class).value();
             float defValue = field.getAnnotation(FloatAttr.class).defaultValue();
             builder.addStatement("$N." + field.getSimpleName().toString() + " = $N.getFloat($L.R.styleable.$L_$L, $L)", "target", "typedArray",
-                    customViewElement.appPackage, customViewElement.inputClassName, value, defValue);
+                    customViewElement.appPackage, customViewElement.inputClassName, value, String.valueOf(defValue) + "f");
         }
 
         for (Element field : customViewElement.integerElements) {
@@ -232,11 +232,11 @@ private void addAttrGenBody(MethodSpec.Builder builder, ExecutableElement method
             } else if (annotation.toString().equals(DimenAttr.class.getCanonicalName())) {
                 String key = parameter.getAnnotation(DimenAttr.class).value();
                 float defValue = parameter.getAnnotation(DimenAttr.class).defaultValue();
-                builder.addStatement("$T $N = $N.getDimension($L.R.styleable.$L_$L, $L)", type, name, "typedArray", customViewElement.appPackage, customViewElement.inputClassName, key, defValue);
+                builder.addStatement("$T $N = $N.getDimension($L.R.styleable.$L_$L, $L)", type, name, "typedArray", customViewElement.appPackage, customViewElement.inputClassName, key, String.valueOf(defValue) + "f");
             } else if (annotation.toString().equals(FloatAttr.class.getCanonicalName())) {
                 String key = parameter.getAnnotation(FloatAttr.class).value();
                 float defValue = parameter.getAnnotation(FloatAttr.class).defaultValue();
-                builder.addStatement("$T $N = $N.getFloat($L.R.styleable.$L_$L, $L)", type, name, "typedArray", customViewElement.appPackage, customViewElement.inputClassName, key, defValue);
+                builder.addStatement("$T $N = $N.getFloat($L.R.styleable.$L_$L, $L)", type, name, "typedArray", customViewElement.appPackage, customViewElement.inputClassName, key, String.valueOf(defValue) + "f");
             } else if (annotation.toString().equals(StringAttr.class.getCanonicalName())) {
                 String key = parameter.getAnnotation(StringAttr.class).value();
                 String defValue = parameter.getAnnotation(StringAttr.class).defaultValue();
diff --git a/library/src/main/java/com/ebr163/attributesdispatcher/attr/DimenAttr.java b/library/src/main/java/com/ebr163/attributesdispatcher/attr/DimenAttr.java
index bd3e761..41bcbca 100644
--- a/library/src/main/java/com/ebr163/attributesdispatcher/attr/DimenAttr.java
+++ b/library/src/main/java/com/ebr163/attributesdispatcher/attr/DimenAttr.java
@@ -7,6 +7,6 @@
 public @interface DimenAttr {
     String value();
 
-    float defaultValue() default 0f;
+    float defaultValue() default 0;
     int maxSdkVersion() default 0;
 }
diff --git a/library/src/main/java/com/ebr163/attributesdispatcher/attr/FloatAttr.java b/library/src/main/java/com/ebr163/attributesdispatcher/attr/FloatAttr.java
index 572596f..850891c 100644
--- a/library/src/main/java/com/ebr163/attributesdispatcher/attr/FloatAttr.java
+++ b/library/src/main/java/com/ebr163/attributesdispatcher/attr/FloatAttr.java
@@ -7,6 +7,6 @@
 public @interface FloatAttr {
     String value();
 
-    float defaultValue() default 0f;
+    float defaultValue() default 0;
     int maxSdkVersion() default 0;
 }