升级Android x

gradle.properties

@@ -15,4 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#android.useDeprecatedNdk=true
\ No newline at end of file
+#android.useDeprecatedNdk=true
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file

mobile/build.gradle

@@ -81,9 +81,9 @@ dependencies {
     implementation 'junit:junit:4.12'
     implementation project(':libcore')
     //support-annotations，support-vector-drawable
-    implementation 'com.android.support:appcompat-v7:' + rootProject.ext.supportVersion
-    implementation 'com.android.support:recyclerview-v7:' + rootProject.ext.supportVersion
-    implementation 'com.android.support:design:' + rootProject.ext.supportVersion
+//    implementation 'com.android.support:appcompat-v7:' + rootProject.ext.supportVersion
+//    implementation 'com.android.support:recyclerview-v7:' + rootProject.ext.supportVersion
+//    implementation 'com.android.support:design:' + rootProject.ext.supportVersion
 
     implementation 'org.jdeferred:jdeferred-android-aar:1.2.4'
     implementation 'com.github.bumptech.glide:glide:3.7.0'
@@ -106,4 +106,6 @@ dependencies {
     implementation "com.pgyersdk:sdk:3.0.5"
 
 
+    //dialog库
+    implementation 'com.github.feihuaduo:DialogUtils:1.8.9'
 }

mobile/src/main/java/android/support/v7/widget/helper/ItemTouchHelperPlus.java

-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.support.v7.widget.helper;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v7.widget.RecyclerView;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.View;
-
-@SuppressWarnings("RestrictedApi")
-public class ItemTouchHelperPlus extends ItemTouchHelper {
-    private boolean enableClickDrag;
-    private Context mContext;
-    private Callback mCallback2;
-    private OnItemDragListener mItemDragListener;
-
-    public ItemTouchHelperPlus(Context context, ItemTouchHelperPlus.Callback callback) {
-        super(callback);
-        mContext = context;
-        mCallback2 = callback;
-        mCallback2.setItemTouchHelper(this);
-    }
-
-    public void setItemDragListener(OnItemDragListener itemDragListener) {
-        mItemDragListener = itemDragListener;
-    }
-
-    public void setEnableClickDrag(boolean enableClickDrag) {
-        this.enableClickDrag = enableClickDrag;
-    }
-
-    public boolean isEnableClickDrag() {
-        return enableClickDrag;
-    }
-
-    @Override
-    public void attachToRecyclerView(@Nullable RecyclerView recyclerView) {
-        super.attachToRecyclerView(recyclerView);
-        mGestureDetector = new GestureDetectorCompat(mRecyclerView.getContext(),
-                new ItemTouchHelperGestureListener());
-    }
-
-    public Context getContext() {
-        return mContext;
-    }
-
-    private int mActionState;
-    private float mSelectedStartX, mSelectedStartY;
-    private RecyclerView.ViewHolder mSelected;
-
-    private int getActionState(){
-        return mActionState;
-    }
-
-    public float getSelectedStartX() {
-        return mSelectedStartX;
-    }
-
-    public float getSelectedStartY() {
-        return mSelectedStartY;
-    }
-
-    @Override
-    void select(@Nullable RecyclerView.ViewHolder selected, int actionState) {
-        super.select(selected, actionState);
-        if (selected != this.mSelected || actionState != mActionState) {
-            mActionState = actionState;
-            if (selected != null) {
-                mSelectedStartX = (float)selected.itemView.getLeft();
-                mSelectedStartY = (float)selected.itemView.getTop();
-                mSelected = selected;
-            }
-        }
-    }
-
-    @Override
-    void moveIfNecessary(RecyclerView.ViewHolder viewHolder) {
-        super.moveIfNecessary(viewHolder);
-        if (mRecyclerView.isLayoutRequested()) {
-            return;
-        }
-        if (getActionState() != ACTION_STATE_DRAG) {
-            return;
-        }
-
-        final float threshold = mCallback.getMoveThreshold(viewHolder);
-        final int x = (int) (getSelectedStartX() + mDx);
-        final int y = (int) (getSelectedStartY() + mDy);
-        if (Math.abs(y - viewHolder.itemView.getTop()) < viewHolder.itemView.getHeight() * threshold
-                && Math.abs(x - viewHolder.itemView.getLeft())
-                < viewHolder.itemView.getWidth() * threshold) {
-            return;
-        }
-        mCallback2.cancelLongPress();
-    }
-
-    //region callback
-    public abstract static class Callback extends ItemTouchHelper.Callback {
-        private Handler mHandler;
-        private ItemTouchHelperPlus mItemTouchHelper;
-        private long mLongTime = 1000;
-        private boolean mLongPressMode;
-        private int mSelectId;
-        private volatile long longPressTime = 0;
-        private boolean isLongPressCancel = false;
-        private int mDx = 2;
-        private int mDy = 2;
-
-        public void setLongTime(long longTime) {
-            mLongTime = longTime;
-        }
-
-        public void setItemTouchHelper(ItemTouchHelperPlus itemTouchHelper) {
-            mItemTouchHelper = itemTouchHelper;
-            mHandler = new Handler(itemTouchHelper.getContext().getMainLooper());
-        }
-
-        public void setDragSize(int dx, int dy) {
-            mDx = dx;
-            mDy = dy;
-        }
-
-        OnItemDragListener getOnDragListener() {
-            if(mItemTouchHelper == null)return null;
-            return mItemTouchHelper.mItemDragListener;
-        }
-
-        public int getSelectId() {
-            return mSelectId;
-        }
-
-        public boolean isLongPressMode() {
-            return mLongPressMode;
-        }
-
-        @Override
-        public void onChildDrawOver(Canvas c, RecyclerView recyclerView,
-                                    RecyclerView.ViewHolder viewHolder,
-                                    float dX, float dY, int actionState, boolean isCurrentlyActive) {
-            super.onChildDrawOver(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
-            if (isCurrentlyActive && actionState == ItemTouchHelper.ACTION_STATE_DRAG) {
-                if (dX > mDx || dY > mDy) {
-                    if (!isLongPressMode() && !isLongPressCancel) {
-                        isLongPressCancel = true;
-                        endLongPressMode();
-                    }
-                }
-            }
-        }
-
-        @Override
-        public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
-            super.onSelectedChanged(viewHolder, actionState);
-            if (viewHolder != null && actionState == ItemTouchHelper.ACTION_STATE_DRAG) {
-                if (getOnDragListener() != null) {
-                    getOnDragListener().onDragStart();
-                }
-                isLongPressCancel = false;
-                mSelectId = viewHolder.getAdapterPosition();
-                longPressTime = System.currentTimeMillis();
-                mHandler.removeCallbacks(enterLongPress);
-                if (mItemTouchHelper.isEnableClickDrag()) {
-                    mHandler.postDelayed(enterLongPress, mLongTime);
-                }
-            } else if (actionState == ItemTouchHelper.ACTION_STATE_IDLE) {
-                endLongPressMode();
-                if (getOnDragListener() != null) {
-                    getOnDragListener().onDragEnd();
-                }
-            } else if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
-                endLongPressMode();
-            }
-        }
-
-        private Runnable enterLongPress = new Runnable() {
-            @Override
-            public void run() {
-                if (System.currentTimeMillis() - longPressTime >= mLongTime) {
-                    mLongPressMode = true;
-                    if (!isLongPressCancel) {
-                        if (getOnDragListener() != null && mSelectId >= 0) {
-                            getOnDragListener().onDragLongPress(mSelectId);
-                        }
-                    }
-                }
-            }
-        };
-
-        public void cancelLongPress() {
-            if (!isLongPressMode() && !isLongPressCancel) {
-                isLongPressCancel = true;
-                endLongPressMode();
-            }
-        }
-
-        public void endLongPressMode() {
-            longPressTime = System.currentTimeMillis();
-            mHandler.removeCallbacks(enterLongPress);
-            if (mLongPressMode) {
-                if (getOnDragListener() != null) {
-                    getOnDragListener().onDragLongPressEnd();
-                }
-            }
-            mLongPressMode = false;
-        }
-    }
-    //endregion
-
-    private class ItemTouchHelperGestureListener extends GestureDetector.SimpleOnGestureListener {
-
-        ItemTouchHelperGestureListener() {
-        }
-
-        @Override
-        public void onShowPress(MotionEvent e) {
-            if (isEnableClickDrag()) {
-                startDrag(e);
-            }
-        }
-
-        @Override
-        public boolean onDown(MotionEvent e) {
-            return true;
-        }
-
-        @Override
-        public void onLongPress(MotionEvent e) {
-            if (!isEnableClickDrag()) {
-                startDrag(e);
-            }
-        }
-
-        private void startDrag(MotionEvent e) {
-            View child = findChildView(e);
-            if (child != null) {
-                RecyclerView.ViewHolder vh = mRecyclerView.getChildViewHolder(child);
-                if (vh != null) {
-                    if (!mCallback.hasDragFlag(mRecyclerView, vh)) {
-                        return;
-                    }
-                    int pointerId = e.getPointerId(0);
-                    // Long press is deferred.
-                    // Check w/ active pointer id to avoid selecting after motion
-                    // event is canceled.
-                    if (pointerId == mActivePointerId) {
-                        final int index = e.findPointerIndex(mActivePointerId);
-                        final float x = e.getX(index);
-                        final float y = e.getY(index);
-                        mInitialTouchX = x;
-                        mInitialTouchY = y;
-                        mDx = mDy = 0f;
-                        if (mCallback.isLongPressDragEnabled()) {
-                            select(vh, ACTION_STATE_DRAG);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

mobile/src/main/java/android/support/v7/widget/FastScrollLinearLayoutManager.java → mobile/src/main/java/androidx/recyclerview/widget/FastScrollLinearLayoutManager.java

-package android.support.v7.widget;
+package androidx.recyclerview.widget;
 
 import android.content.Context;
 import android.graphics.PointF;
 import android.util.DisplayMetrics;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class FastScrollLinearLayoutManager extends LinearLayoutManager {
     public FastScrollLinearLayoutManager(Context context) {
         super(context);

mobile/src/main/java/android/support/v7/widget/GridLayoutManagerPlus.java → mobile/src/main/java/androidx/recyclerview/widget/GridLayoutManagerPlus.java

-package android.support.v7.widget;
+package androidx.recyclerview.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.lang.reflect.Field;
 
 public class GridLayoutManagerPlus extends GridLayoutManager {

mobile/src/main/java/android/support/v7/widget/helper/OnItemDragListener.java → mobile/src/main/java/androidx/recyclerview/widget/OnItemDragListener.java

-package android.support.v7.widget.helper;
+package androidx.recyclerview.widget;
 
 public interface OnItemDragListener {
     void onDragStart();

mobile/src/main/java/android/support/v7/widget/RecyclerViewItemListener.java → mobile/src/main/java/androidx/recyclerview/widget/RecyclerViewItemListener.java

-package android.support.v7.widget;
+package androidx.appcompat.widget;
+
 
-import android.support.v4.view.GestureDetectorCompat;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.core.view.GestureDetectorCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class RecyclerViewItemListener extends RecyclerView.SimpleOnItemTouchListener {
     private GestureDetectorCompat gestureDetector;
 

mobile/src/main/java/cn/garymb/ygomobile/App.java

 package cn.garymb.ygomobile;
 
 
+
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.app.AppCompatDelegate;
+
+import androidx.appcompat.app.AppCompatDelegate;
 
 import cn.garymb.ygomobile.utils.CrashHandler;
 

mobile/src/main/java/cn/garymb/ygomobile/YGOStarter.java

@@ -8,13 +8,15 @@ import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Toast;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.ViewTarget;

mobile/src/main/java/cn/garymb/ygomobile/loader/CardLoader.java

@@ -2,11 +2,13 @@ package cn.garymb.ygomobile.loader;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 
+import androidx.annotation.NonNull;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/AboutActivity.java

 package cn.garymb.ygomobile.ui.activities;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.preference.fragments.AboutFragment;

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java

@@ -9,16 +9,18 @@ import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import java.io.IOException;
 
 import cn.garymb.ygomobile.lite.R;

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/DebugActivity.java

 package cn.garymb.ygomobile.ui.activities;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
 
 import cn.garymb.ygomobile.lite.R;
 

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/FileLogActivity.java

@@ -2,11 +2,12 @@ package cn.garymb.ygomobile.ui.activities;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+
 import java.io.IOException;
 
 import cn.garymb.ygomobile.lite.R;

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/PermissionsActivity.java

@@ -9,12 +9,13 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import java.io.IOException;
 import java.util.ArrayList;

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/PhotoViewActivity.java

@@ -3,9 +3,10 @@ package cn.garymb.ygomobile.ui.activities;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 
+import androidx.appcompat.widget.Toolbar;
+
 import java.io.IOException;
 
 import cn.garymb.ygomobile.lite.R;

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/WebActivity.java

@@ -3,10 +3,11 @@ package cn.garymb.ygomobile.ui.activities;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.widget.WebViewPlus;
 

mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/BaseRecyclerAdapterPlus.java

 package cn.garymb.ygomobile.ui.adapters;
 
 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.Collection;
 import java.util.List;

mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/DebugListRecyclerAdapter.java

 package cn.garymb.ygomobile.ui.adapters;
 
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class DebugListRecyclerAdapter extends RecyclerView.Adapter<DebugListRecyclerAdapter.ViewHolder> {
 
     @NonNull

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/BaseCardsAcitivity.java

 package cn.garymb.ygomobile.ui.cards;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.widget.FastScrollLinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerViewItemListener;
+
+import androidx.annotation.Nullable;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.recyclerview.widget.FastScrollLinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.RecyclerViewItemListener;
 import android.view.Gravity;
 import android.view.View;
 import android.view.animation.Animation;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchActivityImpl.java

 package cn.garymb.ygomobile.ui.cards;
 
-import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.FastScrollLinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerViewItemListener;
-import android.support.v7.widget.Toolbar;
+
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.RecyclerViewItemListener;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.recyclerview.widget.FastScrollLinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.bumptech.glide.Glide;
 
 import java.io.IOException;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivity3.java

@@ -3,9 +3,11 @@ package cn.garymb.ygomobile.ui.cards;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.widget.helper.OnItemDragListener;
+
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.OnItemDragListener;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Toast;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java

@@ -8,12 +8,13 @@ import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatSpinner;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerViewItemListener;
-import android.support.v7.widget.helper.ItemTouchHelperPlus;
-import android.support.v7.widget.helper.OnItemDragListener;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatSpinner;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.RecyclerViewItemListener;
+import androidx.recyclerview.widget.ItemTouchHelperPlus;
+import androidx.recyclerview.widget.OnItemDragListener;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.Log;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl2.java

@@ -5,15 +5,8 @@ import android.content.ClipboardManager;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
+
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.AppCompatSpinner;
-import android.support.v7.widget.FastScrollLinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerViewItemListener;
-import android.support.v7.widget.Toolbar;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.view.Gravity;
@@ -27,6 +20,15 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.AppCompatSpinner;
+import androidx.appcompat.widget.RecyclerViewItemListener;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.recyclerview.widget.FastScrollLinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.bumptech.glide.Glide;
 
 import org.greenrobot.eventbus.EventBus;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckAdapater.java

 package cn.garymb.ygomobile.ui.cards.deck;
 
+
 import android.content.Context;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
+
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -32,7 +31,6 @@ import ocgcore.data.LimitList;
 import ocgcore.enums.CardType;
 import ocgcore.enums.LimitType;
 
-
 public class DeckAdapater extends RecyclerView.Adapter<DeckViewHolder> implements CardListProvider {
     private final List<DeckItem> mItems = new ArrayList<>();
     private SparseArray<Integer> mCount = new SparseArray<>();

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckAdapater2.java

 package cn.garymb.ygomobile.ui.cards.deck;
 
 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 cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.bean.DeckInfo;
 import cn.garymb.ygomobile.lite.R;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckItemTouchHelper.java

 package cn.garymb.ygomobile.ui.cards.deck;
 
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.support.v7.widget.helper.ItemTouchHelperPlus;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.ItemTouchHelperPlus;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.util.Log;
 
 import java.util.List;
@@ -11,10 +12,10 @@ import java.util.List;
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.lite.R;
 
-import static android.support.v7.widget.helper.ItemTouchHelper.ACTION_STATE_DRAG;
-import static android.support.v7.widget.helper.ItemTouchHelper.ACTION_STATE_IDLE;
+import static androidx.recyclerview.widget.ItemTouchHelperPlus.ACTION_STATE_DRAG;
+import static androidx.recyclerview.widget.ItemTouchHelperPlus.ACTION_STATE_IDLE;
 
-public class DeckItemTouchHelper extends ItemTouchHelperPlus.Callback {
+public class DeckItemTouchHelper extends ItemTouchHelperPlus.Callback2 {
     private DeckDrager mDeckDrager;
     private static final String TAG = "drag";
     private static final boolean DEBUG = false;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckLayoutManager.java

 package cn.garymb.ygomobile.ui.cards.deck;
 
+
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class DeckLayoutManager extends GridLayoutManager {
     private Context context;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckLayoutManager2.java

 package cn.garymb.ygomobile.ui.cards.deck;
 
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
+
+import androidx.recyclerview.widget.GridLayoutManager;
 
 public class DeckLayoutManager2 extends GridLayoutManager {
 

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckViewHolder.java

 package cn.garymb.ygomobile.ui.cards.deck;
 
+
 import android.graphics.Bitmap;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.ImageLoader;
 

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/DeckAdapter.java

 package cn.garymb.ygomobile.ui.cards.deck2;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelperPlus;
-import android.support.v7.widget.helper.OnItemDragListener;
+import androidx.recyclerview.widget.ItemTouchHelperPlus;
+import androidx.recyclerview.widget.OnItemDragListener;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/DeckHelperCallback.java

 package cn.garymb.ygomobile.ui.cards.deck2;
 
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.support.v7.widget.helper.ItemTouchHelperPlus;
 
-class DeckHelperCallback extends ItemTouchHelperPlus.Callback {
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.ItemTouchHelperPlus;
+import androidx.recyclerview.widget.RecyclerView;
+
+class DeckHelperCallback extends ItemTouchHelperPlus.Callback2 {
     private IDeckLayout mDeckAdapter;
 
     DeckHelperCallback(IDeckLayout deckAdapter) {

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/DeckItemDecoration.java

 package cn.garymb.ygomobile.ui.cards.deck2;
 
+
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 class DeckItemDecoration extends RecyclerView.ItemDecoration {
     private IDeckLayout mDeckLayout;
 

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/DeckLayoutManager.java

 package cn.garymb.ygomobile.ui.cards.deck2;
 
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManagerPlus;
+
+import androidx.recyclerview.widget.GridLayoutManagerPlus;
+
 
 class DeckLayoutManager extends GridLayoutManagerPlus {
     DeckLayoutManager(Context context, final int span, final IDeckLayout deckAdapter) {

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/DeckViewHolder.java

 package cn.garymb.ygomobile.ui.cards.deck2;
 
 import android.graphics.Bitmap;
-import android.support.v7.widget.GridLayoutManagerPlus;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.GridLayoutManagerPlus;
+
 import cn.garymb.ygomobile.lite.R;
 import ocgcore.data.Card;
 

mobile/src/main/java/cn/garymb/ygomobile/ui/file/FileActivity.java

@@ -6,8 +6,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.AdapterView;
@@ -16,6 +14,9 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+
 import java.io.File;
 
 import cn.garymb.ygomobile.lite.R;

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

@@ -6,13 +6,8 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
-import android.os.Build;
+
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.NavigationView;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.util.SparseArray;
 import android.view.Gravity;
@@ -28,7 +23,13 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.base.bj.paysdk.utils.TrPay;
+import com.google.android.material.navigation.NavigationView;
 import com.nightonke.boommenu.BoomButtons.BoomButton;
 import com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton;
 import com.nightonke.boommenu.BoomMenuButton;

mobile/src/main/java/cn/garymb/ygomobile/ui/home/MainActivity.java

@@ -9,11 +9,12 @@ import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
+
 import java.io.IOException;
 
 import cn.garymb.ygomobile.AppsSettings;

mobile/src/main/java/cn/garymb/ygomobile/ui/home/ServerListManager.java

 package cn.garymb.ygomobile.ui.home;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/MyCardActivity.java

@@ -7,10 +7,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.NavigationView;
-import android.support.v4.widget.DrawerLayout;
+
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.MenuItem;
@@ -21,7 +18,12 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import com.bumptech.glide.Glide;
+import com.google.android.material.navigation.NavigationView;
 import com.tencent.smtt.sdk.ValueCallback;
 import com.tencent.smtt.sdk.WebChromeClient;
 import com.tencent.smtt.sdk.WebSettings;

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/McchatActivity.java

@@ -2,8 +2,7 @@ package cn.garymb.ygomobile.ui.mycard.mcchat;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
@@ -11,6 +10,9 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.jivesoftware.smack.packet.Message;
 
 import cn.garymb.ygomobile.lite.R;

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/adapter/ChatAdapter.java

@@ -2,7 +2,6 @@ package cn.garymb.ygomobile.ui.mycard.mcchat.adapter;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -12,6 +11,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 import cn.garymb.ygomobile.lite.R;

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/view/YuanImage.java

@@ -13,11 +13,13 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.NinePatchDrawable;
 import android.util.AttributeSet;
 
+import androidx.appcompat.widget.AppCompatImageView;
+
 
 /*
  * 圆形ImageView
  */
-public class YuanImage extends android.support.v7.widget.AppCompatImageView {
+public class YuanImage extends AppCompatImageView {
 
     private Context mContext;
     // 控件默认长、宽

mobile/src/main/java/cn/garymb/ygomobile/ui/plus/DialogPlus.java

@@ -5,7 +5,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Color;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.GestureDetector;
 import android.view.Gravity;
@@ -18,6 +17,8 @@ import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.widget.WebViewPlus;
 

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/SettingsActivity.java

 package cn.garymb.ygomobile.ui.preference;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/AlwaysMarqueeTextView.java

 package cn.garymb.ygomobile.ui.widget;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
+import androidx.appcompat.widget.AppCompatTextView;
+
 public class AlwaysMarqueeTextView extends AppCompatTextView {
     public AlwaysMarqueeTextView(Context context) {
         this(context, null);

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/CardGroupView.java

@@ -2,14 +2,15 @@ package cn.garymb.ygomobile.ui.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.List;
 
 import cn.garymb.ygomobile.lite.R;

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/CardView.java

 package cn.garymb.ygomobile.ui.widget;
 
 import android.content.Context;
+
 import android.os.Build;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.ImageLoader;
 import cn.garymb.ygomobile.ui.cards.deck.ImageTop;

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/DeckGroupView.java

 package cn.garymb.ygomobile.ui.widget;
 
 import android.content.Context;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.View;
@@ -11,6 +8,10 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/DeckLabel.java

@@ -2,11 +2,12 @@ package cn.garymb.ygomobile.ui.widget;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+
 import cn.garymb.ygomobile.lite.R;
 
 @SuppressLint("AppCompatCustomView")

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/DeckView.java

 package cn.garymb.ygomobile.ui.widget;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 
+import androidx.annotation.Nullable;
+
 import cn.garymb.ygomobile.bean.DeckInfo;
 import cn.garymb.ygomobile.ui.cards.deck.ImageTop;
 import cn.garymb.ygomobile.ui.cards.deck.LabelInfo;

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/SearchableSpinner.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.DialogInterface;
 import android.content.res.TypedArray;
-import android.support.v7.widget.AppCompatSpinner;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
@@ -14,6 +13,8 @@ import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.SpinnerAdapter;
 
+import androidx.appcompat.widget.AppCompatSpinner;
+
 import java.util.ArrayList;
 import java.util.List;
 

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/ShimmerTextView.java

 package cn.garymb.ygomobile.ui.widget;
 
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;
-import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
+import androidx.appcompat.widget.AppCompatTextView;
+
 public class ShimmerTextView extends AppCompatTextView implements ShimmerViewBase {
 
     private ShimmerViewHelper shimmerViewHelper;

mobile/src/main/java/cn/garymb/ygomobile/utils/ComponentUtils.java

@@ -4,7 +4,8 @@ import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+
+import androidx.annotation.RequiresApi;
 
 import java.util.List;
 

mobile/src/main/java/cn/garymb/ygomobile/utils/PermissionUtil.java

@@ -7,7 +7,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.v4.app.NotificationManagerCompat;
+
+import androidx.core.app.NotificationManagerCompat;
 
 import cn.garymb.ygomobile.App;
 import cn.garymb.ygomobile.lite.R;

mobile/src/main/java/cn/garymb/ygomobile/utils/ScreenUtil.java

@@ -4,11 +4,12 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
 import android.util.Log;
 import android.view.DisplayCutout;
 import android.view.View;
 
+import androidx.annotation.RequiresApi;
+
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

mobile/src/main/java/ocgcore/CardManager.java

@@ -2,10 +2,11 @@ package ocgcore;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.WorkerThread;
 import android.util.Log;
 import android.util.SparseArray;
 
+import androidx.annotation.WorkerThread;
+
 import com.file.zip.ZipEntry;
 import com.file.zip.ZipFile;
 

mobile/src/main/java/ocgcore/LimitManager.java

 package ocgcore;
 
-import android.support.annotation.NonNull;
+
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.File;
@@ -45,7 +47,8 @@ public class LimitManager implements Closeable {
         return mLimitNames;
     }
 
-    public @NonNull LimitList getLimit(String name) {
+    public @NonNull
+    LimitList getLimit(String name) {
         return mLimitLists.get(name);
     }
 

mobile/src/main/res/layout/activity_deck_cards.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/grid_cards"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
@@ -42,7 +42,7 @@
                     android:text="@string/deck_name"
                     android:textColor="@color/holo_blue_light" />
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/toolbar_list"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/item_height"
@@ -155,7 +155,7 @@
                     android:text="@string/label_limitlist"
                     android:textColor="@color/holo_blue_light" />
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_limit_list"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/item_height" />
@@ -182,6 +182,6 @@
                 android:id="@+id/nav_view_list"
                 layout="@layout/nav_card_search" />
         </LinearLayout>
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

mobile/src/main/res/layout/activity_deck_cards2.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -104,7 +104,7 @@
                     android:layout_marginRight="30dp"
                     android:layout_marginBottom="4dp">
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_limit_list"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
@@ -132,6 +132,6 @@
                 android:id="@+id/nav_view_list"
                 layout="@layout/nav_card_search" />
         </LinearLayout>
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

mobile/src/main/res/layout/activity_deck_cards3.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -25,7 +25,7 @@
                     android:layout_height="?attr/actionBarSize"
                     android:layout_marginBottom="5dp" />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerview"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
@@ -75,7 +75,7 @@
                     android:layout_marginRight="30dp"
                     android:layout_marginBottom="4dp">
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_limit_list"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
@@ -103,6 +103,6 @@
                 android:id="@+id/nav_view_list"
                 layout="@layout/nav_card_search" />
         </LinearLayout>
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

mobile/src/main/res/layout/activity_filebrowser.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -79,4 +79,4 @@
             android:padding="5dp"
             android:scrollbars="none" />
     </LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

mobile/src/main/res/layout/activity_online_mycard.xml

 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -30,7 +30,7 @@
 
     </RelativeLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_main"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -42,4 +42,4 @@
         app:menu="@menu/nav_mycard_menu" />
 
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file

mobile/src/main/res/layout/activity_photo.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -16,4 +16,4 @@
             android:layout_height="match_parent" />
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

mobile/src/main/res/layout/activity_search.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg3">
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -40,5 +40,5 @@
                 android:id="@+id/nav_view_list"
                 layout="@layout/nav_card_search" />
         </LinearLayout>
-    </android.support.v4.widget.DrawerLayout>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+    </androidx.drawerlayout.widget.DrawerLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

mobile/src/main/res/layout/activity_settings.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/bg3">
@@ -17,4 +17,4 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

mobile/src/main/res/layout/activity_webbrowser.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -16,4 +16,4 @@
             android:layout_height="match_parent" />
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

mobile/src/main/res/layout/content_toolbar.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bar"
     android:theme="@style/AppTheme.AppBarOverlay">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         app:popupTheme="@style/AppTheme.PopupOverlay"
         app:theme="@style/AppTheme.AppBarOverlay" />
-</android.support.design.widget.AppBarLayout>
\ No newline at end of file
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file

mobile/src/main/res/layout/content_toolbar_list.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bar"
     android:theme="@style/AppTheme.AppBarOverlay">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         app:popupTheme="@style/AppTheme.PopupOverlay"
         app:theme="@style/AppTheme.AppBarOverlay">
 
-    </android.support.v7.widget.Toolbar>
-</android.support.design.widget.AppBarLayout>
\ No newline at end of file
+    </androidx.appcompat.widget.Toolbar>
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file

mobile/src/main/res/layout/debug_activity.xml

@@ -6,7 +6,8 @@
 
     <include layout="@layout/content_toolbar" />
 
-    <android.support.v7.widget.RecyclerView
+
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

mobile/src/main/res/layout/deck_select_layout.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_type"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_deck"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

mobile/src/main/res/layout/dialog_deck.xml

@@ -12,7 +12,8 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         android:textColor="@color/blackLinght" />
 
-    <android.support.v7.widget.AppCompatSpinner
+
+    <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/sp_limit_list"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height" />
@@ -25,7 +26,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         android:textColor="@color/blackLinght" />
 
-    <android.support.v7.widget.AppCompatSpinner
+    <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/sp_ydk_list"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height" />

mobile/src/main/res/layout/dialog_room_name.xml

@@ -5,7 +5,7 @@
     android:orientation="vertical">
 
 
-    <android.support.v7.widget.AppCompatEditText
+    <androidx.appcompat.widget.AppCompatEditText
         android:id="@+id/room_name"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"

mobile/src/main/res/layout/file_log_activity.xml

@@ -6,7 +6,7 @@
 
     <include layout="@layout/content_toolbar" />
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -19,7 +19,7 @@
             android:textSize="18sp"
             android:textStyle="bold" />
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 
 </LinearLayout>
\ No newline at end of file

mobile/src/main/res/layout/main.xml

@@ -22,7 +22,7 @@
 
     </RelativeLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/main_rec"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

mobile/src/main/res/layout/nav_card_search.xml

@@ -17,7 +17,7 @@
         android:layout_marginTop="6dp"
         android:orientation="vertical">
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="18dp" />
@@ -27,13 +27,13 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="18dp"
                 android:layout_weight="1">
 
-                <android.support.v7.widget.AppCompatEditText
+                <androidx.appcompat.widget.AppCompatEditText
                     android:id="@+id/edt_word1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -44,9 +44,9 @@
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textColorHint="@color/gold" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.v7.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_search"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -60,13 +60,13 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="18dp"
                 android:layout_weight="1">
 
-                <android.support.v7.widget.AppCompatEditText
+                <androidx.appcompat.widget.AppCompatEditText
                     android:id="@+id/edt_word2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -76,9 +76,9 @@
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textColorHint="@color/gold" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.v7.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_reset"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -97,14 +97,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_ot"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/label_width_small"
                     android:layout_weight="1" />
 
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_scale"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/label_width_small"
@@ -117,13 +117,13 @@
                 android:layout_height="@dimen/label_width_small"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_limit_list"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1" />
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_limit"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
@@ -136,7 +136,7 @@
                 android:layout_height="@dimen/label_width_small"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_category"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
@@ -165,20 +165,20 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_type_card"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/label_width_small"
                     android:layout_weight="1" />
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_race"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/label_width_small"
                     android:layout_weight="1"
                     android:visibility="gone" />
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     android:id="@+id/sp_type_st"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/label_width_small"
@@ -197,13 +197,13 @@
                     android:layout_height="@dimen/label_width_small"
                     android:orientation="horizontal">
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_level"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1" />
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_attribute"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
@@ -215,13 +215,13 @@
                     android:layout_height="@dimen/label_width_small"
                     android:orientation="horizontal">
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_type_monster"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1" />
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_type_monster2"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
@@ -235,12 +235,12 @@
                     android:layout_marginLeft="10dp"
                     android:orientation="horizontal">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1">
 
-                        <android.support.v7.widget.AppCompatEditText
+                        <androidx.appcompat.widget.AppCompatEditText
                             android:id="@+id/edt_atk"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -248,14 +248,14 @@
                             android:maxLines="1"
                             android:singleLine="true"
                             tools:text="100" />
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1">
 
-                        <android.support.v7.widget.AppCompatEditText
+                        <androidx.appcompat.widget.AppCompatEditText
                             android:id="@+id/edt_def"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -263,7 +263,7 @@
                             android:maxLines="1"
                             android:singleLine="true"
                             tools:text="100" />
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>