diff --git a/app/build.gradle b/app/build.gradle index 82685aa..75fd44f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,12 +20,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) compile 'com.android.support:appcompat-v7:25.0.1' testCompile 'junit:junit:4.12' - compile project(':library') } diff --git a/app/src/main/java/com/dx/dxloadingbutton/demo/DemoActivity.java b/app/src/main/java/com/dx/dxloadingbutton/demo/DemoActivity.java index 34a5b20..21e7668 100644 --- a/app/src/main/java/com/dx/dxloadingbutton/demo/DemoActivity.java +++ b/app/src/main/java/com/dx/dxloadingbutton/demo/DemoActivity.java @@ -78,7 +78,7 @@ public void run() { mLoadingBtn.loadingSuccessful(); }else{ mLoadingBtn.loadingFailed(); - Toast.makeText(getApplicationContext(),"login failad,please check username and password",Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(),"login failed,please check username and password",Toast.LENGTH_SHORT).show(); } } },3000); diff --git a/app/src/main/res/layout/activity_demo.xml b/app/src/main/res/layout/activity_demo.xml index b9ad243..cec3dff 100644 --- a/app/src/main/res/layout/activity_demo.xml +++ b/app/src/main/res/layout/activity_demo.xml @@ -29,10 +29,10 @@ android:id="@+id/loading_btn" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginTop="48dp" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - app:text="@string/button_text" /> + app:lb_btnText ="@string/button_text" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5355108..b231d6b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -50,9 +50,9 @@ android:layout_gravity="center" android:layout_width="228dp" android:layout_height="wrap_content" - app:resetAfterFailed="true" - app:rippleColor="#000000" - app:text="@string/button_text" + app:lb_resetAfterFailed="true" + app:lb_btnRippleColor="#000000" + app:lb_btnText="@string/button_text" /> diff --git a/build.gradle b/build.gradle index 1b9f209..c19fd1c 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ buildscript { allprojects { repositories { jcenter() + maven { url 'https://jitpack.io' } } } diff --git a/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.java b/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.java index cdbd27d..dd50c0d 100644 --- a/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.java +++ b/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.java @@ -43,6 +43,7 @@ public enum AnimationType { private int mColorPrimary; private int mTextColor; private int mRippleColor; + private float mRippleAlpha; private boolean resetAfterFailed; //when loading data failed, whether reset view private String mText; @@ -107,12 +108,13 @@ private void init(Context context,AttributeSet attrs){ if(attrs != null){ int defaultColor = Color.BLUE; TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.LoadingButton, 0, 0); - mColorPrimary = ta.getInt(R.styleable.LoadingButton_btnColor,defaultColor); - String text = ta.getString(R.styleable.LoadingButton_text); + mColorPrimary = ta.getInt(R.styleable.LoadingButton_lb_btnColor,defaultColor); + String text = ta.getString(R.styleable.LoadingButton_lb_btnText); mText = text == null ? "" : text; - mTextColor = ta.getColor(R.styleable.LoadingButton_textColor,Color.WHITE); - resetAfterFailed = ta.getBoolean(R.styleable.LoadingButton_resetAfterFailed,true); - mRippleColor = ta.getColor(R.styleable.LoadingButton_rippleColor,Color.BLACK); + mTextColor = ta.getColor(R.styleable.LoadingButton_lb_textColor,Color.WHITE); + resetAfterFailed = ta.getBoolean(R.styleable.LoadingButton_lb_resetAfterFailed,true); + mRippleColor = ta.getColor(R.styleable.LoadingButton_lb_btnRippleColor,Color.BLACK); + mRippleAlpha = ta.getFloat(R.styleable.LoadingButton_lb_btnRippleAlpha,0.3f); ta.recycle(); } @@ -135,7 +137,7 @@ private void init(Context context,AttributeSet attrs){ ripplePaint = new Paint(); ripplePaint.setAntiAlias(true); ripplePaint.setColor(mRippleColor); - ripplePaint.setAlpha((int)(0.3*255)); + ripplePaint.setAlpha((int)(mRippleAlpha*255)); ripplePaint.setStyle(Paint.Style.FILL); mStrokePaint = new Paint(); @@ -174,7 +176,7 @@ private void init(Context context,AttributeSet attrs){ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); int width = measureDimension((int)(88*mDensity),widthMeasureSpec); - int height = measureDimension((int)(48*mDensity),heightMeasureSpec); + int height = measureDimension((int)(56*mDensity),heightMeasureSpec); setMeasuredDimension(width,height); } diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index 21ccc26..7b405d0 100644 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -1,10 +1,11 @@ - - - - - + + + + + + \ No newline at end of file