From 598f11fd3555da6d38b9e1a22373f59df8afdcbd Mon Sep 17 00:00:00 2001 From: dueeeke Date: Fri, 25 Oct 2019 17:30:55 +0800 Subject: [PATCH] migrate sample to androidx --- dkplayer-sample/build.gradle | 4 +-- .../dkplayer/activity/BaseActivity.java | 11 ++++---- .../dkplayer/activity/DebugActivity.java | 5 ++-- .../activity/api/ParallelPlayActivity.java | 6 ++-- .../list/AutoPlayRecyclerViewActivity.java | 6 ++-- .../activity/list/DetailActivity.java | 6 ++-- .../dkplayer/activity/list/ListActivity.java | 7 +++-- .../list/ListFragmentViewPagerActivity.java | 10 +++---- .../activity/list/RecyclerViewActivity.java | 7 +++-- .../list/RotateRecyclerViewActivity.java | 7 +++-- .../activity/list/SeamlessPlayActivity.java | 5 ++-- .../activity/list/tiktok/TikTok2Activity.java | 2 +- .../activity/list/tiktok/TikTokActivity.java | 14 +++++----- .../list/tiktok/ViewPagerLayoutManager.java | 8 +++--- .../activity/pip/AndroidOPiPActivity.java | 9 +++--- .../dkplayer/activity/pip/PIPActivity.java | 7 +++-- .../activity/pip/PIPDemoActivity.java | 6 ++-- .../activity/pip/PIPListActivity.java | 10 +++---- .../activity/pip/TinyScreenListActivity.java | 10 +++---- .../adapter/FloatRecyclerViewAdapter.java | 4 +-- .../dkplayer/adapter/MyPagerAdapter.java | 8 +++--- .../adapter/RotateRecyclerViewAdapter.java | 2 +- .../adapter/SeamlessRecyclerViewAdapter.java | 2 +- .../dkplayer/adapter/TikTokAdapter.java | 2 +- .../dkplayer/adapter/Tiktok2Adapter.java | 4 +-- .../adapter/VideoRecyclerViewAdapter.java | 4 +-- .../dkplayer/fragment/PlayerFragment.java | 6 ++-- .../fragment/RecyclerViewFragment.java | 10 +++---- .../dkplayer/util/ProgressManagerImpl.java | 2 +- .../dueeeke/dkplayer/widget/FloatView.java | 2 +- .../dkplayer/widget/VerticalViewPager.java | 28 +++++++++---------- .../widget/controller/AdController.java | 4 +-- .../controller/DefinitionController.java | 8 +++--- .../widget/controller/FloatController.java | 4 +-- .../controller/FullScreenController.java | 4 +-- .../widget/controller/PadController.java | 4 +-- .../RotateInFullscreenController.java | 4 +-- .../widget/controller/SeamlessController.java | 4 +-- .../widget/controller/TikTokController.java | 4 +-- .../widget/videoview/DanmukuVideoView.java | 6 ++-- .../widget/videoview/DefinitionVideoView.java | 5 ++-- .../widget/videoview/FullScreenVideoView.java | 4 +-- .../activity_list_fragment_view_pager.xml | 4 +-- .../res/layout/activity_recycler_view.xml | 2 +- .../src/main/res/layout/activity_tiktok.xml | 2 +- gradle.properties | 2 ++ 46 files changed, 143 insertions(+), 132 deletions(-) diff --git a/dkplayer-sample/build.gradle b/dkplayer-sample/build.gradle index bfb19bc8..81760f25 100644 --- a/dkplayer-sample/build.gradle +++ b/dkplayer-sample/build.gradle @@ -72,12 +72,12 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-3' - implementation "com.android.support:recyclerview-v7:$project.supportLibraryVersion" + implementation "androidx.recyclerview:recyclerview:1.0.0" implementation 'com.github.bumptech.glide:glide:3.7.0' implementation 'com.yanzhenjie.permission:support:2.0.1' implementation 'com.github.ctiao:DanmakuFlameMaster:0.9.25' implementation 'com.github.ctiao:ndkbitmap-armv7a:0.9.21' - implementation "com.android.support:design:$project.supportLibraryVersion" + implementation "com.google.android.material:material:1.0.0" implementation 'com.google.code.gson:gson:2.8.6' implementation project(':dkplayer-java') diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/BaseActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/BaseActivity.java index 02f984e1..b7e4e88e 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/BaseActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/BaseActivity.java @@ -3,15 +3,16 @@ import android.annotation.SuppressLint; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; import android.view.View; import android.view.WindowInsets; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.core.view.ViewCompat; + import com.dueeeke.dkplayer.R; import com.dueeeke.videoplayer.player.VideoView; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/DebugActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/DebugActivity.java index 11043db9..f286fdb1 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/DebugActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/DebugActivity.java @@ -3,8 +3,6 @@ import android.annotation.SuppressLint; import android.content.res.Configuration; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; @@ -12,6 +10,9 @@ import android.widget.FrameLayout; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; + import com.dueeeke.dkplayer.util.DebugTextViewHelper; /** diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/api/ParallelPlayActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/api/ParallelPlayActivity.java index c2f37e3b..a754c36f 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/api/ParallelPlayActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/api/ParallelPlayActivity.java @@ -1,9 +1,9 @@ package com.dueeeke.dkplayer.activity.api; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import com.dueeeke.dkplayer.R; import com.dueeeke.videocontroller.StandardVideoController; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/AutoPlayRecyclerViewActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/AutoPlayRecyclerViewActivity.java index d554b8ce..b1f88513 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/AutoPlayRecyclerViewActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/AutoPlayRecyclerViewActivity.java @@ -1,8 +1,8 @@ package com.dueeeke.dkplayer.activity.list; import android.graphics.Rect; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.dueeeke.dkplayer.R; @@ -10,7 +10,7 @@ import com.dueeeke.dkplayer.util.DataUtil; import com.dueeeke.videoplayer.player.VideoView; -import static android.support.v7.widget.RecyclerView.SCROLL_STATE_IDLE; +import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; /** * 自动播放 diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/DetailActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/DetailActivity.java index d0567404..22bf8b68 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/DetailActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/DetailActivity.java @@ -2,9 +2,9 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.ViewParent; import android.widget.FrameLayout; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/ListActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/ListActivity.java index 488d31ef..790671df 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/ListActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/ListActivity.java @@ -2,12 +2,13 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; import android.view.View; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; + import com.dueeeke.dkplayer.R; import com.dueeeke.dkplayer.activity.list.tiktok.TikTok2Activity; import com.dueeeke.dkplayer.activity.list.tiktok.TikTokActivity; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/ListFragmentViewPagerActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/ListFragmentViewPagerActivity.java index af916f86..77d4985d 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/ListFragmentViewPagerActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/ListFragmentViewPagerActivity.java @@ -1,11 +1,11 @@ package com.dueeeke.dkplayer.activity.list; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.MenuItem; import com.dueeeke.dkplayer.R; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/RecyclerViewActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/RecyclerViewActivity.java index deef446a..f5eadadb 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/RecyclerViewActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/RecyclerViewActivity.java @@ -1,10 +1,11 @@ package com.dueeeke.dkplayer.activity.list; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.dueeeke.dkplayer.R; import com.dueeeke.dkplayer.adapter.VideoRecyclerViewAdapter; import com.dueeeke.dkplayer.util.DataUtil; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/RotateRecyclerViewActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/RotateRecyclerViewActivity.java index 9c0df772..cddb6395 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/RotateRecyclerViewActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/RotateRecyclerViewActivity.java @@ -1,16 +1,17 @@ package com.dueeeke.dkplayer.activity.list; import android.graphics.Rect; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.dueeeke.dkplayer.R; import com.dueeeke.dkplayer.adapter.RotateRecyclerViewAdapter; import com.dueeeke.dkplayer.util.DataUtil; import com.dueeeke.videoplayer.player.VideoView; -import static android.support.v7.widget.RecyclerView.SCROLL_STATE_IDLE; +import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; /** * Created by Devlin_n on 2017/5/31. diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/SeamlessPlayActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/SeamlessPlayActivity.java index 05dc2c32..f0047e60 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/SeamlessPlayActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/SeamlessPlayActivity.java @@ -3,12 +3,13 @@ import android.content.Intent; import android.graphics.Rect; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewParent; import android.widget.FrameLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.dueeeke.dkplayer.R; import com.dueeeke.dkplayer.activity.BaseActivity; import com.dueeeke.dkplayer.adapter.SeamlessRecyclerViewAdapter; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTok2Activity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTok2Activity.java index ee1447a2..b16ec624 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTok2Activity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTok2Activity.java @@ -1,6 +1,6 @@ package com.dueeeke.dkplayer.activity.list.tiktok; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.view.View; import com.dueeeke.dkplayer.R; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTokActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTokActivity.java index 3fe59b75..725c52cd 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTokActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/TikTokActivity.java @@ -2,13 +2,13 @@ import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.OrientationHelper; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.core.view.ViewCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.OrientationHelper; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewParent; import android.view.WindowInsets; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/ViewPagerLayoutManager.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/ViewPagerLayoutManager.java index 2cccca63..9e9511b5 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/ViewPagerLayoutManager.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/ViewPagerLayoutManager.java @@ -1,10 +1,10 @@ package com.dueeeke.dkplayer.activity.list.tiktok; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.PagerSnapHelper; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.PagerSnapHelper; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; @Deprecated diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/AndroidOPiPActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/AndroidOPiPActivity.java index 649aed9a..4bce6cff 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/AndroidOPiPActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/AndroidOPiPActivity.java @@ -11,16 +11,17 @@ import android.graphics.drawable.Icon; import android.os.Build; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.util.Rational; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.annotation.DrawableRes; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; + import com.dueeeke.dkplayer.R; import com.dueeeke.videocontroller.StandardVideoController; import com.dueeeke.videoplayer.listener.OnVideoViewStateChangeListener; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPActivity.java index 62fc6e53..a733b997 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPActivity.java @@ -1,13 +1,14 @@ package com.dueeeke.dkplayer.activity.pip; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; import android.view.View; import android.widget.FrameLayout; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; + import com.bumptech.glide.Glide; import com.dueeeke.dkplayer.R; import com.dueeeke.dkplayer.util.PIPManager; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPDemoActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPDemoActivity.java index c5c017ef..ae239b3f 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPDemoActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPDemoActivity.java @@ -3,9 +3,9 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.MenuItem; import android.view.View; import android.widget.Toast; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPListActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPListActivity.java index 4846f1ed..bad56b4b 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPListActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/PIPListActivity.java @@ -1,11 +1,11 @@ package com.dueeeke.dkplayer.activity.pip; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.MenuItem; import android.view.View; import android.widget.FrameLayout; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/TinyScreenListActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/TinyScreenListActivity.java index 16710441..a9cc9519 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/TinyScreenListActivity.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/pip/TinyScreenListActivity.java @@ -1,11 +1,11 @@ package com.dueeeke.dkplayer.activity.pip; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/FloatRecyclerViewAdapter.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/FloatRecyclerViewAdapter.java index 0fe51f4f..01310fe8 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/FloatRecyclerViewAdapter.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/FloatRecyclerViewAdapter.java @@ -1,7 +1,7 @@ package com.dueeeke.dkplayer.adapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/MyPagerAdapter.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/MyPagerAdapter.java index 5d887982..21a906af 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/MyPagerAdapter.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/MyPagerAdapter.java @@ -1,9 +1,9 @@ package com.dueeeke.dkplayer.adapter; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; import com.dueeeke.dkplayer.fragment.RecyclerViewFragment; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/RotateRecyclerViewAdapter.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/RotateRecyclerViewAdapter.java index 99312361..53d837d8 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/RotateRecyclerViewAdapter.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/RotateRecyclerViewAdapter.java @@ -1,7 +1,7 @@ package com.dueeeke.dkplayer.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/SeamlessRecyclerViewAdapter.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/SeamlessRecyclerViewAdapter.java index 7b9a0538..5993753f 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/SeamlessRecyclerViewAdapter.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/SeamlessRecyclerViewAdapter.java @@ -1,7 +1,7 @@ package com.dueeeke.dkplayer.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/TikTokAdapter.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/TikTokAdapter.java index ec664506..b002d095 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/TikTokAdapter.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/TikTokAdapter.java @@ -1,7 +1,7 @@ package com.dueeeke.dkplayer.adapter; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/Tiktok2Adapter.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/Tiktok2Adapter.java index c1d2d31e..0f60fe0d 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/Tiktok2Adapter.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/Tiktok2Adapter.java @@ -1,8 +1,8 @@ package com.dueeeke.dkplayer.adapter; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.view.PagerAdapter; +import androidx.annotation.NonNull; +import androidx.viewpager.widget.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/VideoRecyclerViewAdapter.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/VideoRecyclerViewAdapter.java index 80759e0c..b91e6861 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/VideoRecyclerViewAdapter.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/adapter/VideoRecyclerViewAdapter.java @@ -1,7 +1,7 @@ package com.dueeeke.dkplayer.adapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/fragment/PlayerFragment.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/fragment/PlayerFragment.java index 2b990243..c021674b 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/fragment/PlayerFragment.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/fragment/PlayerFragment.java @@ -1,9 +1,9 @@ package com.dueeeke.dkplayer.fragment; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/fragment/RecyclerViewFragment.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/fragment/RecyclerViewFragment.java index 92f9c339..b4d08097 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/fragment/RecyclerViewFragment.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/fragment/RecyclerViewFragment.java @@ -1,11 +1,11 @@ package com.dueeeke.dkplayer.fragment; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/util/ProgressManagerImpl.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/util/ProgressManagerImpl.java index 0ea82989..cb34f1e6 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/util/ProgressManagerImpl.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/util/ProgressManagerImpl.java @@ -1,6 +1,6 @@ package com.dueeeke.dkplayer.util; -import android.support.v4.util.LruCache; +import androidx.collection.LruCache; import android.text.TextUtils; import com.dueeeke.videoplayer.player.ProgressManager; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/FloatView.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/FloatView.java index c38bc0a3..35b7840a 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/FloatView.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/FloatView.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.PixelFormat; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.Gravity; import android.view.MotionEvent; import android.view.ViewConfiguration; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/VerticalViewPager.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/VerticalViewPager.java index 1e4d8926..bcd56b96 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/VerticalViewPager.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/VerticalViewPager.java @@ -12,18 +12,18 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; -import android.support.v4.os.ParcelableCompat; -import android.support.v4.os.ParcelableCompatCreatorCallbacks; -import android.support.v4.view.AccessibilityDelegateCompat; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.VelocityTrackerCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewConfigurationCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.view.accessibility.AccessibilityRecordCompat; -import android.support.v4.widget.EdgeEffectCompat; +import androidx.core.os.ParcelableCompat; +import androidx.core.os.ParcelableCompatCreatorCallbacks; +import androidx.core.view.AccessibilityDelegateCompat; +import androidx.core.view.MotionEventCompat; +import androidx.viewpager.widget.PagerAdapter; +import androidx.core.view.VelocityTrackerCompat; +import androidx.core.view.ViewCompat; +import androidx.core.view.ViewConfigurationCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.view.accessibility.AccessibilityRecordCompat; +import androidx.core.widget.EdgeEffectCompat; import android.util.AttributeSet; import android.util.Log; import android.view.FocusFinder; @@ -481,7 +481,7 @@ private void scrollToItem(int item, boolean smoothScroll, int velocity, /** * Set a listener that will be invoked whenever the page changes or is incrementally - * scrolled. See {@link android.support.v4.view.ViewPager.OnPageChangeListener}. + * scrolled. See {@link ViewPager.OnPageChangeListener}. * * @param listener Listener to set */ @@ -490,7 +490,7 @@ public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) { } /** - * Set a {@link android.support.v4.view.ViewPager.PageTransformer} that will be called for each attached page whenever + * Set a {@link ViewPager.PageTransformer} that will be called for each attached page whenever * the scroll position is changed. This allows the application to apply custom property * transformations to each page, overriding the default sliding look and feel. *

diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/AdController.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/AdController.java index ddeaa3d6..a7ecc555 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/AdController.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/AdController.java @@ -2,8 +2,8 @@ import android.content.Context; import android.content.pm.ActivityInfo; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/DefinitionController.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/DefinitionController.java index 3da28939..8a6cb4cc 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/DefinitionController.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/DefinitionController.java @@ -3,10 +3,10 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/FloatController.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/FloatController.java index 7e94d8c7..6e2d9e24 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/FloatController.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/FloatController.java @@ -2,8 +2,8 @@ import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/FullScreenController.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/FullScreenController.java index 960917c4..b387050e 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/FullScreenController.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/FullScreenController.java @@ -1,8 +1,8 @@ package com.dueeeke.dkplayer.widget.controller; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/PadController.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/PadController.java index 96e7f0db..a7e54281 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/PadController.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/PadController.java @@ -2,8 +2,8 @@ import android.app.Activity; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.Toast; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/RotateInFullscreenController.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/RotateInFullscreenController.java index 488cde3e..9bcf8c1d 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/RotateInFullscreenController.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/RotateInFullscreenController.java @@ -3,8 +3,8 @@ import android.app.Activity; import android.content.Context; import android.content.pm.ActivityInfo; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/SeamlessController.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/SeamlessController.java index 21e85427..4765afe5 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/SeamlessController.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/SeamlessController.java @@ -1,8 +1,8 @@ package com.dueeeke.dkplayer.widget.controller; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/TikTokController.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/TikTokController.java index 447dca77..3883e200 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/TikTokController.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/controller/TikTokController.java @@ -1,8 +1,8 @@ package com.dueeeke.dkplayer.widget.controller; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/DanmukuVideoView.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/DanmukuVideoView.java index 8092273c..b1c50156 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/DanmukuVideoView.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/DanmukuVideoView.java @@ -6,9 +6,9 @@ import android.graphics.Paint; import android.graphics.RectF; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.TextPaint; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/DefinitionVideoView.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/DefinitionVideoView.java index f7f0c31b..62ef5ccb 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/DefinitionVideoView.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/DefinitionVideoView.java @@ -1,10 +1,11 @@ package com.dueeeke.dkplayer.widget.videoview; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.dueeeke.dkplayer.interf.DefinitionMediaPlayerControl; import com.dueeeke.videoplayer.player.AbstractPlayer; import com.dueeeke.videoplayer.player.VideoView; diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/FullScreenVideoView.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/FullScreenVideoView.java index 06062b11..2bb5f6db 100644 --- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/FullScreenVideoView.java +++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/videoview/FullScreenVideoView.java @@ -3,8 +3,8 @@ import android.app.Activity; import android.content.Context; import android.content.pm.ActivityInfo; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import com.dueeeke.videocontroller.CutoutUtil; diff --git a/dkplayer-sample/src/main/res/layout/activity_list_fragment_view_pager.xml b/dkplayer-sample/src/main/res/layout/activity_list_fragment_view_pager.xml index 4cd63bed..649382fc 100644 --- a/dkplayer-sample/src/main/res/layout/activity_list_fragment_view_pager.xml +++ b/dkplayer-sample/src/main/res/layout/activity_list_fragment_view_pager.xml @@ -6,14 +6,14 @@ android:orientation="vertical" android:fitsSystemWindows="true"> - - diff --git a/dkplayer-sample/src/main/res/layout/activity_recycler_view.xml b/dkplayer-sample/src/main/res/layout/activity_recycler_view.xml index ca539eeb..6886294f 100644 --- a/dkplayer-sample/src/main/res/layout/activity_recycler_view.xml +++ b/dkplayer-sample/src/main/res/layout/activity_recycler_view.xml @@ -2,7 +2,7 @@ - diff --git a/dkplayer-sample/src/main/res/layout/activity_tiktok.xml b/dkplayer-sample/src/main/res/layout/activity_tiktok.xml index f07a009d..86db50f9 100644 --- a/dkplayer-sample/src/main/res/layout/activity_tiktok.xml +++ b/dkplayer-sample/src/main/res/layout/activity_tiktok.xml @@ -2,7 +2,7 @@ - diff --git a/gradle.properties b/gradle.properties index 66167c5d..7fc76e28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,3 +15,5 @@ KEY_PWD=123456 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" KEYSTORE_PWD=123456 KEY_ALIAS=devlin +android.useAndroidX=true +android.enableJetifier=true