适配 androidX

2019-07-30 21:26:19 +08:00
parent 43915ad204
commit ac43c9b93b
107 changed files with 234 additions and 285 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -53,7 +53,7 @@
    <service android:name=".core.download.service_download.DownloadService"/>

    <provider
-        android:name="android.support.v4.content.FileProvider"
+        android:name="androidx.core.content.FileProvider"
        android:authorities="${applicationId}.provider"
        android:exported="false"
        android:grantUriPermissions="true">
--- a/app/src/main/java/com/arialyy/simple/MainActivity.java
+++ b/app/src/main/java/com/arialyy/simple/MainActivity.java
@@ -17,18 +17,18 @@
 package com.arialyy.simple;

 import android.Manifest;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.frame.permission.OnPermissionCallback;
 import com.arialyy.frame.permission.PermissionManager;
 import com.arialyy.frame.util.show.T;
@@ -36,15 +36,15 @@ import com.arialyy.simple.base.BaseActivity;
 import com.arialyy.simple.base.adapter.AbsHolder;
 import com.arialyy.simple.base.adapter.AbsRVAdapter;
 import com.arialyy.simple.base.adapter.RvItemClickSupport;
-import com.arialyy.simple.core.download.m3u8.M3U8LiveDLoadActivity;
-import com.arialyy.simple.core.download.m3u8.M3U8VodDLoadActivity;
-import com.arialyy.simple.databinding.ActivityMainBinding;
 import com.arialyy.simple.core.download.DownloadActivity;
 import com.arialyy.simple.core.download.FtpDownloadActivity;
 import com.arialyy.simple.core.download.group.DownloadGroupActivity;
 import com.arialyy.simple.core.download.group.FTPDirDownloadActivity;
+import com.arialyy.simple.core.download.m3u8.M3U8LiveDLoadActivity;
+import com.arialyy.simple.core.download.m3u8.M3U8VodDLoadActivity;
 import com.arialyy.simple.core.upload.FtpUploadActivity;
 import com.arialyy.simple.core.upload.HttpUploadActivity;
+import com.arialyy.simple.databinding.ActivityMainBinding;
 import com.arialyy.simple.modlue.CommonModule;
 import com.arialyy.simple.to.NormalTo;
 import java.util.ArrayList;
--- a/app/src/main/java/com/arialyy/simple/base/BaseActivity.java
+++ b/app/src/main/java/com/arialyy/simple/base/BaseActivity.java
@@ -16,10 +16,10 @@

 package com.arialyy.simple.base;

-import android.databinding.ViewDataBinding;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
+import androidx.appcompat.widget.Toolbar;
+import androidx.databinding.ViewDataBinding;
 import com.arialyy.frame.core.AbsActivity;
 import com.arialyy.frame.util.AndroidVersionUtil;
 import com.arialyy.simple.R;
--- a/app/src/main/java/com/arialyy/simple/base/BaseDialog.java
+++ b/app/src/main/java/com/arialyy/simple/base/BaseDialog.java
@@ -16,7 +16,7 @@

 package com.arialyy.simple.base;

-import android.databinding.ViewDataBinding;
+import androidx.databinding.ViewDataBinding;
 import android.os.Bundle;
 import com.arialyy.frame.core.AbsDialogFragment;

--- a/app/src/main/java/com/arialyy/simple/base/adapter/AbsHolder.java
+++ b/app/src/main/java/com/arialyy/simple/base/adapter/AbsHolder.java
@@ -15,33 +15,31 @@
 */
 package com.arialyy.simple.base.adapter;

-import android.support.annotation.IdRes;
-import android.support.v7.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.View;
-
+import androidx.annotation.IdRes;
+import androidx.recyclerview.widget.RecyclerView;

 /**
 * Created by lyy on 2015/12/3.
 * 通用Holder
 */
 public class AbsHolder extends RecyclerView.ViewHolder {
-    private View mView;
-    private SparseArray<View> mViews = new SparseArray<>();
+  private View mView;
+  private SparseArray<View> mViews = new SparseArray<>();

-    public AbsHolder(View itemView) {
-        super(itemView);
-        mView = itemView;
+  public AbsHolder(View itemView) {
+    super(itemView);
+    mView = itemView;
+  }
+
+  @SuppressWarnings("unchecked")
+  public <T extends View> T findViewById(@IdRes int id) {
+    View view = mViews.get(id);
+    if (view == null) {
+      view = mView.findViewById(id);
+      mViews.put(id, view);
    }
-
-    @SuppressWarnings("unchecked")
-    public <T extends View> T findViewById(@IdRes int id) {
-        View view = mViews.get(id);
-        if (view == null) {
-            view = mView.findViewById(id);
-            mViews.put(id, view);
-        }
-        return (T) view;
-    }
-
+    return (T) view;
+  }
 }
--- a/app/src/main/java/com/arialyy/simple/base/adapter/AbsRVAdapter.java
+++ b/app/src/main/java/com/arialyy/simple/base/adapter/AbsRVAdapter.java
@@ -16,11 +16,10 @@
 package com.arialyy.simple.base.adapter;

 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
+import androidx.recyclerview.widget.RecyclerView;
 import java.util.ArrayList;
 import java.util.List;

--- a/app/src/main/java/com/arialyy/simple/base/adapter/RvItemClickSupport.java
+++ b/app/src/main/java/com/arialyy/simple/base/adapter/RvItemClickSupport.java
@@ -15,10 +15,10 @@
 */
 package com.arialyy.simple.base.adapter;

-import android.support.v7.widget.RecyclerView;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.simple.R;

 /*
--- a/app/src/main/java/com/arialyy/simple/common/DialogModule.java
+++ b/app/src/main/java/com/arialyy/simple/common/DialogModule.java
@@ -16,9 +16,9 @@

 package com.arialyy.simple.common;

-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
 import android.text.TextUtils;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import com.arialyy.aria.util.ALog;
 import com.arialyy.frame.base.BaseViewModule;
 import java.io.File;
--- a/app/src/main/java/com/arialyy/simple/common/DirChooseDialog.java
+++ b/app/src/main/java/com/arialyy/simple/common/DirChooseDialog.java
@@ -17,31 +17,27 @@ package com.arialyy.simple.common;

 import android.annotation.SuppressLint;
 import android.app.Dialog;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.widget.TextView;
-import com.arialyy.aria.util.ALog;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseDialog;
 import com.arialyy.simple.base.adapter.AbsHolder;
 import com.arialyy.simple.base.adapter.AbsRVAdapter;
 import com.arialyy.simple.base.adapter.RvItemClickSupport;
 import com.arialyy.simple.databinding.DialogChooseDirBinding;
-import com.arialyy.simple.databinding.DialogMsgBinding;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/com/arialyy/simple/core/download/DownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/DownloadActivity.java
@@ -16,24 +16,24 @@

 package com.arialyy.simple.core.download;

-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.simple.MainActivity;
 import com.arialyy.simple.R;
 import com.arialyy.simple.base.BaseActivity;
 import com.arialyy.simple.base.adapter.AbsHolder;
 import com.arialyy.simple.base.adapter.AbsRVAdapter;
 import com.arialyy.simple.base.adapter.RvItemClickSupport;
-import com.arialyy.simple.databinding.ActivityDownloadMeanBinding;
 import com.arialyy.simple.core.download.multi_download.MultiTaskActivity;
+import com.arialyy.simple.databinding.ActivityDownloadMeanBinding;
 import com.arialyy.simple.modlue.CommonModule;
 import com.arialyy.simple.to.NormalTo;
 import java.util.ArrayList;
--- a/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadActivity.java
@@ -15,12 +15,12 @@
 */
 package com.arialyy.simple.core.download;

-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.controller.ControllerType;
--- a/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/FtpDownloadModule.java
@@ -16,12 +16,12 @@

 package com.arialyy.simple.core.download;

-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Environment;
 import android.text.TextUtils;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.util.ALog;
--- a/app/src/main/java/com/arialyy/simple/core/download/HighestPriorityActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/HighestPriorityActivity.java
@@ -16,13 +16,13 @@
 package com.arialyy.simple.core.download;

 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
--- a/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/HttpDownloadModule.java
@@ -16,11 +16,11 @@

 package com.arialyy.simple.core.download;

-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
 import android.content.Context;
 import android.os.Environment;
 import android.text.TextUtils;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.util.ALog;
@@ -47,8 +47,9 @@ public class HttpDownloadModule extends BaseViewModule {
   * 单任务下载的信息
   */
  LiveData<DownloadEntity> getHttpDownloadInfo(Context context) {
-    //String url = AppUtil.getConfigValue(context, HTTP_URL_KEY, defUrl);
-    String url = "http://sdkdown.muzhiwan.com/openfile/2019/05/21/com.netease.tom.mzw_5ce3ef8754d05.apk";
+    String url = AppUtil.getConfigValue(context, HTTP_URL_KEY, defUrl);
+    //String url =
+    //    "http://sdkdown.muzhiwan.com/openfile/2019/05/21/com.netease.tom.mzw_5ce3ef8754d05.apk";
    String filePath = AppUtil.getConfigValue(context, HTTP_PATH_KEY, defFilePath);

    singDownloadInfo = Aria.download(context).getFirstDownloadEntity(url);
@@ -59,7 +60,7 @@ public class HttpDownloadModule extends BaseViewModule {
      singDownloadInfo.setFilePath(filePath);
      singDownloadInfo.setFileName(file.getName());
    } else {
-      AppUtil.setConfigValue(context, HTTP_PATH_KEY, singDownloadInfo.getDownloadPath());
+      AppUtil.setConfigValue(context, HTTP_PATH_KEY, singDownloadInfo.getFilePath());
      AppUtil.setConfigValue(context, HTTP_URL_KEY, singDownloadInfo.getUrl());
    }
    liveData.postValue(singDownloadInfo);
--- a/app/src/main/java/com/arialyy/simple/core/download/KotlinDownloadActivity.kt
+++ b/app/src/main/java/com/arialyy/simple/core/download/KotlinDownloadActivity.kt
@@ -16,8 +16,6 @@

 package com.arialyy.simple.core.download

-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -27,6 +25,8 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import com.arialyy.annotations.Download
 import com.arialyy.aria.core.Aria
 import com.arialyy.aria.core.download.DownloadEntity
@@ -37,6 +37,7 @@ import com.arialyy.aria.util.ALog
 import com.arialyy.aria.util.CommonUtil
 import com.arialyy.frame.util.show.T
 import com.arialyy.simple.R
+import com.arialyy.simple.R.string
 import com.arialyy.simple.base.BaseActivity
 import com.arialyy.simple.common.ModifyPathDialog
 import com.arialyy.simple.common.ModifyUrlDialog
@@ -96,11 +97,11 @@ class KotlinDownloadActivity : BaseActivity<ActivitySingleKotlinBinding>() {
            return@Observer
          }
          if (entity.state == IEntity.STATE_STOP) {
-            binding.stateStr = getString(R.string.resume)
+            binding.stateStr = getString(string.resume)
          }

          if (Aria.download(this).load(entity.id).isRunning) {
-            binding.stateStr = getString(R.string.stop)
+            binding.stateStr = getString(string.stop)
          }

          if (entity.fileSize != 0L) {
--- a/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/SingleTaskActivity.java
@@ -16,22 +16,21 @@

 package com.arialyy.simple.core.download;

-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Toast;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.common.RequestEnum;
 import com.arialyy.aria.core.common.controller.ControllerType;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.DownloadTask;
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveDLoadActivity.java
@@ -16,15 +16,15 @@

 package com.arialyy.simple.core.download.m3u8;

-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.controller.ControllerType;
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8LiveModule.java
@@ -16,11 +16,11 @@

 package com.arialyy.simple.core.download.m3u8;

-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
 import android.content.Context;
 import android.os.Environment;
 import android.text.TextUtils;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.util.ALog;
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodDLoadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodDLoadActivity.java
@@ -16,16 +16,16 @@

 package com.arialyy.simple.core.download.m3u8;

-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Download;
 import com.arialyy.annotations.M3U8;
 import com.arialyy.aria.core.Aria;
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/M3U8VodModule.java
@@ -16,11 +16,11 @@

 package com.arialyy.simple.core.download.m3u8;

-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
 import android.content.Context;
 import android.os.Environment;
 import android.text.TextUtils;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.util.ALog;
--- a/app/src/main/java/com/arialyy/simple/core/download/m3u8/VideoPlayerFragment.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/m3u8/VideoPlayerFragment.java
@@ -1,17 +1,17 @@
 package com.arialyy.simple.core.download.m3u8;

 import android.annotation.SuppressLint;
-import android.arch.lifecycle.ViewModelProviders;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.util.SparseArray;
 import android.view.SurfaceHolder;
 import android.view.View;
 import android.widget.SeekBar;
+import androidx.annotation.RequiresApi;
+import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.aria.core.download.m3u8.M3U8Entity;
 import com.arialyy.aria.util.ALog;
--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiDownloadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiDownloadActivity.java
@@ -17,11 +17,11 @@
 package com.arialyy.simple.core.download.multi_download;

 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.annotations.Download;
 import com.arialyy.annotations.DownloadGroup;
 import com.arialyy.aria.core.Aria;
@@ -76,7 +76,7 @@ public class MultiDownloadActivity extends BaseActivity<ActivityMultiDownloadBin
    Log.d(TAG, task.getTaskName() + ", " + task.getState());
  }

-  @Download.onWait void onWait(DownloadTask task){
+  @Download.onWait void onWait(DownloadTask task) {
    mAdapter.updateState(task.getEntity());
  }

--- a/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiTaskActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/multi_download/MultiTaskActivity.java
@@ -18,11 +18,11 @@ package com.arialyy.simple.core.download.multi_download;

 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import com.arialyy.annotations.Download;
 import com.arialyy.annotations.DownloadGroup;
 import com.arialyy.aria.core.Aria;
--- a/app/src/main/java/com/arialyy/simple/core/download/service_download/DownloadNotification.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/service_download/DownloadNotification.java
@@ -18,7 +18,7 @@ package com.arialyy.simple.core.download.service_download;

 import android.app.NotificationManager;
 import android.content.Context;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import com.arialyy.simple.R;

 /**
--- a/app/src/main/java/com/arialyy/simple/core/download/service_download/DownloadService.java
+++ b/app/src/main/java/com/arialyy/simple/core/download/service_download/DownloadService.java
@@ -19,7 +19,7 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.Environment;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTask;
--- a/app/src/main/java/com/arialyy/simple/core/upload/FtpUploadActivity.java
+++ b/app/src/main/java/com/arialyy/simple/core/upload/FtpUploadActivity.java
@@ -15,14 +15,14 @@
 */
 package com.arialyy.simple.core.upload;

-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 import com.arialyy.annotations.Upload;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.common.controller.ControllerType;
--- a/app/src/main/java/com/arialyy/simple/core/upload/UploadModule.java
+++ b/app/src/main/java/com/arialyy/simple/core/upload/UploadModule.java
@@ -16,10 +16,10 @@

 package com.arialyy.simple.core.upload;

-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
 import android.content.Context;
 import android.os.Environment;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.upload.UploadEntity;
 import com.arialyy.frame.base.BaseViewModule;
--- a/app/src/main/java/com/arialyy/simple/modlue/CommonModule.java
+++ b/app/src/main/java/com/arialyy/simple/modlue/CommonModule.java
@@ -15,10 +15,10 @@
 */
 package com.arialyy.simple.modlue;

-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
 import android.content.Context;
 import android.content.Intent;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import com.arialyy.frame.base.BaseViewModule;
 import com.arialyy.simple.MainActivity;
 import com.arialyy.simple.R;
--- a/app/src/main/java/com/arialyy/simple/util/AppUtil.java
+++ b/app/src/main/java/com/arialyy/simple/util/AppUtil.java
@@ -22,7 +22,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 import android.text.TextUtils;
 import com.arialyy.aria.core.inf.AbsEntity;
 import com.arialyy.aria.util.ALog;
--- a/app/src/main/java/com/arialyy/simple/widget/SubStateLinearLayout.java
+++ b/app/src/main/java/com/arialyy/simple/widget/SubStateLinearLayout.java
@@ -16,13 +16,13 @@
 package com.arialyy.simple.widget;

 import android.content.Context;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import com.arialyy.aria.core.download.DownloadEntity;
 import com.arialyy.simple.R;
 import java.util.LinkedList;
--- a/app/src/main/java/com/arialyy/simple/widget/SvgTextView.java
+++ b/app/src/main/java/com/arialyy/simple/widget/SvgTextView.java
@@ -17,10 +17,7 @@ package com.arialyy.simple.widget;

 import android.content.Context;
 import android.content.res.TypedArray;
-import android.databinding.BindingAdapter;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.v7.widget.AppCompatImageView;
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -28,6 +25,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import androidx.annotation.DrawableRes;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.databinding.BindingAdapter;
 import com.arialyy.simple.R;

 public class SvgTextView extends RelativeLayout {
@@ -64,17 +64,15 @@ public class SvgTextView extends RelativeLayout {
    attributes.recycle();
  }

-  public void setIconClickListener(View.OnClickListener listener){
+  public void setIconClickListener(View.OnClickListener listener) {
    icon.setOnClickListener(listener);
  }

-
-  @BindingAdapter(value = {"svg_text_view_icon"})
+  @BindingAdapter(value = { "svg_text_view_icon" })
  public static void bindAttr(SvgTextView svgTextView, @DrawableRes int drawable) {
    svgTextView.icon.setImageResource(drawable);
  }

-
  public void setIcon(@DrawableRes int drawable) {
    icon.setImageResource(drawable);
  }
--- a/app/src/main/res/layout/activity_download_mean.xml
+++ b/app/src/main/res/layout/activity_download_mean.xml
@@ -11,7 +11,7 @@

    <include layout="@layout/layout_bar"/>

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_highest_priority.xml
+++ b/app/src/main/res/layout/activity_highest_priority.xml
@@ -42,7 +42,7 @@
        android:background="@android:color/darker_gray"
        />

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@

    <include layout="@layout/layout_bar"/>

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_multi.xml
+++ b/app/src/main/res/layout/activity_multi.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout
    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    >

  <RelativeLayout
@@ -11,7 +10,7 @@
      >
    <include layout="@layout/layout_bar"/>

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_multi_download.xml
+++ b/app/src/main/res/layout/activity_multi_download.xml
@@ -11,7 +11,7 @@

    <include layout="@layout/layout_bar"/>

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_test.xml
+++ b/app/src/main/res/layout/activity_test.xml
@@ -6,7 +6,7 @@
      android:orientation="vertical"
      >

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
--- a/app/src/main/res/layout/dialog_choose_dir.xml
+++ b/app/src/main/res/layout/dialog_choose_dir.xml
@@ -56,7 +56,7 @@
        android:textStyle="bold"
        />

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/list"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
--- a/app/src/main/res/layout/fragment_video_player.xml
+++ b/app/src/main/res/layout/fragment_video_player.xml
@@ -25,7 +25,7 @@
        android:paddingRight="8dp"
        >

-      <android.support.v7.widget.AppCompatImageView
+      <androidx.appcompat.widget.AppCompatImageView
          android:id="@+id/control_bt"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
--- a/app/src/main/res/layout/item_choose_dir.xml
+++ b/app/src/main/res/layout/item_choose_dir.xml
@@ -7,7 +7,7 @@
    android:orientation="vertical"
    >

-  <android.support.v7.widget.AppCompatImageView
+  <androidx.appcompat.widget.AppCompatImageView
      android:id="@+id/icon"
      android:layout_width="@dimen/icon_size"
      android:layout_height="@dimen/icon_size"
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
@@ -22,7 +22,7 @@
      android:layout_height="wrap_content"
      >

-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/image"
        android:layout_width="match_parent"
        android:layout_height="140dp"
@@ -36,6 +36,7 @@
        android:layout_height="wrap_content"
        android:layout_below="@+id/image"
        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="16dp"
        android:layout_marginTop="8dp"
        android:ellipsize="marquee"
        android:marqueeRepeatLimit="2"
@@ -44,9 +45,8 @@
        android:textColor="@color/text_black"
        android:textSize="@dimen/text_size_normal"
        android:textStyle="bold"
-        android:layout_marginBottom="16dp"
        />

  </RelativeLayout>

-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
--- a/app/src/main/res/layout/item_main.xml
+++ b/app/src/main/res/layout/item_main.xml
@@ -8,7 +8,7 @@
    android:orientation="vertical"
    >

-  <android.support.v7.widget.AppCompatImageView
+  <androidx.appcompat.widget.AppCompatImageView
      android:id="@+id/image"
      android:layout_width="@dimen/icon_size"
      android:layout_height="@dimen/icon_size"
@@ -36,10 +36,10 @@
        />

    <TextView
-        android:layout_marginTop="4dp"
        android:id="@+id/desc"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
        android:textColor="@color/text_black"
        android:textSize="@dimen/text_size_smallest"
        />
--- a/app/src/main/res/layout/layout_bar.xml
+++ b/app/src/main/res/layout/layout_bar.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/toolbar"
    android:layout_width="match_parent"
    android:layout_height="?attr/actionBarSize"
    android:background="?attr/colorPrimary"
    app:popupTheme="@style/AppTheme.PopupOverlay"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    />
--- a/app/src/main/res/layout/layout_code_demo.xml
+++ b/app/src/main/res/layout/layout_code_demo.xml
@@ -23,7 +23,7 @@
        android:textSize="@dimen/text_size_normal"
        android:textStyle="bold"
        />
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/full_screen"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
--- a/app/src/main/res/layout/layout_svg_text.xml
+++ b/app/src/main/res/layout/layout_svg_text.xml
@@ -16,7 +16,7 @@
      android:textSize="@dimen/text_size_normal"
      />

-  <android.support.v7.widget.AppCompatImageView
+  <androidx.appcompat.widget.AppCompatImageView
      android:id="@+id/image"
      android:layout_width="20dp"
      android:layout_height="20dp"