Skip to content

Commit 6ef2675

Browse files
jiajunhuijiajunhui
committed
Adapt to AndroidX
1 parent 41f9aa8 commit 6ef2675

Some content is hidden

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

46 files changed

+109
-109
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,24 @@ demo示例集成了播放控制组件**ControllerCover**、加载中组件**Load
7676
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
7777
```
7878

79-
添加如下依赖<br>
79+
添加如下依赖（已适配AndroidX）<br>
8080

8181
```gradle
8282
dependencies {
8383
//---------如果仅使用MediaPlayer解码，使用以下依赖。----------
8484
//该依赖仅包含MediaPlayer解码
85-
implementation 'com.kk.taurus.playerbase:playerbase:3.3.5'
85+
implementation 'com.kk.taurus.playerbase:playerbase:3.3.6'
8686
8787
8888
//---------如果使用ExoPlayer解码，使用以下依赖。---------
8989
//该依赖包含exoplayer解码和MediaPlayer解码
9090
//注意exoplayer的最小支持SDK版本为16
91-
implementation 'cn.jiajunhui:exoplayer:335_291_009'
91+
implementation 'cn.jiajunhui:exoplayer:336_291_010'
9292
9393
9494
//---------如果使用ijkPlayer解码，使用以下依赖。---------
9595
//该依赖包含ijkplayer解码和MediaPlayer解码
96-
implementation 'cn.jiajunhui:ijkplayer:335_088_007'
96+
implementation 'cn.jiajunhui:ijkplayer:336_088_007'
9797
//ijk官方的解码库依赖，较少格式版本且不支持HTTPS。
9898
implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.8'
9999
# Other ABIs: optional

‎app/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
targetSdkVersion 28
99
versionCode 1
1010
versionName "1.0"
11-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
11+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {
1414
release {
@@ -28,21 +28,21 @@ android {
2828

2929
dependencies {
3030
implementation fileTree(include: ['*.jar'], dir: 'libs')
31-
implementation 'com.android.support:appcompat-v7:28.0.0'
32-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
31+
implementation 'androidx.appcompat:appcompat:1.1.0'
32+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3333
testImplementation 'junit:junit:4.12'
34-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
35-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
34+
androidTestImplementation 'androidx.test:runner:1.2.0'
35+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3636
implementation 'com.jiajunhui.xapp.medialoader:medialoader:1.2.1'
37-
implementation 'com.android.support:recyclerview-v7:28.0.0'
37+
implementation 'androidx.recyclerview:recyclerview:1.1.0'
3838
implementation 'com.lovedise:permissiongen:0.0.6'
39-
implementation 'com.github.bumptech.glide:glide:4.7.1'
40-
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
41-
implementation 'com.jakewharton:butterknife:8.8.1'
42-
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
39+
implementation 'com.github.bumptech.glide:glide:4.9.0'
40+
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
41+
implementation 'com.jakewharton:butterknife:10.1.0'
42+
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
4343
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
4444
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
4545
implementation project(':exoplayer')
4646
implementation project(':ijkplayer')
47-
implementation 'com.android.support:design:28.0.0'
47+
implementation 'com.google.android.material:material:1.0.0'
4848
}

‎app/src/androidTest/java/com/kk/taurus/avplayer/ExampleInstrumentedTest.java

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

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.InstrumentationRegistry;
5+
import androidx.test.runner.AndroidJUnit4;
66

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

‎app/src/main/java/com/kk/taurus/avplayer/HomeActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.app.Activity;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
6+
import androidx.annotation.Nullable;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.view.Menu;
1010
import android.view.MenuItem;
1111
import android.view.View;

‎app/src/main/java/com/kk/taurus/avplayer/adapter/ListAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.kk.taurus.avplayer.adapter;
22

33
import android.content.Context;
4-
import android.support.v4.view.ViewCompat;
5-
import android.support.v7.widget.RecyclerView;
4+
import androidx.core.view.ViewCompat;
5+
import androidx.recyclerview.widget.RecyclerView;
66
import android.view.View;
77
import android.view.ViewGroup;
88
import android.view.ViewTreeObserver;

‎app/src/main/java/com/kk/taurus/avplayer/adapter/OnItemClickListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.kk.taurus.avplayer.adapter;
22

3-
import android.support.v7.widget.RecyclerView;
3+
import androidx.recyclerview.widget.RecyclerView;
44

55
public interface OnItemClickListener<H extends RecyclerView.ViewHolder, T> {
66

‎app/src/main/java/com/kk/taurus/avplayer/adapter/PlayPagerAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.kk.taurus.avplayer.adapter;
22

33
import android.content.Context;
4-
import android.support.annotation.NonNull;
5-
import android.support.v4.view.PagerAdapter;
4+
import androidx.annotation.NonNull;
5+
import androidx.viewpager.widget.PagerAdapter;
66
import android.view.View;
77
import android.view.ViewGroup;
88
import android.widget.FrameLayout;

‎app/src/main/java/com/kk/taurus/avplayer/adapter/SettingAdapter.java

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

33
import android.content.Context;
44
import android.graphics.Color;
5-
import android.support.annotation.NonNull;
6-
import android.support.v7.widget.RecyclerView;
5+
import androidx.annotation.NonNull;
6+
import androidx.recyclerview.widget.RecyclerView;
77
import android.view.View;
88
import android.view.ViewGroup;
99
import android.widget.TextView;

‎app/src/main/java/com/kk/taurus/avplayer/adapter/VideoListPagerAdapter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.kk.taurus.avplayer.adapter;
22

3-
import android.support.annotation.Nullable;
4-
import android.support.v4.app.Fragment;
5-
import android.support.v4.app.FragmentManager;
6-
import android.support.v4.app.FragmentStatePagerAdapter;
3+
import androidx.annotation.Nullable;
4+
import androidx.fragment.app.Fragment;
5+
import androidx.fragment.app.FragmentManager;
6+
import androidx.fragment.app.FragmentStatePagerAdapter;
77

88
import com.kk.taurus.avplayer.ui.fragment.VideoListFragment;
99

‎app/src/main/java/com/kk/taurus/avplayer/ui/BaseVideoViewActivity.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
import android.content.res.Configuration;
55
import android.os.Build;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
8-
import android.support.v7.app.AppCompatActivity;
9-
import android.support.v7.widget.LinearLayoutManager;
10-
import android.support.v7.widget.RecyclerView;
7+
import androidx.annotation.Nullable;
8+
import androidx.appcompat.app.AppCompatActivity;
9+
import androidx.recyclerview.widget.LinearLayoutManager;
10+
import androidx.recyclerview.widget.RecyclerView;
1111
import android.view.ViewGroup;
1212
import android.view.WindowManager;
1313
import android.widget.RelativeLayout;
1414
import android.widget.Toast;
1515

16-
import com.kk.taurus.avplayer.App;
1716
import com.kk.taurus.avplayer.R;
1817
import com.kk.taurus.avplayer.cover.ControllerCover;
1918
import com.kk.taurus.avplayer.play.DataInter;
@@ -22,7 +21,6 @@
2221
import com.kk.taurus.avplayer.utils.PUtil;
2322
import com.kk.taurus.playerbase.assist.InterEvent;
2423
import com.kk.taurus.playerbase.assist.OnVideoViewEventHandler;
25-
import com.kk.taurus.playerbase.config.PlayerConfig;
2624
import com.kk.taurus.playerbase.entity.DataSource;
2725
import com.kk.taurus.playerbase.event.OnPlayerEventListener;
2826
import com.kk.taurus.playerbase.player.IPlayer;

‎app/src/main/java/com/kk/taurus/avplayer/ui/DetailPlayActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import android.content.pm.ActivityInfo;
66
import android.content.res.Configuration;
77
import android.os.Bundle;
8-
import android.support.annotation.Nullable;
9-
import android.support.v7.app.AppCompatActivity;
8+
import androidx.annotation.Nullable;
9+
import androidx.appcompat.app.AppCompatActivity;
1010
import android.view.WindowManager;
1111
import android.widget.RelativeLayout;
1212

‎app/src/main/java/com/kk/taurus/avplayer/ui/InputUrlPlayActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import android.content.pm.ActivityInfo;
44
import android.content.res.Configuration;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v7.app.AppCompatActivity;
6+
import androidx.annotation.Nullable;
7+
import androidx.appcompat.app.AppCompatActivity;
88
import android.text.TextUtils;
99
import android.view.View;
1010
import android.view.WindowManager;

‎app/src/main/java/com/kk/taurus/avplayer/ui/ShareAnimationActivityA.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import android.content.Intent;
55
import android.os.Build;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
8-
import android.support.v4.app.ActivityCompat;
9-
import android.support.v7.app.AppCompatActivity;
7+
import androidx.annotation.Nullable;
8+
import androidx.core.app.ActivityCompat;
9+
import androidx.appcompat.app.AppCompatActivity;
1010
import android.view.View;
1111
import android.view.WindowManager;
1212
import android.widget.FrameLayout;

‎app/src/main/java/com/kk/taurus/avplayer/ui/ShareAnimationActivityB.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.kk.taurus.avplayer.ui;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.view.WindowManager;
77
import android.widget.RelativeLayout;
88

‎app/src/main/java/com/kk/taurus/avplayer/ui/SplashActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import android.os.Bundle;
66
import android.os.Handler;
77
import android.os.Looper;
8-
import android.support.annotation.Nullable;
9-
import android.support.v7.app.AppCompatActivity;
8+
import androidx.annotation.Nullable;
9+
import androidx.appcompat.app.AppCompatActivity;
1010
import android.widget.Toast;
1111

1212
import com.kk.taurus.avplayer.R;

‎app/src/main/java/com/kk/taurus/avplayer/ui/TestPlayActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.kk.taurus.avplayer.ui;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.app.AppCompatActivity;
66

77
import com.kk.taurus.avplayer.R;
88
import com.kk.taurus.playerbase.entity.DataSource;

‎app/src/main/java/com/kk/taurus/avplayer/ui/ViewPagerPlayActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.Manifest;
44
import android.graphics.Color;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v4.view.ViewPager;
8-
import android.support.v7.app.AppCompatActivity;
6+
import androidx.annotation.Nullable;
7+
import androidx.viewpager.widget.ViewPager;
8+
import androidx.appcompat.app.AppCompatActivity;
99
import android.view.View;
1010
import android.view.WindowManager;
1111
import android.widget.FrameLayout;

‎app/src/main/java/com/kk/taurus/avplayer/ui/fragment/VideoListFragment.java

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

33
import android.content.res.Configuration;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
6-
import android.support.annotation.Nullable;
7-
import android.support.v4.app.Fragment;
8-
import android.support.v7.widget.LinearLayoutManager;
9-
import android.support.v7.widget.RecyclerView;
5+
import androidx.annotation.NonNull;
6+
import androidx.annotation.Nullable;
7+
import androidx.fragment.app.Fragment;
8+
import androidx.recyclerview.widget.LinearLayoutManager;
9+
import androidx.recyclerview.widget.RecyclerView;
1010
import android.view.LayoutInflater;
1111
import android.view.View;
1212
import android.view.ViewGroup;

‎app/src/main/java/com/kk/taurus/avplayer/ui/listplay/ListPlayActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import android.content.res.Configuration;
55
import android.graphics.Color;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
8-
import android.support.v7.app.AppCompatActivity;
9-
import android.support.v7.widget.LinearLayoutManager;
10-
import android.support.v7.widget.RecyclerView;
7+
import androidx.annotation.Nullable;
8+
import androidx.appcompat.app.AppCompatActivity;
9+
import androidx.recyclerview.widget.LinearLayoutManager;
10+
import androidx.recyclerview.widget.RecyclerView;
1111
import android.view.WindowManager;
1212
import android.widget.FrameLayout;
1313

‎app/src/main/java/com/kk/taurus/avplayer/ui/listplay/MultiListActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import android.content.res.Configuration;
55
import android.graphics.Color;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
8-
import android.support.design.widget.TabLayout;
9-
import android.support.v4.view.ViewPager;
10-
import android.support.v7.app.AppCompatActivity;
7+
import androidx.annotation.Nullable;
8+
import com.google.android.material.tabs.TabLayout;
9+
import androidx.viewpager.widget.ViewPager;
10+
import androidx.appcompat.app.AppCompatActivity;
1111
import android.view.WindowManager;
1212
import android.widget.FrameLayout;
1313

‎app/src/main/java/com/kk/taurus/avplayer/ui/window/FloatWindowActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import android.graphics.Color;
77
import android.os.Build;
88
import android.os.Bundle;
9-
import android.support.annotation.Nullable;
10-
import android.support.v7.app.AppCompatActivity;
9+
import androidx.annotation.Nullable;
10+
import androidx.appcompat.app.AppCompatActivity;
1111
import android.view.View;
1212
import android.view.ViewGroup;
1313
import android.view.WindowManager;

‎app/src/main/java/com/kk/taurus/avplayer/ui/window/WindowVideoViewActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.graphics.Color;
55
import android.os.Build;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
8-
import android.support.v7.app.AppCompatActivity;
7+
import androidx.annotation.Nullable;
8+
import androidx.appcompat.app.AppCompatActivity;
99
import android.view.View;
1010
import android.view.WindowManager;
1111
import android.widget.Button;

‎app/src/main/java/com/kk/taurus/avplayer/utils/ImageDisplayEngine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.graphics.Bitmap;
55
import android.graphics.drawable.BitmapDrawable;
66
import android.graphics.drawable.Drawable;
7-
import android.support.annotation.NonNull;
8-
import android.support.annotation.Nullable;
7+
import androidx.annotation.NonNull;
8+
import androidx.annotation.Nullable;
99
import android.widget.ImageView;
1010

1111
import com.bumptech.glide.request.target.SimpleTarget;

‎app/src/main/java/com/kk/taurus/avplayer/view/SmileView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import android.graphics.Path;
1212
import android.graphics.RectF;
1313
import android.graphics.Shader;
14-
import android.support.annotation.Nullable;
14+
import androidx.annotation.Nullable;
1515
import android.util.AttributeSet;
1616
import android.view.View;
1717

‎app/src/main/res/layout/activity_base_video_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent">
55

6-
<android.support.v7.widget.RecyclerView
6+
<androidx.recyclerview.widget.RecyclerView
77
android:id="@+id/setting_recycler"
88
android:layout_width="match_parent"
99
android:layout_height="match_parent"

‎app/src/main/res/layout/activity_home.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
android:layout_height="match_parent"
55
xmlns:app="http://schemas.android.com/apk/res-auto">
66

7-
<android.support.v7.widget.Toolbar
7+
<androidx.appcompat.widget.Toolbar
88
android:id="@+id/id_toolbar"
99
android:layout_width="match_parent"
1010
android:layout_height="?attr/actionBarSize"

‎app/src/main/res/layout/activity_list.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent">
55

6-
<android.support.v7.widget.RecyclerView
6+
<androidx.recyclerview.widget.RecyclerView
77
android:id="@+id/recycler"
88
android:layout_width="match_parent"
99
android:layout_height="match_parent"

‎app/src/main/res/layout/activity_multi_list.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent">
55

6-
<android.support.design.widget.TabLayout
6+
<com.google.android.material.tabs.TabLayout
77
android:id="@+id/tabLayout"
88
android:layout_width="match_parent"
99
android:layout_height="48dp"/>
1010

11-
<android.support.v4.view.ViewPager
11+
<androidx.viewpager.widget.ViewPager
1212
android:id="@+id/viewPager"
1313
android:layout_width="match_parent"
1414
android:layout_height="match_parent"

‎app/src/main/res/layout/activity_view_pager_play.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_height="match_parent"
66
android:background="#000000">
77

8-
<android.support.v4.view.ViewPager
8+
<androidx.viewpager.widget.ViewPager
99
android:id="@+id/viewPager"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent"/>

0 commit comments

Comments
 (0)