Merge pull request navasmdc#113 from navasmdc/develop

Fix Bugs

Fix bug in the ButtonIcon
Fix bug with the animation of the views
Fix bugs in the CheckBox and Switch
Fix bug in the CancelButton in the Dialog, now the Dialog has got one button by default, if you want add cancelButton, you have to call addCancelButton() function.

Author: navasmdc

MaterialDesign/build.gradle

@@ -25,8 +25,8 @@ android {
     defaultConfig {
         minSdkVersion 8
         targetSdkVersion 21
-        versionCode 5
-        versionName '1.3'
+        versionCode 6
+        versionName '1.4'
     }
 }
 
@@ -35,7 +35,7 @@ ext.issueUrl = 'https://github.com/navasmdc/MaterialDesignLibrary/issues'
 ext.gitUrl = 'https://github.com/navasmdc/MaterialDesignLibrary.git'
 
 bintray {
-    user = hasProperty('BINTRAY_USER') ? BINTRAY_USER : ""
+    user = hasProperty('BINTRAY_USER') ? BINTRAY_USER : "navasmdc"
     key = hasProperty('BINTRAY_KEY') ? BINTRAY_PASSWORD : ""
 
     configurations = ["archives"]

MaterialDesign/res/layout/dialog.xml

@@ -59,15 +59,16 @@
                 android:id="@+id/button_cancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Cancel"
-                android:textColor="#000" />
+                android:text="Cancel"                
+                android:background="#000000"
+                android:visibility="gone" />
 
             <com.gc.materialdesign.views.ButtonFlat
                 android:id="@+id/button_accept"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Accept"
-                android:textColor="#1E88E5" />
+                android:background="#1E88E5" />
         </LinearLayout>
     </RelativeLayout>
 

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

@@ -50,11 +50,6 @@ public ButtonFloat(Context context, AttributeSet attrs) {
 		icon.setScaleType(ScaleType.CENTER_CROP);
 		if(drawableIcon != null) {
 			icon.setImageDrawable(drawableIcon);
-//			try {
-//				icon.setBackground(drawableIcon);
-//			} catch (NoSuchMethodError e) {
-//				icon.setBackgroundDrawable(drawableIcon);
-//			}
 		}
 		RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(Utils.dpToPx(sizeIcon, getResources()),Utils.dpToPx(sizeIcon, getResources()));
 		params.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);

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

@@ -15,8 +15,12 @@ public class ButtonIcon extends ButtonFloat {
 
 	public ButtonIcon(Context context, AttributeSet attrs) {
 		super(context, attrs);
-		setBackground(new ColorDrawable(getResources().getColor(android.R.color.transparent)));
-		rippleSpeed = Utils.dpToPx(6, getResources());
+		try {
+			setBackground(new ColorDrawable(getResources().getColor(android.R.color.transparent)));
+		} catch (NoSuchMethodError e) {
+			setBackgroundDrawable(new ColorDrawable(getResources().getColor(android.R.color.transparent)));
+		}
+		rippleSpeed = Utils.dpToPx(2, getResources());
 		rippleSize = Utils.dpToPx(5, getResources());
 	}
 

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

@@ -159,6 +159,7 @@ public void setBackgroundColor(int color) {
 	}
 
 	public void setChecked(boolean check) {
+		invalidate();
 		this.check = check;
 		setPressed(false);
 		changeBackgroundColor(getResources().getColor(

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

@@ -1,6 +1,7 @@
 package com.gc.materialdesign.views;
 
 import android.content.Context;
+import android.graphics.Canvas;
 import android.graphics.Color;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
@@ -30,4 +31,25 @@ public void setEnabled(boolean enabled) {
 			setBackgroundColor(disabledBackgroundColor);
 		invalidate();
 	}
+	
+	boolean animation = false;
+	
+	@Override
+	protected void onAnimationStart() {
+		super.onAnimationStart();
+		animation = true;
+	}
+	
+	@Override
+	protected void onAnimationEnd() {
+		super.onAnimationEnd();
+		animation = false;
+	}
+	
+	@Override
+	protected void onDraw(Canvas canvas) {
+		super.onDraw(canvas);
+		if(animation)
+			invalidate();
+	}
 }

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

@@ -194,6 +194,7 @@ public void setBackgroundColor(int color) {
 	}
 
 	public void setChecked(boolean check) {
+		invalidate();
 		this.check = check;
 		ball.animateCheck();
 	}

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

@@ -28,17 +28,29 @@ public class Dialog extends android.app.Dialog{
 	ButtonFlat buttonAccept;
 	ButtonFlat buttonCancel;
 
+	String buttonCancelText;
+	
 	View.OnClickListener onAcceptButtonClickListener;
 	View.OnClickListener onCancelButtonClickListener;
 
-
+	
 	public Dialog(Context context,String title, String message) {
 		super(context, android.R.style.Theme_Translucent);
 		this.context = context;// init Context
 		this.message = message;
 		this.title = title;
 	}
 
+	public void addCancelButton(String buttonCancelText){
+		this.buttonCancelText = buttonCancelText;
+	}
+	
+	public void addCancelButton(String buttonCancelText, View.OnClickListener onCancelButtonClickListener){
+		this.buttonCancelText = buttonCancelText;
+		this.onCancelButtonClickListener = onCancelButtonClickListener;
+	}
+	
+	
 	@Override
 	  protected void onCreate(Bundle savedInstanceState) {
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -76,16 +88,21 @@ public void onClick(View v) {
 			    	onAcceptButtonClickListener.onClick(v);
 			}
 		});
-	    this.buttonCancel = (ButtonFlat) findViewById(R.id.button_cancel);
-    	buttonCancel.setOnClickListener(new View.OnClickListener() {
-    		
-			@Override
-			public void onClick(View v) {
-				dismiss();	
-				if(onCancelButtonClickListener != null)
-			    	onCancelButtonClickListener.onClick(v);
-			}
-		});
+	    
+	    if(buttonCancelText != null){
+		    this.buttonCancel = (ButtonFlat) findViewById(R.id.button_cancel);
+		    this.buttonCancel.setVisibility(View.VISIBLE);
+		    this.buttonCancel.setText(buttonCancelText);
+	    	buttonCancel.setOnClickListener(new View.OnClickListener() {
+	    		
+				@Override
+				public void onClick(View v) {
+					dismiss();	
+					if(onCancelButtonClickListener != null)
+				    	onCancelButtonClickListener.onClick(v);
+				}
+			});
+	    }
 	}
 
 	@Override

README.md

@@ -30,7 +30,7 @@
 
 If you want use this library, you only have to download MaterialDesign project, import it into your workspace and add the project as a library in your android project settings.
 
-If you prefer it, you can use the grade dependency, you have to add these lines in your buil.gradle file:
+If you prefer it, you can use the gradle dependency, you have to add these lines in your build.gradle file:
 
 ```xml
 repositories {

build.gradle

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

gradle.properties

@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=1.3
-VERSION_CODE=5
+VERSION_NAME=1.4
+VERSION_CODE=6
 
 GROUP=com.github.navasmdc