Skip to content

Commit 9b1017d

Browse files
committed
Support AndroidX and update build.gradle tool version
1 parent 4f205da commit 9b1017d

16 files changed

+33
-32
lines changed

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
4+
compileSdkVersion 28
55
defaultConfig {
66
applicationId "com.iknow.android"
77
minSdkVersion 16
@@ -29,12 +29,12 @@ android {
2929

3030
dependencies {
3131
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'
3434
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'
3838
implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
3939
implementation 'com.github.bumptech.glide:glide:3.7.0'
4040
}

app/src/main/java/com/iknow/android/features/common/ui/BaseActivity.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import android.annotation.SuppressLint;
44
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;
97

108
/**
119
* author : J.Chou
@@ -16,7 +14,7 @@
1614
* 定义算法骨架,将一些步骤延时到子类,可定义钩子函数。
1715
*/
1816
@SuppressLint("Registered")
19-
public abstract class BaseActivity extends AppCompatActivity{
17+
public abstract class BaseActivity extends AppCompatActivity {
2018

2119
protected abstract void initUI();
2220
protected void loadData() {

app/src/main/java/com/iknow/android/features/record/view/CameraPreviewMaskView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.content.Context;
44
import android.graphics.Canvas;
55
import android.graphics.Color;
6-
import android.support.annotation.Nullable;
76
import android.util.AttributeSet;
87
import android.view.View;
8+
import androidx.annotation.Nullable;
99

1010
/**
1111
* author : J.Chou

app/src/main/java/com/iknow/android/features/select/VideoCursorLoader.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import android.database.Cursor;
55
import android.os.Bundle;
66
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;
1313
import iknow.android.utils.callback.SimpleCallback;
1414

1515
/**

app/src/main/java/com/iknow/android/features/select/VideoSelectActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import android.Manifest;
44
import android.annotation.SuppressLint;
55
import android.database.Cursor;
6-
import android.databinding.DataBindingUtil;
76
import android.view.View;
7+
import androidx.databinding.DataBindingUtil;
88
import com.iknow.android.R;
99
import com.iknow.android.databinding.ActivityVideoSelectBinding;
1010
import com.iknow.android.features.record.VideoRecordActivity;

app/src/main/java/com/iknow/android/features/select/VideoSelectAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.media.MediaMetadataRetriever;
66
import android.net.Uri;
77
import android.provider.MediaStore;
8-
import android.support.v4.app.FragmentActivity;
98
import android.text.TextUtils;
109
import android.view.LayoutInflater;
1110
import android.view.View;
@@ -14,6 +13,7 @@
1413
import android.widget.FrameLayout;
1514
import android.widget.ImageView;
1615
import android.widget.TextView;
16+
import androidx.fragment.app.FragmentActivity;
1717
import com.bumptech.glide.Glide;
1818
import com.iknow.android.R;
1919
import com.iknow.android.features.trim.VideoTrimmerActivity;

app/src/main/java/com/iknow/android/features/trim/VideoTrimmerActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import android.app.ProgressDialog;
44
import android.content.Intent;
5-
import android.databinding.DataBindingUtil;
65
import android.net.Uri;
76
import android.os.Bundle;
8-
import android.support.v4.app.FragmentActivity;
97
import android.text.TextUtils;
8+
import androidx.databinding.DataBindingUtil;
9+
import androidx.fragment.app.FragmentActivity;
1010
import com.iknow.android.R;
1111
import com.iknow.android.databinding.ActivityVideoTrimBinding;
1212
import com.iknow.android.features.common.ui.BaseActivity;

app/src/main/java/com/iknow/android/features/trim/VideoTrimmerAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import android.content.Context;
44
import android.graphics.Bitmap;
5-
import android.support.annotation.NonNull;
6-
import android.support.v7.widget.RecyclerView;
75
import android.view.LayoutInflater;
86
import android.view.View;
97
import android.view.ViewGroup;
108
import android.widget.ImageView;
119
import android.widget.LinearLayout;
10+
import androidx.annotation.NonNull;
11+
import androidx.recyclerview.widget.RecyclerView;
1212
import com.iknow.android.R;
1313
import java.util.ArrayList;
1414
import java.util.List;

app/src/main/java/com/iknow/android/widget/RangeSeekBarView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import android.graphics.Rect;
1111
import android.os.Bundle;
1212
import android.os.Parcelable;
13-
import android.support.annotation.Nullable;
1413
import android.util.AttributeSet;
1514
import android.util.Log;
1615
import android.view.MotionEvent;
1716
import android.view.View;
1817
import android.view.ViewConfiguration;
18+
import androidx.annotation.Nullable;
1919
import com.iknow.android.R;
2020
import com.iknow.android.features.trim.VideoTrimmerUtil;
2121
import iknow.android.utils.DateUtil;

app/src/main/java/com/iknow/android/widget/SpacesItemDecoration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.iknow.android.widget;
22

33
import android.graphics.Rect;
4-
import android.support.v7.widget.RecyclerView;
54
import android.view.View;
5+
import androidx.recyclerview.widget.RecyclerView;
66

77
/**
88
* Author: Jason.Chou

app/src/main/java/com/iknow/android/widget/SpacesItemDecoration2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.iknow.android.widget;
22

33
import android.graphics.Rect;
4-
import android.support.v7.widget.RecyclerView;
54
import android.view.View;
5+
import androidx.recyclerview.widget.RecyclerView;
66

77
public class SpacesItemDecoration2 extends RecyclerView.ItemDecoration{
88

app/src/main/java/com/iknow/android/widget/VideoTrimmerView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import android.media.MediaPlayer;
77
import android.net.Uri;
88
import android.os.Handler;
9-
import android.support.v7.widget.LinearLayoutManager;
10-
import android.support.v7.widget.RecyclerView;
119
import android.util.AttributeSet;
1210
import android.util.Log;
1311
import android.view.LayoutInflater;
@@ -21,6 +19,8 @@
2119
import android.widget.RelativeLayout;
2220
import android.widget.TextView;
2321
import android.widget.Toast;
22+
import androidx.recyclerview.widget.LinearLayoutManager;
23+
import androidx.recyclerview.widget.RecyclerView;
2424
import com.iknow.android.R;
2525
import com.iknow.android.features.trim.VideoTrimmerAdapter;
2626
import com.iknow.android.interfaces.IVideoTrimmerView;

app/src/main/res/layout/video_trimmer_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
android:layout_below="@+id/video_shoot_tip"
5252
>
5353

54-
<android.support.v7.widget.RecyclerView
54+
<androidx.recyclerview.widget.RecyclerView
5555
android:id="@+id/video_frames_recyclerView"
5656
android:layout_width="match_parent"
5757
android:layout_height="50dp"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.3.1'
9+
classpath 'com.android.tools.build:gradle:3.6.1'
1010
classpath 'me.tatarka:gradle-retrolambda:3.3.1'
1111
}
1212
}

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
1515
# This option should only be used with decoupled projects. More details, visit
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1717
# org.gradle.parallel=true
18+
19+
android.useAndroidX=true
20+
android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
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

0 commit comments

Comments
 (0)