Skip to content

Commit 6de6ae1

Browse files
author
xiangdong.cheng
committed
upate demo to andoridX, fix crash error
1 parent 61d3d03 commit 6de6ae1

43 files changed

Lines changed: 45 additions & 39 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LICENSE

100644100755
File mode changed.

README.md

100644100755
Lines changed: 1 addition & 1 deletion

app/.gitignore

100644100755
File mode changed.

app/build.gradle

100644100755
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,27 @@ android {
1010
targetSdkVersion 27
1111
versionCode 1
1212
versionName "1.0"
13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
}
1515
buildTypes {
1616
release {
1717
minifyEnabled false
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1919
}
2020
}
21+
compileOptions {
22+
sourceCompatibility = 1.8
23+
targetCompatibility = 1.8
24+
}
25+
buildToolsVersion = '29.0.3'
2126
}
2227

2328
dependencies {
2429
implementation fileTree(include: ['*.jar'], dir: 'libs')
25-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
30+
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
2631
exclude group: 'com.android.support', module: 'support-annotations'
2732
})
28-
implementation 'com.android.support:appcompat-v7:28.0.0'
33+
implementation 'androidx.appcompat:appcompat:1.1.0'
2934
testImplementation 'junit:junit:4.12'
3035
implementation project(':library')
3136
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

app/proguard-rules.pro

100644100755
File mode changed.

app/src/androidTest/java/com/dx/dxloadingbutton/ExampleInstrumentedTest.java

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.dx.dxloadingbutton;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

app/src/main/AndroidManifest.xml

100644100755
File mode changed.

app/src/main/java/com/dx/dxloadingbutton/DemoActivity.kt

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.graphics.LinearGradient
55
import android.graphics.Shader
66
import android.graphics.Typeface
77
import android.os.Bundle
8-
import android.support.v7.app.AppCompatActivity
8+
import androidx.appcompat.app.AppCompatActivity
99
import android.view.View
1010
import android.widget.Toast
1111
import com.dx.dxloadingbutton.demo.LoginDemoActivity

app/src/main/java/com/dx/dxloadingbutton/demo/LoginDemoActivity.kt

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.dx.dxloadingbutton.demo
33
import android.animation.Animator
44
import android.content.Intent
55
import android.os.Bundle
6-
import android.support.v7.app.AppCompatActivity
6+
import androidx.appcompat.app.AppCompatActivity
77
import android.view.View
88
import android.view.ViewAnimationUtils
99
import android.view.animation.AccelerateDecelerateInterpolator

app/src/main/java/com/dx/dxloadingbutton/demo/SecondActivity.kt

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.dx.dxloadingbutton.demo
22

33
import android.os.Bundle
4-
import android.support.v7.app.AppCompatActivity
4+
import androidx.appcompat.app.AppCompatActivity
55

66
import com.dx.dxloadingbutton.R
77

0 commit comments

Comments
 (0)