Make decorators use the new decor style

Author: chemouna

decorators/src/main/java/com/mounacheikhna/decorators/AutofitDecorator.java

@@ -6,6 +6,7 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
@@ -45,6 +46,11 @@ public class AutofitDecorator extends AttrsDecorator<TextView> {
     private TextPaint mPaint;
 
 
+    @Override
+    protected int[] styleable() {
+        return R.styleable.AutofitDecorator;
+    }
+
     @Override
     protected int[] attrs() {
         return new int[]{ R.attr.decorAutofitText,
@@ -59,9 +65,9 @@ protected Class<TextView> clazz() {
     }
 
     @Override
-    protected void apply(TextView view, DecorValue decorValue) {
+    protected void apply(TextView view, TypedArray typedArray) {
         mTextView = view;
-        boolean isAutofit = decorValue.getBoolean(R.attr.decorAutofitText);
+        boolean isAutofit = typedArray.getBoolean(R.styleable.AutofitDecorator_decorAutofitText, false);
         if(!isAutofit) return;
 
         float scaledDensity = mTextView.getContext().getResources().getDisplayMetrics().scaledDensity;
@@ -71,11 +77,11 @@ protected void apply(TextView view, DecorValue decorValue) {
 
         //TODO: deal with case when one of these values is absent
 
-        sizeToFit = decorValue.getBoolean(R.attr.decorSizeToFit, sizeToFit);
+        sizeToFit = typedArray.getBoolean(R.styleable.AutofitDecorator_decorSizeToFit, sizeToFit);
 
-        minTextSize = decorValue.getDimensionPixelSize(R.attr.decorMinTextSize, minTextSize);
+        minTextSize = typedArray.getDimensionPixelSize(R.styleable.AutofitDecorator_decorMinTextSize, minTextSize);
 
-        precision = decorValue.getFloat(R.attr.decorPrecision, precision);
+        precision = typedArray.getFloat(R.styleable.AutofitDecorator_decorPrecision, precision);
 
         mPaint = new TextPaint();
         setSizeToFit(sizeToFit);

decorators/src/main/java/com/mounacheikhna/decorators/BlurDecorator.java

@@ -1,5 +1,6 @@
 package com.mounacheikhna.decorators;
 
+import android.content.res.TypedArray;
 import android.os.Build;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +16,10 @@
  */
 public class BlurDecorator extends AttrsDecorator<View> {
 
+    @Override
+    protected int[] styleable() {
+        return R.styleable.BlurDecorator;
+    }
 
     @Override
     protected int[] attrs() {
@@ -28,8 +33,8 @@ protected Class<View> clazz() {
     }
 
     @Override
-    protected void apply(View view, DecorValue decorValue) {
-        boolean isBlur = decorValue.getBoolean(R.attr.decorBlur);
+    protected void apply(View view, TypedArray typedArray) {
+        boolean isBlur = typedArray.getBoolean(R.styleable.BlurDecorator_decorBlur, false);
         if(!isBlur || Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) return;
 
         //i'm guessing this part here doesnt work because i'm using the same blur as ngAndroid and they are

decorators/src/main/java/com/mounacheikhna/decorators/ColorFilterDecorator.java

@@ -1,5 +1,6 @@
 package com.mounacheikhna.decorators;
 
+import android.content.res.TypedArray;
 import android.widget.ImageView;
 
 import com.mounacheikhna.decor.AttrsDecorator;
@@ -11,6 +12,11 @@
  */
 public class ColorFilterDecorator extends AttrsDecorator<ImageView> {
 
+    @Override
+    protected int[] styleable() {
+        return R.styleable.ColorFilterDecorator;
+    }
+
     @Override
     protected int[] attrs() {
         return new int[]{R.attr.decorColorFilter};
@@ -23,8 +29,8 @@ protected Class<ImageView> clazz() {
     }
 
     @Override
-    protected void apply(ImageView view, DecorValue decorValue) {
-        int color = decorValue.getColor(R.attr.decorColorFilter);
+    protected void apply(ImageView view, TypedArray typedArray) {
+        int color = typedArray.getColor(R.styleable.ColorFilterDecorator_decorColorFilter, 0);
         if (color != 0) {
             view.setColorFilter(color);
         }

decorators/src/main/java/com/mounacheikhna/decorators/ErrorDecorator.java

@@ -1,5 +1,6 @@
 package com.mounacheikhna.decorators;
 
+import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.widget.EditText;
 
@@ -11,6 +12,11 @@
  */
 public class ErrorDecorator extends AttrsDecorator<EditText> {
 
+    @Override
+    protected int[] styleable() {
+        return R.styleable.ErrorDecorator;
+    }
+
     @Override
     protected int[] attrs() {
         return new int[] { R.attr.decorErrorIcon, R.attr.decorErrorText};
@@ -22,9 +28,9 @@ protected Class<EditText> clazz() {
     }
 
     @Override
-    protected void apply(EditText view,  DecorValue decorValue) {
-        Drawable errorIcon = decorValue.getDrawable(R.attr.decorErrorIcon);
-        CharSequence errorText = decorValue.getString(R.attr.decorErrorText);
+    protected void apply(EditText view, TypedArray typedArray) {
+        Drawable errorIcon = typedArray.getDrawable(R.styleable.ErrorDecorator_decorErrorIcon);
+        CharSequence errorText = typedArray.getString(R.styleable.ErrorDecorator_decorErrorText);
         view.setError(errorText, errorIcon);
     }
 

decorators/src/main/java/com/mounacheikhna/decorators/FontDecorator.java

@@ -1,5 +1,6 @@
 package com.mounacheikhna.decorators;
 
+import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.widget.TextView;
 
@@ -9,6 +10,11 @@
 
 public class FontDecorator extends AttrsDecorator<TextView> {
 
+    @Override
+    protected int[] styleable() {
+        return R.styleable.FontDecorator;
+    }
+
     @Override
     protected int[] attrs() {
         return new int[] { R.attr.decorTypefaceAsset};
@@ -21,8 +27,8 @@ protected Class<TextView> clazz() {
     }
 
     @Override
-    protected void apply(TextView view, DecorValue decorValue) {
-        String typefacePath = decorValue.getString(R.attr.decorTypefaceAsset);
+    protected void apply(TextView view, TypedArray typedArray) {
+        String typefacePath = typedArray.getString(R.styleable.FontDecorator_decorTypefaceAsset);
         if(typefacePath == null) return;
         view.setTypeface(Typeface.createFromAsset(
                 view.getResources().getAssets(), typefacePath));

decorators/src/main/java/com/mounacheikhna/decorators/OnLongClickDecorator.java

@@ -1,6 +1,7 @@
 package com.mounacheikhna.decorators;
 
 import android.app.Activity;
+import android.content.res.TypedArray;
 import android.view.View;
 import android.view.View.OnLongClickListener;
 
@@ -15,18 +16,22 @@ public OnLongClickDecorator(Activity activity) {
         super(activity);
     }
 
+    @Override
+    protected int[] styleable() {
+        return R.styleable.OnLongClickDecorator;
+    }
 
     @Override
     protected int[] attrs() {
         return new int[]{R.attr.decorOnLongClick};
     }
 
     @Override
-    protected void apply(View view, final DecorValue decorValue) {
+    protected void apply(View view, final TypedArray typedArray) {
         view.setOnLongClickListener(new OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
-                onAction(decorValue.getString(R.attr.decorOnLongClick));
+                onAction(typedArray.getString(R.styleable.OnLongClickDecorator_decorOnLongClick));
                 return true;
             }
         });

decorators/src/main/java/com/mounacheikhna/decorators/OnTouchDecorator.java

@@ -1,6 +1,7 @@
 package com.mounacheikhna.decorators;
 
 import android.app.Activity;
+import android.content.res.TypedArray;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnTouchListener;
@@ -17,17 +18,22 @@ public OnTouchDecorator(Activity activity) {
     }
 
 
+    @Override
+    protected int[] styleable() {
+        return R.styleable.OnTouchDecorator;
+    }
+
     @Override
     protected int[] attrs() {
         return new int[]{R.attr.decorOnTouch};
     }
 
     @Override
-    protected void apply(View view, final DecorValue decorValue) {
+    protected void apply(View view, final TypedArray typedArray) {
         view.setOnTouchListener(new OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
-                return onAction(decorValue.getString(R.attr.decorOnTouch));
+                return onAction(typedArray.getString(R.styleable.OnTouchDecorator_decorOnTouch));
             }
         });
     }

decorators/src/main/java/com/mounacheikhna/decorators/SearchAnimateDecorator.java

@@ -1,6 +1,7 @@
 package com.mounacheikhna.decorators;
 
 import android.annotation.TargetApi;
+import android.content.res.TypedArray;
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.os.Build;
 import android.view.View;
@@ -26,6 +27,11 @@ public class SearchAnimateDecorator extends AttrsDecorator<ImageView> {
     private float mOffset;
 
 
+    @Override
+    protected int[] styleable() {
+        return R.styleable.SearchAnimateDecorator;
+    }
+
     @Override
     protected int[] attrs() {
         return new int[]{R.attr.decorAnimateSearch};
@@ -38,8 +44,8 @@ protected Class<ImageView> clazz() {
     }
 
     @Override
-    protected void apply(ImageView view, DecorValue decorValue) {
-        boolean shouldAnimate = decorValue.getBoolean(R.attr.decorAnimateSearch);
+    protected void apply(ImageView view, TypedArray typedArray) {
+        boolean shouldAnimate = typedArray.getBoolean(R.styleable.SearchAnimateDecorator_decorAnimateSearch, false);
         if(!shouldAnimate) return;
 
         mIv = view;

decorators/src/main/java/com/mounacheikhna/decorators/ShimmerDecorator.java

@@ -1,5 +1,6 @@
 package com.mounacheikhna.decorators;
 
+import android.content.res.TypedArray;
 import android.widget.TextView;
 
 import com.mounacheikhna.decor.AttrsDecorator;
@@ -10,6 +11,11 @@
  */
 public class ShimmerDecorator extends AttrsDecorator<TextView> {
 
+    @Override
+    protected int[] styleable() {
+        return R.styleable.SearchAnimateDecorator;
+    }
+
     @Override
     protected int[] attrs() {
         return new int[] {R.attr.decorShimmer};
@@ -21,7 +27,7 @@ protected Class<TextView> clazz() {
     }
 
     @Override
-    protected void apply(TextView view, DecorValue decorValue) {
+    protected void apply(TextView view, TypedArray typedArray) {
         //TODO: implement
     }
 }

decorators/src/main/res/values/attrs.xml

@@ -3,24 +3,54 @@
 
     <!-- all attributes here prefixed with decor to avoid conflicts with other apps & lib attributes -->
 
-    <attr name="decorTypefaceAsset" format="string" />
-    <attr name="decorErrorText" format="string" />
-    <attr name="decorErrorIcon" format="reference" />
+    <declare-styleable name="FontDecorator">
+        <attr name="decorTypefaceAsset" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="ErrorDecorator">
+        <attr name="decorErrorText" format="string" />
+        <attr name="decorErrorIcon" format="reference" />
+    </declare-styleable>
+
     <attr name="decorRound" format="reference" />
     <attr name="decorCornerRadius" format="dimension" />
-    <attr name="decorOnTouch" />
-    <attr name="decorColorFilter" format="color" />
+
+    <declare-styleable name="OnTouchDecorator">
+        <attr name="decorOnTouch" format="string"/>
+    </declare-styleable>
+
+    <declare-styleable name="ColorFilterDecorator">
+        <attr name="decorColorFilter" format="color" />
+    </declare-styleable>
+
     <attr name="decorCircular" format="boolean" />
-    <attr name="decorOnLongClick" />
-    <attr name="decorLayoutManager" />
-    <attr name="decorLayoutManagerOrientation" />
-    <attr name="decorBlur" format="boolean" />
+
+    <declare-styleable name="OnLongClickDecorator">
+        <attr name="decorOnLongClick" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="LayoutManagerDecorator">
+        <attr name="decorLayoutManager" format="string"/>
+        <attr name="decorLayoutManagerOrientation" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="BlurDecorator">
+        <attr name="decorBlur" format="boolean" />
+    </declare-styleable>
+
     <attr name="decorColorDescendents" format="boolean|reference" />
-    <attr name="decorAnimateSearch" format="boolean|reference" />
+
+    <declare-styleable name="SearchAnimateDecorator">
+        <attr name="decorAnimateSearch" format="boolean|reference" />
+    </declare-styleable>
+
     <attr name="decorOptimise" format="boolean" />
-    <attr name="decorShimmer" format="boolean" />
 
-    <declare-styleable name="DecorAutofit">
+    <declare-styleable name="ShimmerDecorator">
+        <attr name="decorShimmer" format="boolean" />
+    </declare-styleable>
+
+    <declare-styleable name="AutofitDecorator">
         <attr name="decorAutofitText" format="boolean|reference" />
         <attr name="decorSizeToFit" format="float|reference" />
         <attr name="decorMinTextSize" format="reference" />

settings.gradle

@@ -1 +1 @@
-include ':decor' /*, ':decorators', ':samples' */
+include ':decor' , ':decorators', ':samples'