upate demo to andoridX, fix crash error

StevenDXC · May 21, 2020 · 6de6ae1 · 6de6ae1
1 parent 61d3d03
commit 6de6ae1
Show file tree

Hide file tree

Showing 43 changed files with 45 additions and 39 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # DxLoadingButton
 
-android button view with loading animation,and load successful/failed animation
+android button to loading view with animation,and load successful/failed animation
 
 
 [![](https://jitpack.io/v/StevenDXC/DxLoadingButton.svg)](https://jitpack.io/#StevenDXC/DxLoadingButton)

diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,22 +10,27 @@ android {
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+    buildToolsVersion = '29.0.3'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
     implementation project(':library')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
diff --git a/app/src/androidTest/java/com/dx/dxloadingbutton/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/dx/dxloadingbutton/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.dx.dxloadingbutton;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
diff --git a/app/src/main/java/com/dx/dxloadingbutton/DemoActivity.kt b/app/src/main/java/com/dx/dxloadingbutton/DemoActivity.kt
@@ -5,7 +5,7 @@ import android.graphics.LinearGradient
 import android.graphics.Shader
 import android.graphics.Typeface
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.view.View
 import android.widget.Toast
 import com.dx.dxloadingbutton.demo.LoginDemoActivity

diff --git a/app/src/main/java/com/dx/dxloadingbutton/demo/LoginDemoActivity.kt b/app/src/main/java/com/dx/dxloadingbutton/demo/LoginDemoActivity.kt
@@ -3,7 +3,7 @@ package com.dx.dxloadingbutton.demo
 import android.animation.Animator
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.view.View
 import android.view.ViewAnimationUtils
 import android.view.animation.AccelerateDecelerateInterpolator

diff --git a/app/src/main/java/com/dx/dxloadingbutton/demo/SecondActivity.kt b/app/src/main/java/com/dx/dxloadingbutton/demo/SecondActivity.kt
@@ -1,7 +1,7 @@
 package com.dx.dxloadingbutton.demo
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 
 import com.dx.dxloadingbutton.R
 

diff --git a/app/src/main/res/layout/activity_demo.xml b/app/src/main/res/layout/activity_demo.xml
@@ -12,15 +12,15 @@
     android:layout_height="match_parent">
 
 
-    <android.support.v7.widget.AppCompatEditText
+    <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/edit_user_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:hint="@string/user_name"/>
 
-    <android.support.v7.widget.AppCompatEditText
+    <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/edit_password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -39,7 +39,17 @@
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         app:lb_btnText ="@string/button_text"
-        app:lb_min_height="48dp"/>
+        app:lb_min_height="48dp"
+        app:lb_btnColor="@color/colorAccent"
+        app:lb_btnDisabledColor="@color/colorPrimaryDark"
+        app:lb_btnRippleAlpha="0.6"
+        app:lb_btnRippleColor="#000000"
+        app:lb_cornerRadius="20dp"
+        app:lb_disabledTextColor="#cccccc"
+        app:lb_resetAfterFailed="true"
+        app:lb_rippleEnable="true"
+        app:lb_textColor="#cccccc"
+        />
 
 </LinearLayout>
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -20,8 +20,7 @@
         android:layout_weight="1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textSize="10sp"
-        android:text="successful"/>
+        android:text="success"/>
 
     <Button
         style="?android:buttonBarButtonStyle"
@@ -59,7 +58,7 @@
         android:layout_marginRight="32dp"
         app:lb_resetAfterFailed="true"
         app:lb_btnRippleColor="#000000"
-        app:lb_btnText="@string/button_text"
+        app:lb_btnText="#FF95B7E4"
         />
 
 

diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
diff --git a/app/src/test/java/com/dx/dxloadingbutton/ExampleUnitTest.java b/app/src/test/java/com/dx/dxloadingbutton/ExampleUnitTest.java
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.72'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jun 20 16:19:59 CST 2019
+#Thu May 21 11:15:46 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/image/loadingButton.gif b/image/loadingButton.gif
diff --git a/image/loadingButton2.gif b/image/loadingButton2.gif
diff --git a/image/loadingButton_shader.jpg b/image/loadingButton_shader.jpg
diff --git a/library/.gitignore b/library/.gitignore
diff --git a/library/build.gradle b/library/build.gradle
@@ -11,7 +11,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -24,11 +24,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    testImplementation 'junit:junit:4.13'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 repositories {

diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro
diff --git a/library/src/androidTest/java/com/dx/dxloadingbutton/lib/ExampleInstrumentedTest.java b/library/src/androidTest/java/com/dx/dxloadingbutton/lib/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.dx.dxloadingbutton.lib;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
diff --git a/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.kt b/library/src/main/java/com/dx/dxloadingbutton/lib/LoadingButton.kt
@@ -185,7 +185,7 @@ class LoadingButton @JvmOverloads constructor(
             rippleColor = ta.getColor(R.styleable.LoadingButton_lb_btnRippleColor, Color.BLACK)
             rippleEnable = ta.getBoolean(R.styleable.LoadingButton_lb_rippleEnable, true)
             mRippleAlpha = ta.getFloat(R.styleable.LoadingButton_lb_btnRippleAlpha, 0.3f)
-            mButtonCorner = ta.getFloat(R.styleable.LoadingButton_lb_cornerRadius, 2 * mDensity)
+            mButtonCorner = ta.getDimension(R.styleable.LoadingButton_lb_cornerRadius, 2 * mDensity)
             mMinHeight = ta.getDimension(R.styleable.LoadingButton_lb_min_height, defaultMinHeight)
             ta.recycle()
         }

diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -3,14 +3,14 @@
     <declare-styleable name="LoadingButton">
         <attr name="lb_btnColor" format="reference|color" />
         <attr name="lb_btnText" format="reference|string" />
-        <attr name="lb_textColor" format="reference|string" />
+        <attr name="lb_textColor" format="reference|color" />
         <attr name="lb_resetAfterFailed" format="boolean" />
         <attr name="lb_rippleEnable" format="boolean" />
         <attr name="lb_btnRippleColor" format="reference|color" />
         <attr name="lb_btnRippleAlpha" format="float" />
-        <attr name="lb_cornerRadius" format="float" />
+        <attr name="lb_cornerRadius" format="dimension" />
         <attr name="lb_min_height" format="dimension" />
         <attr name="lb_btnDisabledColor" format="reference|color" />
-        <attr name="lb_disabledTextColor" format="reference|string" />
+        <attr name="lb_disabledTextColor" format="reference|color" />
     </declare-styleable>
 </resources>
diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml
diff --git a/library/src/test/java/com/dx/dxloadingbutton/lib/ExampleUnitTest.java b/library/src/test/java/com/dx/dxloadingbutton/lib/ExampleUnitTest.java
diff --git a/settings.gradle b/settings.gradle