Add new xml attributes and fix problem in checkbox

ivan.navas · ivan.navas · commit c776a17a59e8 · 2014-11-13T17:59:50.000+01:00
diff --git a/AndroidStudio/MaterialDesign/app/src/main/java/com/gc/materialdesign/views/ButtonRectangle.java b/AndroidStudio/MaterialDesign/app/src/main/java/com/gc/materialdesign/views/ButtonRectangle.java
@@ -33,7 +33,6 @@ protected void setDefaultProperties(){
 		super.minHeight = 36;
 		super.background = R.drawable.background_button_rectangle;
 		super.setDefaultProperties();
-		rippleSpeed = Utils.dpToPx(3, getResources());
 	}
 	
 	
@@ -97,6 +96,9 @@ protected void setAttributes(AttributeSet attrs){
 //					textView.setLayoutParams(params);
 			
 		}
+		
+		rippleSpeed = attrs.getAttributeFloatValue(MATERIALDESIGNXML,
+				"rippleSpeed", Utils.dpToPx(6, getResources()));
 	}
 	
 //	/**
diff --git a/AndroidStudio/MaterialDesign/app/src/main/java/com/gc/materialdesign/views/CheckBox.java b/AndroidStudio/MaterialDesign/app/src/main/java/com/gc/materialdesign/views/CheckBox.java
@@ -154,6 +154,9 @@ public void setBackgroundColor(int color) {
 
 	public void setChecked(boolean check) {
 		this.check = check;
+		setPressed(false);
+		changeBackgroundColor(getResources().getColor(
+				android.R.color.transparent));
 		if (check) {
 			step = 0;
 		}
diff --git a/AndroidStudio/MaterialDesign/app/src/main/java/com/gc/materialdesign/views/LayoutRipple.java b/AndroidStudio/MaterialDesign/app/src/main/java/com/gc/materialdesign/views/LayoutRipple.java
@@ -46,6 +46,24 @@ protected void setAttributes(AttributeSet attrs) {
 			else
 				setBackgroundColor(this.backgroundColor);
 		}
+		// Set background Color
+		// Color by resource
+		int rippleColor = attrs.getAttributeResourceValue(MATERIALDESIGNXML,
+				"rippleColor", -1);
+		if (rippleColor != -1) {
+			setRippleColor(getResources().getColor(rippleColor));
+		} else {
+			// Color by hexadecimal
+			String background = attrs.getAttributeValue(MATERIALDESIGNXML,
+					"rippleColor");
+			if (background != null)
+				setRippleColor(Color.parseColor(background));
+			else
+				setRippleColor(makePressColor());
+		}
+		
+		rippleSpeed = attrs.getAttributeFloatValue(MATERIALDESIGNXML,
+				"rippleSpeed", 20f);
 	}
 
 	// Set color of background
diff --git a/AndroidStudio/MaterialDesign/app/src/main/res/values/attributes.xml b/AndroidStudio/MaterialDesign/app/src/main/res/values/attributes.xml
@@ -17,6 +17,10 @@
        <attr name="iconFloat" format="integer" />
 <!--        in float button indicate if must start with animation -->
        <attr name="animate" format="boolean" />
+<!--        Speed of ripple animation -->
+       <attr name="rippleSpeed" format="float" />
+<!--        in float button indicate if must start with animation -->
+       <attr name="rippleColor" format="color|reference" />
    </declare-styleable>
    
    
diff --git a/MaterialDesign/res/values/attributes.xml b/MaterialDesign/res/values/attributes.xml
@@ -17,6 +17,10 @@
        <attr name="iconFloat" format="integer" />
 <!--        in float button indicate if must start with animation -->
        <attr name="animate" format="boolean" />
+<!--        Speed of ripple animation -->
+       <attr name="rippleSpeed" format="float" />
+<!--        in float button indicate if must start with animation -->
+       <attr name="rippleColor" format="color|reference" />
    </declare-styleable>
    
    
diff --git a/MaterialDesign/src/com/gc/materialdesign/views/ButtonRectangle.java b/MaterialDesign/src/com/gc/materialdesign/views/ButtonRectangle.java
@@ -33,7 +33,6 @@ protected void setDefaultProperties(){
 		super.minHeight = 36;
 		super.background = R.drawable.background_button_rectangle;
 		super.setDefaultProperties();
-		rippleSpeed = Utils.dpToPx(3, getResources());
 	}
 	
 	
@@ -97,6 +96,9 @@ protected void setAttributes(AttributeSet attrs){
 //					textView.setLayoutParams(params);
 			
 		}
+		
+		rippleSpeed = attrs.getAttributeFloatValue(MATERIALDESIGNXML,
+				"rippleSpeed", Utils.dpToPx(6, getResources()));
 	}
 	
 //	/**
diff --git a/MaterialDesign/src/com/gc/materialdesign/views/CheckBox.java b/MaterialDesign/src/com/gc/materialdesign/views/CheckBox.java
@@ -154,6 +154,9 @@ public void setBackgroundColor(int color) {
 
 	public void setChecked(boolean check) {
 		this.check = check;
+		setPressed(false);
+		changeBackgroundColor(getResources().getColor(
+				android.R.color.transparent));
 		if (check) {
 			step = 0;
 		}
diff --git a/MaterialDesign/src/com/gc/materialdesign/views/LayoutRipple.java b/MaterialDesign/src/com/gc/materialdesign/views/LayoutRipple.java
@@ -46,6 +46,24 @@ protected void setAttributes(AttributeSet attrs) {
 			else
 				setBackgroundColor(this.backgroundColor);
 		}
+		// Set background Color
+		// Color by resource
+		int rippleColor = attrs.getAttributeResourceValue(MATERIALDESIGNXML,
+				"rippleColor", -1);
+		if (rippleColor != -1) {
+			setRippleColor(getResources().getColor(rippleColor));
+		} else {
+			// Color by hexadecimal
+			String background = attrs.getAttributeValue(MATERIALDESIGNXML,
+					"rippleColor");
+			if (background != null)
+				setRippleColor(Color.parseColor(background));
+			else
+				setRippleColor(makePressColor());
+		}
+		
+		rippleSpeed = attrs.getAttributeFloatValue(MATERIALDESIGNXML,
+				"rippleSpeed", 20f);
 	}
 
 	// Set color of background

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ protected void setDefaultProperties(){`
`33`	`33`	`super.minHeight = 36;`
`34`	`34`	`super.background = R.drawable.background_button_rectangle;`
`35`	`35`	`super.setDefaultProperties();`
`36`		`- rippleSpeed = Utils.dpToPx(3, getResources());`
`37`	`36`	`}`
`38`	`37`
`39`	`38`
`@@ -97,6 +96,9 @@ protected void setAttributes(AttributeSet attrs){`
`97`	`96`	`// textView.setLayoutParams(params);`
`98`	`97`
`99`	`98`	`}`
	`99`	`+`
	`100`	`+ rippleSpeed = attrs.getAttributeFloatValue(MATERIALDESIGNXML,`
	`101`	`+ "rippleSpeed", Utils.dpToPx(6, getResources()));`
`100`	`102`	`}`
`101`	`103`
`102`	`104`	`// /**`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,9 @@ public void setBackgroundColor(int color) {`
`154`	`154`
`155`	`155`	`public void setChecked(boolean check) {`
`156`	`156`	`this.check = check;`
	`157`	`+ setPressed(false);`
	`158`	`+ changeBackgroundColor(getResources().getColor(`
	`159`	`+ android.R.color.transparent));`
`157`	`160`	`if (check) {`
`158`	`161`	`step = 0;`
`159`	`162`	`}`