add support for double values

FabianTerhorst · Jun 6, 2016 · f8c5f2f · f8c5f2f
1 parent 0d71d93
commit f8c5f2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/io/fabianterhorst/fastlayout/sample/AppLayouts.java b/app/src/main/java/io/fabianterhorst/fastlayout/sample/AppLayouts.java
@@ -6,7 +6,7 @@
  * Created by fabianterhorst on 14.05.16.
  */
 //@Layouts(all = true/*, exclude = {R.layout.item_sample}*/)
-@Layouts(ids = {R.layout.activity_main, R.layout.item_sample})
+@Layouts(ids = {R.layout.activity_main, R.layout.item_sample, R.layout.card_view})
 //@Layouts(layouts = {"activity_main"})
 //@Layouts
 public class AppLayouts {

diff --git a/...out-converters/src/main/java/io/fabianterhorst/fastlayout/converters/LayoutConverter.java b/...out-converters/src/main/java/io/fabianterhorst/fastlayout/converters/LayoutConverter.java
@@ -54,11 +54,11 @@ public LayoutAttribute onConvertLayoutAttributeValue(String attributeValue, Stri
             String styleAttribute = "android.R.style." + style;
             return onConvertLayoutAttribute(attribute, styleAttribute, attributeName, false);
         } else if ((attribute.endsWith("dp") || attribute.endsWith("dip")) && isNumber(attribute.replace("dip", "").replace("dp", ""))) {
-            return onConvertLayoutAttribute(attribute, "(int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, " + attribute.replace("dip", "").replace("dp", "") + ", getResources().getDisplayMetrics())", attributeName, false);
+            return onConvertLayoutAttribute(attribute, "(int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, " + attribute.replace("dip", "").replace("dp", "") + "f, getResources().getDisplayMetrics())", attributeName, false);
         } else if (attribute.equals("false") || attribute.equals("true")) {
             return onConvertLayoutAttribute(attribute, attributeName, false);
         } else if (attribute.endsWith("sp") && isNumber(attribute.replace("sp", ""))) {
-            return onConvertLayoutAttribute(attribute, "(int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, " + attribute.replace("sp", "") + ", getResources().getDisplayMetrics())", attributeName, false);
+            return onConvertLayoutAttribute(attribute, "(int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, " + attribute.replace("sp", "") + "f, getResources().getDisplayMetrics())", attributeName, false);
         } else if (isNumber(attribute)) {
             return onConvertLayoutAttribute(attributeValue, attributeName, false);
         }
@@ -120,7 +120,7 @@ public String attribute(String name, Object value) {
 
     private boolean isNumber(Object text) {
         try {
-            Integer.parseInt(String.valueOf(text));
+            Double.parseDouble(String.valueOf(text));
             return true;
         } catch (NumberFormatException ignore) {
             return false;