Fix some issues

- Change icon attribute to avoid problems with actionbarSherlock Library

- Getter and Setter Ripple Speed for Buttons

-- Getter and Setter Ripple Check for CheckBox and Switch

— Some updates for SnackBar

Author: ivan.navas

MaterialDesign/res/values/attributes.xml

@@ -14,7 +14,7 @@
 <!--        in switche's view indicate state of view -->
        <attr name="check" format="boolean" />
 <!--        in float button indicate icon resource -->
-       <attr name="icon" format="integer" />
+       <attr name="iconFloat" format="integer" />
 <!--        in float button indicate if must start with animation -->
        <attr name="animate" format="boolean" />
    </declare-styleable>

MaterialDesign/src/com/gc/materialdesign/views/Button.java

@@ -148,4 +148,12 @@ public void setBackgroundColor(int color){
 		}
 
 		abstract public TextView getTextView();
+		
+		public void setRippleSpeed(float rippleSpeed){
+			this.rippleSpeed = rippleSpeed;
+		}
+		
+		public float getRippleSpeed(){
+			return this.rippleSpeed;
+		}
 }

MaterialDesign/src/com/gc/materialdesign/views/ButtonFloat.java

@@ -76,7 +76,7 @@ protected void setAttributes(AttributeSet attrs){
 				setBackgroundColor(Color.parseColor(background));
 		}
 		// Icon of button
-		int iconResource = attrs.getAttributeResourceValue(MATERIALDESIGNXML,"icon",-1);
+		int iconResource = attrs.getAttributeResourceValue(MATERIALDESIGNXML,"iconFloat",-1);
 		if(iconResource != -1)
 			drawableIcon = getResources().getDrawable(iconResource);
 		boolean animate = attrs.getAttributeBooleanValue(MATERIALDESIGNXML,"animate", false);

MaterialDesign/src/com/gc/materialdesign/views/CheckBox.java

@@ -149,6 +149,10 @@ public void setChecked(boolean check){
 				checkView.changeBackground();	
 
 		}
+		
+		public boolean isCheck(){
+			return check;
+		}
 
 
 

MaterialDesign/src/com/gc/materialdesign/views/Switch.java

@@ -2,8 +2,7 @@
 
 import com.gc.materialdesign.R;
 import com.gc.materialdesign.utils.Utils;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
+import com.gc.materialdesign.views.CheckBox.OnCheckListener;
 import com.nineoldandroids.animation.ObjectAnimator;
 import com.nineoldandroids.view.ViewHelper;
 
@@ -84,7 +83,6 @@ protected void setAttributes(AttributeSet attrs){
 	public boolean onTouchEvent(MotionEvent event) {
 		isLastTouch = true;
 		if (event.getAction() == MotionEvent.ACTION_DOWN) {
-			startRedraw();
 			press = true;
 		}else if(event.getAction() == MotionEvent.ACTION_MOVE) {
 			float x = event.getX();
@@ -114,8 +112,6 @@ else if (event.getAction() == MotionEvent.ACTION_UP) {
 			if((event.getX()<= getWidth() && event.getX() >= 0) && 
 					(event.getY()<= getHeight() && event.getY() >= 0)){
 				ball.animateCheck();
-			}else{
-				stopRedraw();
 			}
 		}
 		return true;
@@ -147,23 +143,11 @@ protected void onDraw(Canvas canvas) {
 			paint.setColor((check)?makePressColor():Color.parseColor("#446D6D6D"));
 			canvas.drawCircle(ViewHelper.getX(ball)+ball.getWidth()/2, getHeight()/2, getHeight()/2, paint);
 		}
-		if (canRedraw) {
-			invalidate();
-		}
+		invalidate();
 
 	}
 
-	boolean canRedraw = false;
 
-	private void startRedraw() {
-		canRedraw = true;
-		invalidate();
-	}
-
-	private void stopRedraw() {
-		canRedraw = false;
-		invalidate();
-	}
 
 	/**
 	 * Make a dark color to press effect
@@ -202,6 +186,10 @@ public void setChecked(boolean check){
 		ball.animateCheck();
 	}
 
+	public boolean isCheck(){
+		return check;
+	}
+	
 	class Ball extends View{
 
 		float xIni, xFin, xCen;
@@ -232,7 +220,6 @@ public void animateCheck(){
 			}else{
 				objectAnimator = ObjectAnimator.ofFloat(this, "x", ball.xIni);
 			}
-			objectAnimator.addListener(animatorListener);
 			objectAnimator.setDuration(300);
 			objectAnimator.start();
 		}
@@ -241,12 +228,6 @@ public void animateCheck(){
 
 	}
 
-	private AnimatorListenerAdapter animatorListener = new AnimatorListenerAdapter() {
-		public void onAnimationEnd(Animator animation) {
-			stopRedraw();
-		};
-	};
-	
 	public void setOncheckListener(OnCheckListener onCheckListener){
 		this.onCheckListener = onCheckListener;
 	}

MaterialDesign/src/com/gc/materialdesign/widgets/SnackBar.java

@@ -5,6 +5,7 @@
 
 import android.app.Activity;
 import android.app.Dialog;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -23,6 +24,10 @@ public class SnackBar extends Dialog{
 	View.OnClickListener onClickListener;
 	Activity activity;
 	View view;
+	ButtonFlat button;
+	
+	int backgroundSnackBar = Color.parseColor("#333");
+	int backgroundButton = Color.parseColor("#1E88E5");
 
 	// Timer
 	private boolean mIndeterminate = false;
@@ -51,12 +56,14 @@ protected void onCreate(Bundle savedInstanceState) {
 	    setContentView(R.layout.snackbar);
 	    setCanceledOnTouchOutside(false);
 	    ((TextView)findViewById(R.id.text)).setText(text);
-		ButtonFlat button = (ButtonFlat) findViewById(R.id.buttonflat);
+		button = (ButtonFlat) findViewById(R.id.buttonflat);
 		if(text == null || onClickListener == null){
 			button.setVisibility(View.GONE);
 		}else{
 			button.setText(buttonText);
 
+			button.setBackgroundColor(backgroundButton);
+			
 			button.setOnClickListener(new View.OnClickListener() {
 
 				@Override
@@ -67,6 +74,7 @@ public void onClick(View v) {
 			});
 		}
 		view = findViewById(R.id.snackbar);
+		view.setBackgroundColor(backgroundSnackBar);
 	}
 
 	@Override
@@ -148,4 +156,24 @@ public void setDismissTimer(int time) {
 	public int getDismissTimer() {
 		return mTimer;
 	}
+	
+	/**
+	 * Change background color of SnackBar
+	 * @param color
+	 */
+	public void setBackgroundSnackBar(int color){
+		backgroundSnackBar = color;
+		if(view != null)
+			view.setBackgroundColor(color);
+	}
+	
+	/**
+	 * Chage color of FlatButton in Snackbar
+	 * @param color
+	 */
+	public void setColorButton(int color){
+		backgroundButton = color;
+		if(button != null)
+			button.setBackgroundColor(color);
+	}
 }

MaterialDesignDemo/res/layout/activity_buttons.xml

@@ -104,7 +104,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:background="#1E88E5"
-                materialdesign:icon="@drawable/ic_action_new" />
+                materialdesign:iconFloat="@drawable/ic_action_new" />
         </RelativeLayout>
 
         <!-- SMALL FLOAT BUTTON -->
@@ -136,6 +136,6 @@
                 android:layout_marginRight="24dp"
                 android:background="#1E88E5"
                 materialdesign:animate="true"
-                materialdesign:icon="@drawable/ic_action_new" />
+                materialdesign:iconFloat="@drawable/ic_action_new" />
 
 </RelativeLayout>

MaterialDesignDemo/res/layout/activity_main.xml

@@ -39,7 +39,7 @@
             android:layout_marginLeft="32dp"
             android:layout_marginTop="108dp"
             android:background="#1E88E5"
-            materialdesign:icon="@drawable/icn_select_color" />
+            materialdesign:iconFloat="@drawable/icn_select_color" />
     </RelativeLayout>
 
     <RelativeLayout