migrate sample to androidx

kolarbear · Oct 25, 2019 · 598f11f · 598f11f
1 parent e3214c8
commit 598f11f
Show file tree

Hide file tree

Showing 46 changed files with 143 additions and 132 deletions.
diff --git 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
@@ -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
@@ -3,15 +3,16 @@
 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;
 import android.view.ViewParent;
 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
@@ -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/...sample/src/main/java/com/dueeeke/dkplayer/activity/list/AutoPlayRecyclerViewActivity.java b/...sample/src/main/java/com/dueeeke/dkplayer/activity/list/AutoPlayRecyclerViewActivity.java
@@ -1,16 +1,16 @@
 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;
 import com.dueeeke.dkplayer.adapter.VideoRecyclerViewAdapter;
 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
@@ -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
@@ -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/...ample/src/main/java/com/dueeeke/dkplayer/activity/list/ListFragmentViewPagerActivity.java b/...ample/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
@@ -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/...r-sample/src/main/java/com/dueeeke/dkplayer/activity/list/RotateRecyclerViewActivity.java b/...r-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
@@ -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
@@ -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
@@ -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/...ample/src/main/java/com/dueeeke/dkplayer/activity/list/tiktok/ViewPagerLayoutManager.java b/...ample/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;