Skip to content

Commit 92f2074

Browse files
committed
add support lib version
1 parent f5a9087 commit 92f2074

File tree

15 files changed

+25
-34
lines changed

15 files changed

+25
-34
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

Loadingbutton/build.gradle renamed to Loadingbutton-support/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ android {
99
targetSdkVersion 28
1010
versionCode 100
1111
versionName "1.0.0-alpha1"
12-
13-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
14-
1512
}
1613

1714
buildTypes {
@@ -25,6 +22,5 @@ android {
2522

2623
dependencies {
2724
implementation fileTree(dir: 'libs', include: ['*.jar'])
28-
compileOnly 'androidx.appcompat:appcompat:1.0.2'
29-
25+
compileOnly 'com.android.support:appcompat-v7:28.0.0'
3026
}
File renamed without changes.

Loadingbutton/src/main/java/com/flod/loadingbutton/DrawableTextView.java renamed to Loadingbutton-support/src/main/java/com/flod/loadingbutton/DrawableTextView.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import android.graphics.Canvas;
66
import android.graphics.Rect;
77
import android.graphics.drawable.Drawable;
8+
import android.support.annotation.Dimension;
9+
import android.support.annotation.IntDef;
10+
import android.support.annotation.Nullable;
11+
import android.support.annotation.Px;
12+
import android.support.v7.widget.AppCompatTextView;
813
import android.util.AttributeSet;
914
import android.view.Gravity;
1015

11-
import androidx.annotation.Dimension;
12-
import androidx.annotation.IntDef;
13-
import androidx.annotation.Nullable;
14-
import androidx.annotation.Px;
15-
import androidx.appcompat.widget.AppCompatTextView;
1616

1717
import java.lang.annotation.Retention;
1818
import java.lang.annotation.RetentionPolicy;

Loadingbutton/src/main/java/com/flod/loadingbutton/LoadingButton.java renamed to Loadingbutton-support/src/main/java/com/flod/loadingbutton/LoadingButton.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
import android.graphics.Path;
1313
import android.graphics.Rect;
1414
import android.graphics.drawable.Drawable;
15+
import android.support.annotation.ColorInt;
16+
import android.support.annotation.DrawableRes;
17+
import android.support.annotation.NonNull;
18+
import android.support.annotation.Nullable;
19+
import android.support.annotation.Px;
20+
import android.support.v4.content.ContextCompat;
21+
import android.support.v4.widget.CircularProgressDrawable;
1522
import android.util.AttributeSet;
1623
import android.view.View;
1724

18-
import androidx.annotation.ColorInt;
19-
import androidx.annotation.DrawableRes;
20-
import androidx.annotation.NonNull;
21-
import androidx.annotation.Nullable;
22-
import androidx.annotation.Px;
23-
import androidx.core.content.ContextCompat;
24-
import androidx.swiperefreshlayout.widget.CircularProgressDrawable;
2525

2626
/**
2727
* SimpleDes:

app/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ android {
88
targetSdkVersion 28
99
versionCode 100
1010
versionName "1.0.0"
11-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1211
}
1312
buildTypes {
1413
release {
@@ -20,9 +19,9 @@ android {
2019

2120
dependencies {
2221
implementation fileTree(dir: 'libs', include: ['*.jar'])
23-
implementation project(':Loadingbutton')
22+
implementation project(':Loadingbutton-support')
2423
implementation 'com.android.support:appcompat-v7:28.0.0'
25-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
24+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
2625

2726
implementation 'com.zhihu.android:matisse:0.5.2-beta4'
2827
implementation 'com.github.bumptech.glide:glide:4.9.0'

0 commit comments

Comments
 (0)