Merge pull request #137 from KandyzowanaPapaja/dev

Added ColorStateList for Label class

Author: Clans

library/src/main/java/com/github/clans/fab/FloatingActionMenu.java

@@ -4,6 +4,7 @@
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
@@ -58,7 +59,7 @@ public class FloatingActionMenu extends ViewGroup {
     private int mLabelsPaddingRight = Util.dpToPx(getContext(), 8f);
     private int mLabelsPaddingBottom = Util.dpToPx(getContext(), 4f);
     private int mLabelsPaddingLeft = Util.dpToPx(getContext(), 8f);
-    private int mLabelsTextColor;
+    private ColorStateList mLabelsTextColor;
     private float mLabelsTextSize;
     private int mLabelsCornerRadius = Util.dpToPx(getContext(), 3f);
     private boolean mLabelsShowShadow;
@@ -131,7 +132,11 @@ private void init(Context context, AttributeSet attrs) {
         mLabelsPaddingRight = attr.getDimensionPixelSize(R.styleable.FloatingActionMenu_menu_labels_paddingRight, mLabelsPaddingRight);
         mLabelsPaddingBottom = attr.getDimensionPixelSize(R.styleable.FloatingActionMenu_menu_labels_paddingBottom, mLabelsPaddingBottom);
         mLabelsPaddingLeft = attr.getDimensionPixelSize(R.styleable.FloatingActionMenu_menu_labels_paddingLeft, mLabelsPaddingLeft);
-        mLabelsTextColor = attr.getColor(R.styleable.FloatingActionMenu_menu_labels_textColor, Color.WHITE);
+        mLabelsTextColor = attr.getColorStateList(R.styleable.FloatingActionMenu_menu_labels_textColor);
+        // set default value if null same as for textview
+        if (mLabelsTextColor == null) {
+            mLabelsTextColor = ColorStateList.valueOf(Color.WHITE);
+        }
         mLabelsTextSize = attr.getDimension(R.styleable.FloatingActionMenu_menu_labels_textSize, getResources().getDimension(R.dimen.labels_text_size));
         mLabelsCornerRadius = attr.getDimensionPixelSize(R.styleable.FloatingActionMenu_menu_labels_cornerRadius, mLabelsCornerRadius);
         mLabelsShowShadow = attr.getBoolean(R.styleable.FloatingActionMenu_menu_labels_showShadow, true);
@@ -504,6 +509,7 @@ private void addLabel(FloatingActionButton fab) {
         }
 
         label.setText(text);
+        label.setOnClickListener(fab.getOnClickListener());
 
         addView(label);
         fab.setTag(R.id.fab_label, label);

library/src/main/java/com/github/clans/fab/Label.java

@@ -207,6 +207,7 @@ void onActionDown() {
             ripple.setHotspot(getMeasuredWidth() / 2, getMeasuredHeight() / 2);
             ripple.setVisible(true, true);
         }
+        setPressed(true);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@@ -224,6 +225,7 @@ void onActionUp() {
             ripple.setHotspot(getMeasuredWidth() / 2, getMeasuredHeight() / 2);
             ripple.setVisible(true, true);
         }
+        setPressed(false);
     }
 
     void setFab(FloatingActionButton fab) {

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

@@ -38,7 +38,7 @@
         <attr name="menu_labels_paddingRight" format="dimension" />
         <attr name="menu_labels_paddingBottom" format="dimension" />
         <attr name="menu_labels_padding" format="dimension" />
-        <attr name="menu_labels_textColor" format="color" />
+        <attr name="menu_labels_textColor" format="reference|color" />
         <attr name="menu_labels_textSize" format="dimension" />
         <attr name="menu_labels_cornerRadius" format="dimension" />
         <attr name="menu_labels_showShadow" format="boolean" />