File tree 10 files changed +25
-28
lines changed
src/main/java/link/fls/swipestack
java/link/fls/swipestacksample
10 files changed +25
-28
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ buildscript {
6
6
jcenter()
7
7
}
8
8
dependencies {
9
- classpath ' com.android.tools.build:gradle:3.0.1 '
9
+ classpath ' com.android.tools.build:gradle:3.5.3 '
10
10
}
11
11
}
12
12
Original file line number Diff line number Diff line change 15
15
# When configured, Gradle will run in incubating parallel mode.
16
16
# This option should only be used with decoupled projects. More details, visit
17
17
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18
- # org.gradle.parallel=true
18
+ # org.gradle.parallel=true
19
+ android.enableJetifier =true
20
+ android.useAndroidX =true
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
3
3
distributionPath =wrapper/dists
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
6
- distributionUrl =https\://services.gradle.org/distributions/gradle-4.1 -all.zip
6
+ distributionUrl =https\://services.gradle.org/distributions/gradle-6.0 -all.zip
Original file line number Diff line number Diff line change 1
1
apply plugin : ' com.android.library'
2
2
3
3
android {
4
- compileSdkVersion 27
5
- buildToolsVersion " 27.0.1"
4
+ compileSdkVersion 29
6
5
7
6
defaultConfig {
8
7
minSdkVersion 16
9
- targetSdkVersion 27
8
+ targetSdkVersion 29
10
9
}
11
10
buildTypes {
12
11
release {
@@ -19,7 +18,7 @@ android {
19
18
dependencies {
20
19
implementation fileTree(dir : ' libs' , include : [' *.jar' ])
21
20
testImplementation ' junit:junit:4.12'
22
- implementation ' com.android.support :appcompat-v7:27.0.2 '
21
+ implementation ' androidx.appcompat :appcompat:1.1.0 '
23
22
}
24
23
25
24
apply from : ' publish.gradle'
Original file line number Diff line number Diff line change 17
17
package link .fls .swipestack ;
18
18
19
19
import android .animation .Animator ;
20
- import android .support .annotation .Nullable ;
21
20
import android .util .Log ;
22
21
import android .view .MotionEvent ;
23
22
import android .view .View ;
24
23
import android .view .ViewConfiguration ;
25
24
import android .view .animation .OvershootInterpolator ;
26
25
27
- import java .util .Calendar ;
28
-
29
26
import link .fls .swipestack .util .AnimationUtils ;
30
27
31
28
public class SwipeHelper implements View .OnTouchListener {
Original file line number Diff line number Diff line change 22
22
import android .os .Build ;
23
23
import android .os .Bundle ;
24
24
import android .os .Parcelable ;
25
- import android . support .annotation .Nullable ;
25
+ import androidx .annotation .Nullable ;
26
26
import android .util .AttributeSet ;
27
27
import android .view .View ;
28
28
import android .view .ViewGroup ;
Original file line number Diff line number Diff line change 1
1
apply plugin : ' com.android.application'
2
2
3
3
android {
4
- compileSdkVersion 27
5
- buildToolsVersion " 27.0.1"
4
+ compileSdkVersion 29
6
5
7
6
defaultConfig {
8
7
applicationId " link.fls.swipestacksample"
9
8
minSdkVersion 16
10
- targetSdkVersion 27
9
+ targetSdkVersion 29
11
10
versionCode 1
12
11
versionName " 1.0"
13
12
}
@@ -20,10 +19,10 @@ android {
20
19
}
21
20
22
21
dependencies {
23
- compile fileTree(dir : ' libs' , include : [' *.jar' ])
24
- testCompile ' junit:junit:4.12'
25
- compile project(' :library' )
26
- compile ' com.android.support :appcompat-v7:27.0.2 '
27
- compile ' com.android.support :cardview-v7:27 .0.2 '
28
- compile ' com.android.support:design:27 .0.2 '
22
+ implementation fileTree(dir : ' libs' , include : [' *.jar' ])
23
+ testImplementation ' junit:junit:4.12'
24
+ implementation project(' :library' )
25
+ implementation ' androidx.appcompat :appcompat:1.1.0 '
26
+ implementation ' androidx.cardview :cardview:1 .0.0 '
27
+ implementation ' com.google. android.material:material:1 .0.0 '
29
28
}
Original file line number Diff line number Diff line change 19
19
import android .content .Intent ;
20
20
import android .net .Uri ;
21
21
import android .os .Bundle ;
22
- import android . support . design . widget .FloatingActionButton ;
23
- import android . support . design . widget .Snackbar ;
24
- import android . support . v7 .app .AppCompatActivity ;
22
+ import com . google . android . material . floatingactionbutton .FloatingActionButton ;
23
+ import com . google . android . material . snackbar .Snackbar ;
24
+ import androidx . appcompat .app .AppCompatActivity ;
25
25
import android .view .Menu ;
26
26
import android .view .MenuInflater ;
27
27
import android .view .MenuItem ;
Original file line number Diff line number Diff line change 35
35
app : stack_rotation =" 10"
36
36
app : stack_size =" 3" />
37
37
38
- <android .support.design .widget.CoordinatorLayout
38
+ <androidx .coordinatorlayout .widget.CoordinatorLayout
39
39
android : layout_width =" match_parent"
40
40
android : layout_height =" match_parent" >
41
41
42
- <android .support.design.widget .FloatingActionButton
42
+ <com .google.android.material.floatingactionbutton .FloatingActionButton
43
43
android : id =" @+id/fabAdd"
44
44
android : layout_width =" wrap_content"
45
45
android : layout_height =" wrap_content"
48
48
android : src =" @drawable/ic_content_add"
49
49
app : fabSize =" normal" />
50
50
51
- </android .support.design .widget.CoordinatorLayout>
51
+ </androidx .coordinatorlayout .widget.CoordinatorLayout>
52
52
53
53
</RelativeLayout >
Original file line number Diff line number Diff line change 1
1
<?xml version =" 1.0" encoding =" utf-8" ?>
2
- <android .support.v7 .widget.CardView
2
+ <androidx .cardview .widget.CardView
3
3
xmlns : android =" http://schemas.android.com/apk/res/android"
4
4
xmlns : card_view =" http://schemas.android.com/apk/res-auto"
5
5
android : layout_height =" match_parent"
15
15
android : textSize =" 44sp"
16
16
android : text =" @string/dummy_text" />
17
17
18
- </android .support.v7 .widget.CardView>
18
+ </androidx .cardview .widget.CardView>
You can’t perform that action at this time.
0 commit comments