File tree Expand file tree Collapse file tree 16 files changed +33
-32
lines changed Expand file tree Collapse file tree 16 files changed +33
-32
lines changed 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
4
+ compileSdkVersion 28
5
5
defaultConfig {
6
6
applicationId " com.iknow.android"
7
7
minSdkVersion 16
@@ -29,12 +29,12 @@ android {
29
29
30
30
dependencies {
31
31
implementation fileTree(dir : ' libs' , include : [' *.jar' ])
32
- implementation ' com.android.support :appcompat-v7:27. 1.1'
33
- implementation ' com.android.support :recyclerview-v7:27. 1.1'
32
+ implementation ' androidx.appcompat :appcompat: 1.1.0 '
33
+ implementation ' androidx.recyclerview :recyclerview: 1.1.0 '
34
34
implementation ' com.github.iknow4:android-utils-sdk:1.1.2'
35
- implementation ' nl.bravobit:android-ffmpeg:1.1.5 '
36
- implementation ' io.reactivex.rxjava2:rxandroid:2.0.2 '
37
- implementation ' io.reactivex.rxjava2:rxjava:2.1.9 '
35
+ implementation ' nl.bravobit:android-ffmpeg:1.1.7 '
36
+ implementation ' io.reactivex.rxjava2:rxandroid:2.1.0 '
37
+ implementation ' io.reactivex.rxjava2:rxjava:2.2.2 '
38
38
implementation ' com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
39
39
implementation ' com.github.bumptech.glide:glide:3.7.0'
40
40
}
Original file line number Diff line number Diff line change 2
2
3
3
import android .annotation .SuppressLint ;
4
4
import android .os .Bundle ;
5
- import android .support .annotation .CallSuper ;
6
- import android .support .annotation .Nullable ;
7
- import android .support .v7 .app .AppCompatActivity ;
8
- import com .iknow .android .interfaces .IBaseUI ;
5
+ import androidx .annotation .Nullable ;
6
+ import androidx .appcompat .app .AppCompatActivity ;
9
7
10
8
/**
11
9
* author : J.Chou
16
14
* 定义算法骨架,将一些步骤延时到子类,可定义钩子函数。
17
15
*/
18
16
@ SuppressLint ("Registered" )
19
- public abstract class BaseActivity extends AppCompatActivity {
17
+ public abstract class BaseActivity extends AppCompatActivity {
20
18
21
19
protected abstract void initUI ();
22
20
protected void loadData () {
Original file line number Diff line number Diff line change 3
3
import android .content .Context ;
4
4
import android .graphics .Canvas ;
5
5
import android .graphics .Color ;
6
- import android .support .annotation .Nullable ;
7
6
import android .util .AttributeSet ;
8
7
import android .view .View ;
8
+ import androidx .annotation .Nullable ;
9
9
10
10
/**
11
11
* author : J.Chou
Original file line number Diff line number Diff line change 4
4
import android .database .Cursor ;
5
5
import android .os .Bundle ;
6
6
import android .provider .MediaStore ;
7
- import android . support .annotation .NonNull ;
8
- import android . support .annotation .Nullable ;
9
- import android . support . v4 .app .FragmentActivity ;
10
- import android . support . v4 .app .LoaderManager ;
11
- import android . support . v4 .content .CursorLoader ;
12
- import android . support . v4 .content .Loader ;
7
+ import androidx .annotation .NonNull ;
8
+ import androidx .annotation .Nullable ;
9
+ import androidx . fragment .app .FragmentActivity ;
10
+ import androidx . loader .app .LoaderManager ;
11
+ import androidx . loader .content .CursorLoader ;
12
+ import androidx . loader .content .Loader ;
13
13
import iknow .android .utils .callback .SimpleCallback ;
14
14
15
15
/**
Original file line number Diff line number Diff line change 3
3
import android .Manifest ;
4
4
import android .annotation .SuppressLint ;
5
5
import android .database .Cursor ;
6
- import android .databinding .DataBindingUtil ;
7
6
import android .view .View ;
7
+ import androidx .databinding .DataBindingUtil ;
8
8
import com .iknow .android .R ;
9
9
import com .iknow .android .databinding .ActivityVideoSelectBinding ;
10
10
import com .iknow .android .features .record .VideoRecordActivity ;
Original file line number Diff line number Diff line change 5
5
import android .media .MediaMetadataRetriever ;
6
6
import android .net .Uri ;
7
7
import android .provider .MediaStore ;
8
- import android .support .v4 .app .FragmentActivity ;
9
8
import android .text .TextUtils ;
10
9
import android .view .LayoutInflater ;
11
10
import android .view .View ;
14
13
import android .widget .FrameLayout ;
15
14
import android .widget .ImageView ;
16
15
import android .widget .TextView ;
16
+ import androidx .fragment .app .FragmentActivity ;
17
17
import com .bumptech .glide .Glide ;
18
18
import com .iknow .android .R ;
19
19
import com .iknow .android .features .trim .VideoTrimmerActivity ;
Original file line number Diff line number Diff line change 2
2
3
3
import android .app .ProgressDialog ;
4
4
import android .content .Intent ;
5
- import android .databinding .DataBindingUtil ;
6
5
import android .net .Uri ;
7
6
import android .os .Bundle ;
8
- import android .support .v4 .app .FragmentActivity ;
9
7
import android .text .TextUtils ;
8
+ import androidx .databinding .DataBindingUtil ;
9
+ import androidx .fragment .app .FragmentActivity ;
10
10
import com .iknow .android .R ;
11
11
import com .iknow .android .databinding .ActivityVideoTrimBinding ;
12
12
import com .iknow .android .features .common .ui .BaseActivity ;
Original file line number Diff line number Diff line change 2
2
3
3
import android .content .Context ;
4
4
import android .graphics .Bitmap ;
5
- import android .support .annotation .NonNull ;
6
- import android .support .v7 .widget .RecyclerView ;
7
5
import android .view .LayoutInflater ;
8
6
import android .view .View ;
9
7
import android .view .ViewGroup ;
10
8
import android .widget .ImageView ;
11
9
import android .widget .LinearLayout ;
10
+ import androidx .annotation .NonNull ;
11
+ import androidx .recyclerview .widget .RecyclerView ;
12
12
import com .iknow .android .R ;
13
13
import java .util .ArrayList ;
14
14
import java .util .List ;
Original file line number Diff line number Diff line change 10
10
import android .graphics .Rect ;
11
11
import android .os .Bundle ;
12
12
import android .os .Parcelable ;
13
- import android .support .annotation .Nullable ;
14
13
import android .util .AttributeSet ;
15
14
import android .util .Log ;
16
15
import android .view .MotionEvent ;
17
16
import android .view .View ;
18
17
import android .view .ViewConfiguration ;
18
+ import androidx .annotation .Nullable ;
19
19
import com .iknow .android .R ;
20
20
import com .iknow .android .features .trim .VideoTrimmerUtil ;
21
21
import iknow .android .utils .DateUtil ;
Original file line number Diff line number Diff line change 1
1
package com .iknow .android .widget ;
2
2
3
3
import android .graphics .Rect ;
4
- import android .support .v7 .widget .RecyclerView ;
5
4
import android .view .View ;
5
+ import androidx .recyclerview .widget .RecyclerView ;
6
6
7
7
/**
8
8
* Author: Jason.Chou
Original file line number Diff line number Diff line change 1
1
package com .iknow .android .widget ;
2
2
3
3
import android .graphics .Rect ;
4
- import android .support .v7 .widget .RecyclerView ;
5
4
import android .view .View ;
5
+ import androidx .recyclerview .widget .RecyclerView ;
6
6
7
7
public class SpacesItemDecoration2 extends RecyclerView .ItemDecoration {
8
8
Original file line number Diff line number Diff line change 6
6
import android .media .MediaPlayer ;
7
7
import android .net .Uri ;
8
8
import android .os .Handler ;
9
- import android .support .v7 .widget .LinearLayoutManager ;
10
- import android .support .v7 .widget .RecyclerView ;
11
9
import android .util .AttributeSet ;
12
10
import android .util .Log ;
13
11
import android .view .LayoutInflater ;
21
19
import android .widget .RelativeLayout ;
22
20
import android .widget .TextView ;
23
21
import android .widget .Toast ;
22
+ import androidx .recyclerview .widget .LinearLayoutManager ;
23
+ import androidx .recyclerview .widget .RecyclerView ;
24
24
import com .iknow .android .R ;
25
25
import com .iknow .android .features .trim .VideoTrimmerAdapter ;
26
26
import com .iknow .android .interfaces .IVideoTrimmerView ;
Original file line number Diff line number Diff line change 51
51
android : layout_below =" @+id/video_shoot_tip"
52
52
>
53
53
54
- <android .support.v7 .widget.RecyclerView
54
+ <androidx .recyclerview .widget.RecyclerView
55
55
android : id =" @+id/video_frames_recyclerView"
56
56
android : layout_width =" match_parent"
57
57
android : layout_height =" 50dp"
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.3 .1'
9
+ classpath ' com.android.tools.build:gradle:3.6 .1'
10
10
classpath ' me.tatarka:gradle-retrolambda:3.3.1'
11
11
}
12
12
}
Original file line number Diff line number Diff line change @@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
15
15
# This option should only be used with decoupled projects. More details, visit
16
16
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
17
17
# org.gradle.parallel=true
18
+
19
+ android.useAndroidX =true
20
+ android.enableJetifier =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.10.1 -all.zip
6
+ distributionUrl =https\://services.gradle.org/distributions/gradle-5.6.4 -all.zip
You can’t perform that action at this time.
0 commit comments