Merge pull request #5 from Viniciato/master

version 0.5.1
ebanx · Jun 13, 2017 · e4cedfe · e4cedfe
2 parents dcdf7b0 + 18e4b51
commit e4cedfe
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/com/ebanx/swipebutton/MainActivity.java b/app/src/main/java/com/ebanx/swipebutton/MainActivity.java
@@ -20,7 +20,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         swipeButton.setBackground(ContextCompat.getDrawable(this, R.drawable.shape_button2));
         swipeButton.setSlidingButtonBackground(ContextCompat.getDrawable(this, R.drawable.shape_rounded2));
-        swipeButton.setDisabledDrawable(ContextCompat.getDrawable(this, R.drawable.ic_lock_outline_black_24dp));
         swipeButton.setText("lala");
         swipeButton.setInnerTextPadding(10, 10, 10, 10);
 

diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
@@ -29,7 +29,7 @@
         app:button_top_padding="20dp"
         app:button_bottom_padding="20dp"
         app:button_background="@drawable/shape_button"
-        app:initial_state="disabled"
+        app:initial_state="enabled"
         />
 
 </LinearLayout>
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.btkelly:gnag:1.3.2'

diff --git a/swipe-button/build.gradle b/swipe-button/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'gnag'
 
-version = '0.5.0'
+version = '0.5.1'
 group = 'com.ebanx'
 
 android {
@@ -103,7 +103,7 @@ install {
             packaging 'aar'
             groupId 'com.ebanx'
             artifactId 'swipe-button'
-            version '0.5.0'
+            version '0.5.1'
 
             licenses {
                 license {

diff --git a/swipe-button/src/main/java/com/ebanx/swipebtn/SwipeButton.java b/swipe-button/src/main/java/com/ebanx/swipebtn/SwipeButton.java
@@ -183,6 +183,8 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
                 layoutParamsButton.addRule(RelativeLayout.ALIGN_PARENT_LEFT, RelativeLayout.TRUE);
                 layoutParamsButton.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
 
+                swipeButton.setImageDrawable(enabledDrawable);
+
                 addView(swipeButton, layoutParamsButton);
 
                 active = true;
@@ -194,6 +196,8 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
                 layoutParamsButton.addRule(RelativeLayout.ALIGN_PARENT_LEFT, RelativeLayout.TRUE);
                 layoutParamsButton.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE);
 
+                swipeButton.setImageDrawable(disabledDrawable);
+
                 addView(swipeButton, layoutParamsButton);
 
                 active = false;
@@ -213,8 +217,6 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
                 swipeButton.setBackground(ContextCompat.getDrawable(context, R.drawable.shape_button));
             }
 
-            swipeButton.setImageDrawable(disabledDrawable);
-
             float buttonLeftPadding = typedArray.getDimension(
                     R.styleable.SwipeButton_button_left_padding, 0);
             float buttonTopPadding = typedArray.getDimension(