Fixed button click not working, changed inside button to textview, reduced progress size

Author: Rygel Louv

.idea/misc.xml

@@ -11,6 +11,7 @@
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 /**
  * Created by rygelouv on 9/21/17.
@@ -29,7 +30,7 @@ public class LoadingButton extends LinearLayout
     private Drawable background;
     private int textSize;
     private int progressColor;
-    private Button mTextButton;
+    private TextView mTextButton;
     private ProgressBar mProgressBar;
 
     public LoadingButton(Context context)
@@ -75,7 +76,7 @@ private void init(Context context)
         this.mProgressBar = mRootView.findViewById(R.id.progress);
 
         if (!TextUtils.isEmpty(text))
-            mTextButton.setText(text);
+            mTextButton.setText(text.toUpperCase());
 
         if (textColor != 0)
             mTextButton.setTextColor(textColor);
@@ -92,37 +93,20 @@ private void init(Context context)
         if (progressColor != 0)
             this.mProgressBar.getIndeterminateDrawable().setColorFilter(progressColor,
                     android.graphics.PorterDuff.Mode.MULTIPLY);
-
-        this.mRootView.setOnClickListener(new OnClickListener()
-        {
-            @Override
-            public void onClick(View view)
-            {
-                startLoading("Loading...");
-            }
-        });
-        this.mTextButton.setOnClickListener(new OnClickListener()
-        {
-            @Override
-            public void onClick(View view)
-            {
-                startLoading("Loading...");
-            }
-        });
     }
 
     public void startLoading(String loadingText)
     {
         this.setEnabled(false);
         this.mProgressBar.setVisibility(VISIBLE);
-        this.mTextButton.setText(loadingText);
+        this.mTextButton.setText(loadingText.toUpperCase());
     }
 
     public void stopLoading(String loadingDoneText)
     {
         this.setEnabled(true);
         this.mProgressBar.setVisibility(GONE);
-        this.mTextButton.setText(loadingDoneText);
+        this.mTextButton.setText(loadingDoneText.toUpperCase());
     }
 
     public int getTextColor()

androidloadingbuttonlib/src/main/java/com/github/rygelouv/androidloadingbuttonlib/LoadingButton.java

@@ -3,25 +3,29 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 xmlns:tools="http://schemas.android.com/tools"
-                android:gravity="center_horizontal"
+                android:gravity="center"
+
+    android:minHeight="@dimen/dimen_48"
     >
 
     <ProgressBar
         android:id="@+id/progress"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="25dp"
+        android:layout_height="25dp"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="4dp"
+        android:layout_marginRight="4dp"
+        android:layout_marginEnd="4dp"
         android:visibility="gone"
         />
 
-    <Button
+    <TextView
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         tools:text="validate"
         android:background="@android:color/transparent"
-        android:layout_marginRight="4dp"
+        android:layout_marginLeft="4dp"
+        android:layout_marginStart="4dp"
         />
 
 </LinearLayout>

androidloadingbuttonlib/src/main/res/layout/loading_button_layout.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dimen_48">48dp</dimen>
+</resources>

androidloadingbuttonlib/src/main/res/values/dimens.xml

@@ -3,25 +3,39 @@
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Button;
 
 import com.github.rygelouv.androidloadingbuttonlib.LoadingButton;
 
 public class TestLibActivity extends AppCompatActivity
 {
 
+    LoadingButton buton;
+    Button stop;
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_test_lib);
+        buton = findViewById(R.id.button_test);
+        stop = findViewById(R.id.stop);
+
+        stop.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view)
+            {
+                buton.stopLoading("Done!");
+            }
+        });
 
-        findViewById(R.id.stop).setOnClickListener(new View.OnClickListener()
+        buton.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View view)
             {
-                ((LoadingButton)findViewById(R.id.button_test))
-                        .stopLoading("Done!");
+                buton.startLoading("Loading...");
             }
         });
     }

app/src/main/java/com/github/rygelouv/androidloadingbutton/TestLibActivity.java

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_enabled="false" >
+        <shape android:shape="rectangle"  >
+            <corners android:radius="4dip" />
+            <stroke android:width="1dip"
+                android:color="@color/gray" />
+            <gradient android:angle="-90"
+                android:startColor="@color/gray"
+                android:endColor="@color/gray"  />
+        </shape>
+    </item>
     <item android:state_pressed="true" >
         <shape android:shape="rectangle"  >
             <corners android:radius="4dip" />

app/src/main/res/drawable/button_accent_full.xml

@@ -4,4 +4,5 @@
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
     <color name="gray_dark">#4e5e69</color>
+    <color name="gray">#909AAB</color>
 </resources>