Fix Bugs and add new attributes Button Rectangle

I've fixed the bug with the xml background in the FloatButton and I've
added textColor and TextSize attributes to the ButtonRectangle

Author: Ivan Navas

MaterialDesign/build.gradle

@@ -25,8 +25,8 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 21
-        versionCode 6
-        versionName '1.4'
+        versionCode 7
+        versionName '1.5'
     }
 }
 

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

@@ -30,15 +30,17 @@ public abstract class Button extends CustomView {
 	OnClickListener onClickListener;
 	boolean clickAfterRipple = true;
 	int backgroundColor = Color.parseColor("#1E88E5");
+	TextView textButton;
 
 	public Button(Context context, AttributeSet attrs) {
 		super(context, attrs);
 		setDefaultProperties();
-		clickAfterRipple = attrs.getAttributeBooleanValue(MATERIALDESIGNXML,"animate", true);
+		clickAfterRipple = attrs.getAttributeBooleanValue(MATERIALDESIGNXML,
+				"animate", true);
 		setAttributes(attrs);
 		beforeBackground = backgroundColor;
-		if(rippleColor==null)
-		rippleColor = makePressColor();
+		if (rippleColor == null)
+			rippleColor = makePressColor();
 	}
 
 	protected void setDefaultProperties() {
@@ -49,7 +51,6 @@ protected void setDefaultProperties() {
 		setBackgroundResource(background);
 		setBackgroundColor(backgroundColor);
 	}
-	
 
 	// Set atributtes of XML to View
 	abstract protected void setAttributes(AttributeSet attrs);
@@ -82,18 +83,18 @@ public boolean onTouchEvent(MotionEvent event) {
 				if ((event.getX() <= getWidth() && event.getX() >= 0)
 						&& (event.getY() <= getHeight() && event.getY() >= 0)) {
 					radius++;
-					if(!clickAfterRipple && onClickListener != null){
+					if (!clickAfterRipple && onClickListener != null) {
 						onClickListener.onClick(this);
 					}
 				} else {
 					isLastTouch = false;
 					x = -1;
 					y = -1;
 				}
-			}else if (event.getAction() == MotionEvent.ACTION_CANCEL) {
-					isLastTouch = false;
-					x = -1;
-					y = -1;
+			} else if (event.getAction() == MotionEvent.ACTION_CANCEL) {
+				isLastTouch = false;
+				x = -1;
+				y = -1;
 			}
 		}
 		return true;
@@ -130,7 +131,7 @@ public Bitmap makeCircle() {
 			x = -1;
 			y = -1;
 			radius = getHeight() / rippleSize;
-			if (onClickListener != null&& clickAfterRipple)
+			if (onClickListener != null && clickAfterRipple)
 				onClickListener.onClick(this);
 		}
 		return output;
@@ -172,13 +173,27 @@ public void setBackgroundColor(int color) {
 		}
 	}
 
-	abstract public TextView getTextView();
-
 	public void setRippleSpeed(float rippleSpeed) {
 		this.rippleSpeed = rippleSpeed;
 	}
 
 	public float getRippleSpeed() {
 		return this.rippleSpeed;
 	}
+
+	public void setText(String text) {
+		textButton.setText(text);
+	}
+
+	public void setTextColor(int color) {
+		textButton.setTextColor(color);
+	}
+
+	public TextView getTextView() {
+		return textButton;
+	}
+
+	public String getText() {
+		return textButton.getText().toString();
+	}
 }

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

@@ -16,6 +16,8 @@
 import android.graphics.Rect;
 import android.graphics.Bitmap.Config;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.LayerDrawable;
 import android.util.AttributeSet;
 import android.view.animation.BounceInterpolator;
 import android.widget.ImageView;
@@ -43,6 +45,7 @@ public class ButtonFloat extends Button{
 	public ButtonFloat(Context context, AttributeSet attrs) {
 		super(context, attrs);
 		setBackgroundResource(R.drawable.background_button_float);
+		setBackgroundColor(backgroundColor);
 		sizeRadius = 28;
 		setDefaultProperties();
 		icon = new ImageView(context);
@@ -202,4 +205,5 @@ public void hide(){
 	public boolean isShow(){
 		return isShow;
 	}
+	
 }

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

@@ -4,6 +4,7 @@
 import com.gc.materialdesign.utils.Utils;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Rect;
@@ -94,7 +95,23 @@ protected void setAttributes(AttributeSet attrs){
 //					params.width = getWidth();
 //					params.gravity = Gravity.CENTER_HORIZONTAL;
 ////					params.setMargins(paddingLeft, paddingTop, paddingRight, paddingRight);
-//					textView.setLayoutParams(params);
+//					textView.setLayoutParams(params);textColor
+			int textColor = attrs.getAttributeResourceValue(ANDROIDXML,"textColor",-1);
+			if(textColor != -1){
+				textButton.setTextColor(textColor);
+			}else{
+				// Color by hexadecimal
+				// Color by hexadecimal
+				textColor = attrs.getAttributeIntValue(ANDROIDXML, "textColor", -1);
+				if (textColor != -1)
+					textButton.setTextColor(textColor);
+			}
+			int[] array = {android.R.attr.textSize};
+			TypedArray values = getContext().obtainStyledAttributes(attrs, array);
+	        float textSize = values.getDimension(0, -1);
+	        values.recycle();
+	        if(textSize != -1)
+	        	textButton.setTextSize(textSize);
 
 		}
 
@@ -130,20 +147,4 @@ protected void onDraw(Canvas canvas) {
 		}
 	}
 
-	public void setText(String text){
-			textButton.setText(text);
-	}
-	
-	public void setTextColor(int color){
-		textButton.setTextColor(color);
-	}
-	@Override
-	public TextView getTextView() {
-		return textButton;
-	}
-
-	public String getText(){
-        	return textButton.getText().toString();
- 	}
-
 }

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

@@ -102,7 +102,7 @@ public boolean onTouchEvent(MotionEvent event) {
 					isLastTouch = false;
 					check = !check;
 					if (onCheckListener != null)
-						onCheckListener.onCheck(check);
+						onCheckListener.onCheck(CheckBox.this, check);
 					if (check) {
 						step = 0;
 					}
@@ -235,7 +235,7 @@ public void setOncheckListener(OnCheckListener onCheckListener) {
 	}
 
 	public interface OnCheckListener {
-		public void onCheck(boolean check);
+		public void onCheck(CheckBox view, boolean check);
 	}
 
 }

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

@@ -94,7 +94,8 @@ protected void setAttributes(AttributeSet attrs) {
 
 	@Override
 	public void invalidate() {
-		ball.invalidate();
+		if(ball != null)
+			ball.invalidate();
 		super.invalidate();
 	}
 

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

@@ -108,7 +108,7 @@ public boolean onTouchEvent(MotionEvent event) {
 				if (eventCheck != check) {
 					eventCheck = check;
 					if (onCheckListener != null)
-						onCheckListener.onCheck(check);
+						onCheckListener.onCheck(Switch.this,check);
 				}
 				if ((event.getX() <= getWidth() && event.getX() >= 0)) {
 					ball.animateCheck();
@@ -244,7 +244,7 @@ public void setOncheckListener(OnCheckListener onCheckListener) {
 	}
 
 	public interface OnCheckListener {
-		public void onCheck(boolean check);
+		public void onCheck(Switch view,boolean check);
 	}
 
 }

README.md

@@ -38,7 +38,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.navasmdc:MaterialDesign:1.+@aar'
+    compile 'com.github.navasmdc:MaterialDesign:1.5@aar'
 }
 ```
 

build.gradle

@@ -19,6 +19,6 @@ allprojects {
     }
 
     group = "com.github.navasmdc"
-    version = "1.4"
+    version = "1.5"
 }