微调banner布局

整理代码

mobile/src/main/java/androidx/recyclerview/widget/FastScrollLinearLayoutManager.java

@@ -4,10 +4,6 @@ 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/androidx/recyclerview/widget/GridLayoutManagerPlus.java

@@ -5,9 +5,6 @@ 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/cn/garymb/ygomobile/App.java

@@ -23,8 +23,8 @@ import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.home.MainActivity;
 import cn.garymb.ygomobile.utils.CrashHandler;
-import cn.garymb.ygomobile.utils.glide.GlideCompat;
 import cn.garymb.ygomobile.utils.ProcessUtils;
+import cn.garymb.ygomobile.utils.glide.GlideCompat;
 
 public class App extends GameApplication {
 

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

 package cn.garymb.ygomobile;
 
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.Point;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.WindowManager;
-
-import androidx.annotation.Nullable;
-
-import org.json.JSONArray;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import cn.garymb.ygomobile.core.IrrlichtBridge;
-import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.ui.preference.PreferenceFragmentPlus;
-import cn.garymb.ygomobile.utils.DeckUtil;
-import cn.garymb.ygomobile.utils.DensityUtils;
-import cn.garymb.ygomobile.utils.IOUtils;
-
 import static cn.garymb.ygomobile.Constants.CORE_DECK_PATH;
 import static cn.garymb.ygomobile.Constants.CORE_EXPANSIONS;
 import static cn.garymb.ygomobile.Constants.CORE_PACK_PATH;
@@ -49,6 +25,30 @@ import static cn.garymb.ygomobile.Constants.WINDBOT_DECK_PATH;
 import static cn.garymb.ygomobile.Constants.WINDBOT_PATH;
 import static cn.garymb.ygomobile.Constants.YDK_FILE_EX;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Point;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.WindowManager;
+
+import androidx.annotation.Nullable;
+
+import org.json.JSONArray;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+import cn.garymb.ygomobile.core.IrrlichtBridge;
+import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.ui.preference.PreferenceFragmentPlus;
+import cn.garymb.ygomobile.utils.DeckUtil;
+import cn.garymb.ygomobile.utils.DensityUtils;
+import cn.garymb.ygomobile.utils.IOUtils;
+
 public class AppsSettings {
     private static final String TAG = "AppsSettings";
     private static final String PREF_VERSION = "app_version";

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

@@ -21,7 +21,6 @@ import cn.garymb.ygomobile.utils.CardSort;
 import ocgcore.CardManager;
 import ocgcore.DataManager;
 import ocgcore.LimitManager;
-import ocgcore.StringManager;
 import ocgcore.data.Card;
 import ocgcore.data.LimitList;
 import ocgcore.enums.LimitType;

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

@@ -2,8 +2,6 @@ package cn.garymb.ygomobile.loader;
 
 import android.text.TextUtils;
 
-import java.util.List;
-
 import ocgcore.data.Card;
 import ocgcore.enums.CardOt;
 import ocgcore.enums.CardType;

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

@@ -5,7 +5,6 @@ import android.util.SparseArray;
 import java.util.List;
 
 import ocgcore.data.Card;
-import ocgcore.data.LimitList;
 
 public interface ICardLoader {
     List<Card> sort(List<Card> cards);

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

@@ -9,7 +9,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.bumptech.glide.RequestBuilder;
-import com.bumptech.glide.load.engine.bitmap_recycle.LruBitmapPool;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.bumptech.glide.signature.MediaStoreSignature;
 

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

@@ -7,24 +7,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Looper;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.util.Log;
-import android.view.Display;
 import android.view.MenuItem;
-import android.view.Surface;
-import android.view.SurfaceControl;
-import android.view.SurfaceHolder;
 import android.view.View;
-import android.view.WindowManager;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
@@ -33,11 +24,7 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
-import java.io.IOException;
-import java.util.List;
-
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.utils.FileLogUtil;
 import ocgcore.data.Card;
 
 

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

@@ -11,7 +11,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -34,7 +33,6 @@ import cn.garymb.ygomobile.bean.ServerInfo;
 import cn.garymb.ygomobile.bean.ServerList;
 import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.ui.home.HomeActivity;
 import cn.garymb.ygomobile.ui.home.ServerListManager;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
 import cn.garymb.ygomobile.ui.preference.SettingsActivity;

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

@@ -4,14 +4,12 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
-import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,15 +22,9 @@ import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.CardLoader;
 import cn.garymb.ygomobile.loader.DeckLoader;
 import cn.garymb.ygomobile.loader.ImageLoader;
-import cn.garymb.ygomobile.ui.cards.deck.DeckAdapater;
-import cn.garymb.ygomobile.ui.cards.deck.DeckItem;
-import cn.garymb.ygomobile.ui.cards.deck.ImageTop;
 import cn.garymb.ygomobile.utils.YGOUtil;
 import ocgcore.DataManager;
-import ocgcore.LimitManager;
-import ocgcore.data.Card;
 import ocgcore.data.LimitList;
-import ocgcore.enums.LimitType;
 
 public class DeckListAdapter<T extends TextSelect> extends BaseQuickAdapter<T, DeckViewHolder> {
     private ImageLoader imageLoader;

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

 package cn.garymb.ygomobile.ui.cards;
 
+import static cn.garymb.ygomobile.core.IrrlichtBridge.ACTION_SHARE_FILE;
+
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Handler;
@@ -42,8 +44,6 @@ import ocgcore.StringManager;
 import ocgcore.data.Card;
 import ocgcore.enums.CardType;
 
-import static cn.garymb.ygomobile.core.IrrlichtBridge.ACTION_SHARE_FILE;
-
 /***
  * 卡片详情
  */

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

 package cn.garymb.ygomobile.ui.cards;
 
+import static android.view.View.inflate;
+
 import android.content.Context;
 import android.view.Gravity;
 import android.view.View;
@@ -15,9 +17,6 @@ import ocgcore.StringManager;
 import ocgcore.data.Card;
 import ocgcore.enums.CardType;
 
-import static android.view.View.inflate;
-import static android.view.View.resolveSize;
-
 public class CardDetailRandom {
     private View viewCardDetail;
     private ImageView cardImage;

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

@@ -5,7 +5,6 @@ import android.util.Log;
 import android.util.SparseArray;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 

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

 package cn.garymb.ygomobile.ui.cards;
 
-import android.graphics.Color;
-import android.graphics.DashPathEffect;
-import android.graphics.Paint;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
@@ -24,10 +20,6 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.FastScrollLinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.app.hubert.guide.NewbieGuide;
-import com.app.hubert.guide.model.GuidePage;
-import com.app.hubert.guide.model.HighLight;
-import com.app.hubert.guide.model.HighlightOptions;
 import com.ourygo.assistant.util.DuelAssistantManagement;
 
 import java.util.List;

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

@@ -76,7 +76,6 @@ import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.CardLoader;
 import cn.garymb.ygomobile.loader.ImageLoader;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
-import cn.garymb.ygomobile.ui.activities.PermissionsActivity;
 import cn.garymb.ygomobile.ui.activities.WebActivity;
 import cn.garymb.ygomobile.ui.adapters.CardListAdapter;
 import cn.garymb.ygomobile.ui.adapters.SimpleSpinnerAdapter;

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

 package cn.garymb.ygomobile.ui.cards.deck;
 
+import static androidx.recyclerview.widget.ItemTouchHelperPlus.ACTION_STATE_DRAG;
+import static androidx.recyclerview.widget.ItemTouchHelperPlus.ACTION_STATE_IDLE;
+
 import android.util.Log;
 
 import androidx.recyclerview.widget.GridLayoutManager;
@@ -12,9 +15,6 @@ import java.util.List;
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.lite.R;
 
-import static androidx.recyclerview.widget.ItemTouchHelperPlus.ACTION_STATE_DRAG;
-import static androidx.recyclerview.widget.ItemTouchHelperPlus.ACTION_STATE_IDLE;
-
 public class DeckItemTouchHelper extends ItemTouchHelperPlus.Callback2 {
     private DeckDrager mDeckDrager;
     private static final String TAG = "drag";

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

 package cn.garymb.ygomobile.ui.cards.deck;
 
+import static cn.garymb.ygomobile.Constants.ASSET_LIMIT_PNG;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 
 import cn.garymb.ygomobile.utils.BitmapUtil;
 
-import static cn.garymb.ygomobile.Constants.ASSET_LIMIT_PNG;
-
 public class ImageTop {
     public final Bitmap forbidden;
     public final Bitmap limit;

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

@@ -21,7 +21,6 @@ import java.io.File;
 
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
-import cn.garymb.ygomobile.utils.FileUtils;
 import cn.garymb.ygomobile.utils.IOUtils;
 
 

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

@@ -5,15 +5,12 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.Gravity;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.navigation.ui.AppBarConfiguration;
 
 import com.ashokvarma.bottomnavigation.BottomNavigationBar;
 import com.ashokvarma.bottomnavigation.BottomNavigationItem;

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

@@ -24,7 +24,6 @@ import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
-import cn.garymb.ygomobile.utils.FileUtils;
 import cn.garymb.ygomobile.utils.IOUtils;
 import ocgcore.DataManager;
 import ocgcore.data.Card;

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

 package cn.garymb.ygomobile.ui.home;
 
+import static cn.garymb.ygomobile.Constants.ASSETS_PATH;
+import static cn.garymb.ygomobile.Constants.BOT_CONF;
+import static cn.garymb.ygomobile.Constants.CORE_BOT_CONF_PATH;
+import static cn.garymb.ygomobile.Constants.CORE_LIMIT_PATH;
+import static cn.garymb.ygomobile.Constants.CORE_STRING_PATH;
+import static cn.garymb.ygomobile.Constants.CORE_SYSTEM_PATH;
+import static cn.garymb.ygomobile.Constants.DATABASE_NAME;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -14,7 +22,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.List;
@@ -30,14 +37,6 @@ import libwindbot.windbot.WindBot;
 import ocgcore.CardManager;
 import ocgcore.DataManager;
 
-import static cn.garymb.ygomobile.Constants.ASSETS_PATH;
-import static cn.garymb.ygomobile.Constants.BOT_CONF;
-import static cn.garymb.ygomobile.Constants.CORE_BOT_CONF_PATH;
-import static cn.garymb.ygomobile.Constants.CORE_LIMIT_PATH;
-import static cn.garymb.ygomobile.Constants.CORE_STRING_PATH;
-import static cn.garymb.ygomobile.Constants.CORE_SYSTEM_PATH;
-import static cn.garymb.ygomobile.Constants.DATABASE_NAME;
-
 public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
     public static final int ERROR_NONE = 0;
     public static final int ERROR_CORE_CONFIG = -1;

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

 package cn.garymb.ygomobile.ui.home;
 
+import static cn.garymb.ygomobile.Constants.ASSET_SERVER_LIST;
+
 import android.content.Context;
 import android.text.TextUtils;
 import android.widget.Toast;
@@ -25,8 +27,6 @@ import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.SystemUtils;
 import cn.garymb.ygomobile.utils.XmlUtils;
 
-import static cn.garymb.ygomobile.Constants.ASSET_SERVER_LIST;
-
 public class ServerListManager {
     private ServerListAdapter mAdapter;
     private Context mContext;

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

@@ -3,7 +3,6 @@ package cn.garymb.ygomobile.ui.mycard.mcchat;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;

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

@@ -25,7 +25,6 @@ import java.util.List;
 import cn.garymb.ygomobile.ui.mycard.mcchat.ChatListener;
 import cn.garymb.ygomobile.ui.mycard.mcchat.ChatMessage;
 import cn.garymb.ygomobile.ui.mycard.mcchat.util.TaxiConnectionListener;
-import cn.garymb.ygomobile.utils.FileLogUtil;
 
 public class ServiceManagement {
     public static final String GROUP_ADDRESS = "ygopro_china_north@conference.mycard.moe";

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

 package cn.garymb.ygomobile.ui.plus;
 
 
+import static android.view.WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -14,7 +16,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.FrameLayout;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -22,8 +23,6 @@ import androidx.annotation.Nullable;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.widget.WebViewPlus;
 
-import static android.view.WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW;
-
 public class DialogPlus extends Dialog {
     public static final int TYPE_KEYGUARD = FIRST_SYSTEM_WINDOW + 4;
     private Context context;

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

 package cn.garymb.ygomobile.ui.preference;
 
+import static cn.garymb.ygomobile.Constants.REQUEST_CHOOSE_FILE;
+import static cn.garymb.ygomobile.Constants.REQUEST_CHOOSE_FOLDER;
+import static cn.garymb.ygomobile.Constants.REQUEST_CHOOSE_IMG;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -27,10 +31,6 @@ import cn.garymb.ygomobile.ui.file.FileActivity;
 import cn.garymb.ygomobile.ui.file.FileOpenType;
 import cn.garymb.ygomobile.utils.FileUtils;
 
-import static cn.garymb.ygomobile.Constants.REQUEST_CHOOSE_FILE;
-import static cn.garymb.ygomobile.Constants.REQUEST_CHOOSE_FOLDER;
-import static cn.garymb.ygomobile.Constants.REQUEST_CHOOSE_IMG;
-
 public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
     private Preference curPreference;
     private CurImageInfo mCurImageInfo;

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/SettingFragment.java

 package cn.garymb.ygomobile.ui.preference.fragments;
 
+import static cn.garymb.ygomobile.Constants.ACTION_RELOAD;
+import static cn.garymb.ygomobile.Constants.CORE_SKIN_AVATAR_SIZE;
+import static cn.garymb.ygomobile.Constants.CORE_SKIN_BG_SIZE;
+import static cn.garymb.ygomobile.Constants.CORE_SKIN_CARD_COVER_SIZE;
+import static cn.garymb.ygomobile.Constants.PERF_TEST_REPLACE_KERNEL;
+import static cn.garymb.ygomobile.Constants.PREF_CHANGE_LOG;
+import static cn.garymb.ygomobile.Constants.PREF_CHECK_UPDATE;
+import static cn.garymb.ygomobile.Constants.PREF_DECK_DELETE_DILAOG;
+import static cn.garymb.ygomobile.Constants.PREF_DEL_EX;
+import static cn.garymb.ygomobile.Constants.PREF_FONT_ANTIALIAS;
+import static cn.garymb.ygomobile.Constants.PREF_FONT_SIZE;
+import static cn.garymb.ygomobile.Constants.PREF_GAME_FONT;
+import static cn.garymb.ygomobile.Constants.PREF_GAME_PATH;
+import static cn.garymb.ygomobile.Constants.PREF_IMAGE_QUALITY;
+import static cn.garymb.ygomobile.Constants.PREF_IMMERSIVE_MODE;
+import static cn.garymb.ygomobile.Constants.PREF_KEEP_SCALE;
+import static cn.garymb.ygomobile.Constants.PREF_LOCK_SCREEN;
+import static cn.garymb.ygomobile.Constants.PREF_ONLY_GAME;
+import static cn.garymb.ygomobile.Constants.PREF_OPENGL_VERSION;
+import static cn.garymb.ygomobile.Constants.PREF_PENDULUM_SCALE;
+import static cn.garymb.ygomobile.Constants.PREF_READ_EX;
+import static cn.garymb.ygomobile.Constants.PREF_SENSOR_REFRESH;
+import static cn.garymb.ygomobile.Constants.PREF_START_SERVICEDUELASSISTANT;
+import static cn.garymb.ygomobile.Constants.PREF_USE_EXTRA_CARD_CARDS;
+import static cn.garymb.ygomobile.Constants.PREF_WINDOW_TOP_BOTTOM;
+import static cn.garymb.ygomobile.Constants.SETTINGS_AVATAR;
+import static cn.garymb.ygomobile.Constants.SETTINGS_CARD_BG;
+import static cn.garymb.ygomobile.Constants.SETTINGS_COVER;
+import static cn.garymb.ygomobile.ui.home.ResCheckTask.getDatapath;
+
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -28,7 +54,6 @@ import android.widget.Toast;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.signature.MediaStoreSignature;
-import com.ourygo.assistant.service.DuelAssistantService;
 import com.tencent.bugly.beta.Beta;
 
 import java.io.DataOutputStream;
@@ -49,41 +74,11 @@ import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
 import cn.garymb.ygomobile.ui.preference.PreferenceFragmentPlus;
 import cn.garymb.ygomobile.utils.FileUtils;
-import cn.garymb.ygomobile.utils.glide.GlideCompat;
 import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.SystemUtils;
+import cn.garymb.ygomobile.utils.glide.GlideCompat;
 import ocgcore.DataManager;
 
-import static cn.garymb.ygomobile.Constants.ACTION_RELOAD;
-import static cn.garymb.ygomobile.Constants.CORE_SKIN_AVATAR_SIZE;
-import static cn.garymb.ygomobile.Constants.CORE_SKIN_BG_SIZE;
-import static cn.garymb.ygomobile.Constants.CORE_SKIN_CARD_COVER_SIZE;
-import static cn.garymb.ygomobile.Constants.PERF_TEST_REPLACE_KERNEL;
-import static cn.garymb.ygomobile.Constants.PREF_CHANGE_LOG;
-import static cn.garymb.ygomobile.Constants.PREF_CHECK_UPDATE;
-import static cn.garymb.ygomobile.Constants.PREF_DECK_DELETE_DILAOG;
-import static cn.garymb.ygomobile.Constants.PREF_DEL_EX;
-import static cn.garymb.ygomobile.Constants.PREF_FONT_ANTIALIAS;
-import static cn.garymb.ygomobile.Constants.PREF_FONT_SIZE;
-import static cn.garymb.ygomobile.Constants.PREF_GAME_FONT;
-import static cn.garymb.ygomobile.Constants.PREF_GAME_PATH;
-import static cn.garymb.ygomobile.Constants.PREF_IMAGE_QUALITY;
-import static cn.garymb.ygomobile.Constants.PREF_IMMERSIVE_MODE;
-import static cn.garymb.ygomobile.Constants.PREF_KEEP_SCALE;
-import static cn.garymb.ygomobile.Constants.PREF_LOCK_SCREEN;
-import static cn.garymb.ygomobile.Constants.PREF_ONLY_GAME;
-import static cn.garymb.ygomobile.Constants.PREF_OPENGL_VERSION;
-import static cn.garymb.ygomobile.Constants.PREF_PENDULUM_SCALE;
-import static cn.garymb.ygomobile.Constants.PREF_READ_EX;
-import static cn.garymb.ygomobile.Constants.PREF_SENSOR_REFRESH;
-import static cn.garymb.ygomobile.Constants.PREF_START_SERVICEDUELASSISTANT;
-import static cn.garymb.ygomobile.Constants.PREF_USE_EXTRA_CARD_CARDS;
-import static cn.garymb.ygomobile.Constants.PREF_WINDOW_TOP_BOTTOM;
-import static cn.garymb.ygomobile.Constants.SETTINGS_AVATAR;
-import static cn.garymb.ygomobile.Constants.SETTINGS_CARD_BG;
-import static cn.garymb.ygomobile.Constants.SETTINGS_COVER;
-import static cn.garymb.ygomobile.ui.home.ResCheckTask.getDatapath;
-
 public class SettingFragment extends PreferenceFragmentPlus {
 
     private static final int COPY_SO_OK = 0;

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

@@ -3,8 +3,6 @@ package cn.garymb.ygomobile.ui.widget;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import java.net.CookieManager;
-
 import cn.garymb.ygomobile.ui.mycard.X5WebView;
 
 

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

@@ -4,17 +4,13 @@ import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
-import java.io.Console;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;

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

@@ -2,8 +2,6 @@ package cn.garymb.ygomobile.utils;
 
 import android.text.TextUtils;
 
-import com.google.gson.Gson;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

mobile/src/main/java/cn/garymb/ygomobile/utils/glide/BpgResourceDecoder.java

 package cn.garymb.ygomobile.utils.glide;
 
 import android.graphics.Bitmap;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

mobile/src/main/java/com/ourygo/assistant/util/DuelAssistantManagement.java

@@ -4,7 +4,6 @@ package com.ourygo.assistant.util;
 import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.ourygo.assistant.base.listener.OnClipChangedListener;
 import com.ourygo.assistant.base.listener.OnDuelAssistantListener;

mobile/src/main/java/com/ourygo/assistant/util/Record.java

 package com.ourygo.assistant.util;
 
-import cn.garymb.ygomobile.Constants;
-
 public class Record {
 
     //卡查关键字

mobile/src/main/java/ocgcore/DataManager.java

 package ocgcore;
 
-import java.io.File;
-
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.loader.CardLoader;
 

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

@@ -3,7 +3,6 @@ package ocgcore;
 
 import android.util.Log;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.io.BufferedReader;

mobile/src/main/java/ocgcore/StringManager.java

@@ -3,9 +3,6 @@ package ocgcore;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
-import android.widget.Toast;
-
-import androidx.core.content.res.TypedArrayUtils;
 
 import java.io.BufferedReader;
 import java.io.Closeable;
@@ -16,7 +13,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.zip.ZipEntry;

mobile/src/main/java/ocgcore/data/CardData.java

@@ -5,8 +5,6 @@ import android.os.Parcelable;
 
 import androidx.annotation.NonNull;
 
-import cn.garymb.ygomobile.Constants;
-
 public class CardData implements Parcelable {
 
     public CardData() {

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

@@ -8,17 +8,17 @@
 
     <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/cv_banner"
+        android:layout_margin="10dp"
         android:layout_width="match_parent"
         android:layout_height="120dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp"
         android:clickable="true"
         android:foreground="?android:attr/selectableItemBackground"
         android:orientation="vertical"
-        app:cardBackgroundColor="#80000018"
+        app:cardBackgroundColor="@color/transparent"
+        app:cardCornerRadius="10dp"
+        app:elevation="0dp"
         app:cardElevation="0dp"
-        app:cardUseCompatPadding="false"
-        app:elevation="0dp">
+        app:cardUseCompatPadding="false">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -53,9 +53,10 @@
         android:orientation="horizontal">
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginRight="5dp"
+            android:weightSum="1"
             android:orientation="vertical">
 
             <FrameLayout
@@ -84,12 +85,12 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/bottombar"
+            android:id="@+id/rightbar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
-            android:orientation="horizontal"
-            android:weightSum="1">
+            android:layout_gravity="right"
+            android:orientation="horizontal">
 
             <LinearLayout
                 android:layout_width="wrap_content"

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

@@ -30,6 +30,10 @@
             android:background="@color/transparent"
             android:padding="2dp"
             android:textColor="@color/black"
+            android:shadowColor="@color/black"
+            android:shadowRadius="1"
+            android:shadowDx="2"
+            android:shadowDy="0"
             android:textSize="15sp" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -39,6 +43,10 @@
             android:layout_above="@id/ll_title"
             android:layout_marginBottom="5dp"
             android:textColor="@color/white"
+            android:shadowColor="@color/FallNavy"
+            android:shadowDx="2"
+            android:shadowDy="0"
+            android:shadowRadius="1"
             android:textSize="8sp" />
 
         <LinearLayout
@@ -58,6 +66,10 @@
                 android:gravity="bottom"
                 android:maxLines="2"
                 android:textColor="@color/white"
+                android:shadowColor="@color/FallNavy"
+                android:shadowRadius="1"
+                android:shadowDx="2"
+                android:shadowDy="0"
                 android:textSize="12sp"
                 android:textStyle="bold" />
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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/item_deck_list"
     android:layout_width="match_parent"

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="match_parent"
     android:paddingLeft="10dp"

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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="match_parent"
     android:id="@+id/mycard_fragment"

mobile/src/main/res/xml/file_paths.xml

 <?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
     <root-path name="root" path="." />
     <files-path name="files" path="." />
     <cache-path name="cache" path="." />