Clean code

app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java

@@ -52,7 +52,6 @@ import com.fongmi.android.tv.utils.FileChooser;
 import com.fongmi.android.tv.utils.KeyUtil;
 import com.fongmi.android.tv.utils.Notify;
 import com.fongmi.android.tv.utils.ResUtil;
-import com.fongmi.android.tv.utils.Utils;
 import com.github.catvod.utils.Util;
 import com.google.common.collect.Lists;
 

app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java

@@ -13,7 +13,7 @@ import com.fongmi.android.tv.server.Server;
 import com.fongmi.android.tv.ui.base.BaseActivity;
 import com.fongmi.android.tv.utils.QRCode;
 import com.fongmi.android.tv.utils.ResUtil;
-import com.fongmi.android.tv.utils.Utils;
+import com.fongmi.android.tv.utils.Util;
 
 public class PushActivity extends BaseActivity {
 
@@ -37,7 +37,7 @@ public class PushActivity extends BaseActivity {
     }
 
     private void onClip(View view) {
-        CharSequence text = Utils.getClipText();
+        CharSequence text = Util.getClipText();
         if (!TextUtils.isEmpty(text)) VideoActivity.push(this, text.toString(), false);
     }
 }

app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java

@@ -28,7 +28,7 @@ import com.fongmi.android.tv.ui.custom.CustomTextListener;
 import com.fongmi.android.tv.ui.custom.SpaceItemDecoration;
 import com.fongmi.android.tv.ui.custom.dialog.SiteDialog;
 import com.fongmi.android.tv.utils.KeyUtil;
-import com.fongmi.android.tv.utils.Utils;
+import com.fongmi.android.tv.utils.Util;
 import com.github.catvod.net.OkHttp;
 import com.google.common.net.HttpHeaders;
 
@@ -138,7 +138,7 @@ public class SearchActivity extends BaseActivity implements WordAdapter.OnClickL
     public void onSearch() {
         String keyword = mBinding.keyword.getText().toString().trim();
         mBinding.keyword.setSelection(mBinding.keyword.length());
-        Utils.hideKeyboard(mBinding.keyword);
+        Util.hideKeyboard(mBinding.keyword);
         if (TextUtils.isEmpty(keyword)) return;
         CollectActivity.start(this, keyword);
         App.post(() -> mRecordAdapter.add(keyword), 250);

app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java

@@ -36,10 +36,9 @@ import com.fongmi.android.tv.ui.custom.dialog.SiteDialog;
 import com.fongmi.android.tv.utils.FileUtil;
 import com.fongmi.android.tv.utils.Notify;
 import com.fongmi.android.tv.utils.ResUtil;
-import com.fongmi.android.tv.utils.Utils;
+import com.fongmi.android.tv.utils.Util;
 import com.github.catvod.bean.Doh;
 import com.github.catvod.net.OkHttp;
-import com.github.catvod.utils.Util;
 import com.permissionx.guolindev.PermissionX;
 
 import java.util.ArrayList;

app/src/leanback/java/com/fongmi/android/tv/ui/base/BaseActivity.java

@@ -19,7 +19,7 @@ import com.fongmi.android.tv.api.WallConfig;
 import com.fongmi.android.tv.event.RefreshEvent;
 import com.fongmi.android.tv.utils.FileUtil;
 import com.fongmi.android.tv.utils.ResUtil;
-import com.fongmi.android.tv.utils.Utils;
+import com.fongmi.android.tv.utils.Util;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -38,7 +38,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(getBinding().getRoot());
         EventBus.getDefault().register(this);
-        Utils.hideSystemUI(this);
+        Util.hideSystemUI(this);
         setWall();
         initView();
         initEvent();
@@ -105,13 +105,13 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        Utils.hideSystemUI(this);
+        Util.hideSystemUI(this);
     }
 
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
-        if (hasFocus) Utils.hideSystemUI(this);
+        if (hasFocus) Util.hideSystemUI(this);
     }
 
     @Override

app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java

@@ -15,7 +15,7 @@ import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.Constant;
 import com.fongmi.android.tv.utils.KeyUtil;
 import com.fongmi.android.tv.utils.ResUtil;
-import com.fongmi.android.tv.utils.Utils;
+import com.fongmi.android.tv.utils.Util;
 
 public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
 
@@ -90,7 +90,7 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener {
     public boolean onDown(@NonNull MotionEvent e) {
         if (!full) return false;
         volume = manager.getStreamVolume(AudioManager.STREAM_MUSIC);
-        bright = Utils.getBrightness(activity);
+        bright = Util.getBrightness(activity);
         changeBright = false;
         changeVolume = false;
         touch = true;

app/src/main/java/com/fongmi/android/tv/api/JarLoader.java

@@ -4,12 +4,11 @@ import android.content.Context;
 
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.utils.UrlUtil;
-import com.fongmi.android.tv.utils.Utils;
+import com.fongmi.android.tv.utils.Util;
 import com.github.catvod.crawler.Spider;
 import com.github.catvod.crawler.SpiderNull;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Path;
-import com.github.catvod.utils.Util;
 
 import org.json.JSONObject;
 

app/src/main/java/com/fongmi/android/tv/api/LiveParser.java

@@ -8,7 +8,6 @@ import com.fongmi.android.tv.bean.Drm;
 import com.fongmi.android.tv.bean.Group;
 import com.fongmi.android.tv.bean.Live;
 import com.fongmi.android.tv.utils.UrlUtil;
-import com.fongmi.android.tv.utils.Utils;
 import com.github.catvod.net.OkHttp;
 import com.github.catvod.utils.Path;
 

app/src/main/java/com/fongmi/android/tv/bean/Episode.java

@@ -4,9 +4,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.fongmi.android.tv.App;
-import com.fongmi.android.tv.utils.Utils;
+import com.fongmi.android.tv.utils.Util;
 import com.github.catvod.utils.Trans;
-import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
 public class Episode implements Parcelable {
@@ -35,7 +34,7 @@ public class Episode implements Parcelable {
     }
 
     public Episode(String name, String desc, String url) {
-        this.number = Utils.getDigit(name);
+        this.number = Util.getDigit(name);
         this.name = Trans.s2t(name);
         this.desc = Trans.s2t(desc);
         this.url = url;

app/src/main/java/com/fongmi/android/tv/bean/Flag.java

@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.player.extractor.Magnet;
 import com.fongmi.android.tv.utils.Sniffer;
-import com.fongmi.android.tv.utils.Utils;
+import com.fongmi.android.tv.utils.Util;
 import com.github.catvod.utils.Trans;
 import com.google.gson.annotations.SerializedName;
 
@@ -107,7 +107,7 @@ public class Flag implements Parcelable {
     }
 
     public Episode find(String remarks, boolean strict) {
-        int number = Utils.getDigit(remarks);
+        int number = Util.getDigit(remarks);
         if (getEpisodes().size() == 0) return null;
         if (getEpisodes().size() == 1) return getEpisodes().get(0);
         for (Episode item : getEpisodes()) if (item.rule1(remarks)) return item;

app/src/main/java/com/fongmi/android/tv/bean/Hot.java

@@ -2,7 +2,6 @@ package com.fongmi.android.tv.bean;
 
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.Setting;
-import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
 import java.util.ArrayList;

app/src/main/java/com/fongmi/android/tv/bean/Parse.java

@@ -8,9 +8,8 @@ import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.utils.ResUtil;
 import com.fongmi.android.tv.utils.UrlUtil;
-import com.fongmi.android.tv.utils.Utils;
+import com.fongmi.android.tv.utils.Util;
 import com.github.catvod.utils.Json;
-import com.github.catvod.utils.Util;
 import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 

app/src/main/java/com/fongmi/android/tv/bean/Part.java

@@ -3,7 +3,6 @@ package com.fongmi.android.tv.bean;
 import android.text.TextUtils;
 
 import com.fongmi.android.tv.App;
-import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 

app/src/main/java/com/fongmi/android/tv/bean/Site.java

@@ -13,7 +13,6 @@ import com.fongmi.android.tv.Constant;
 import com.fongmi.android.tv.db.AppDatabase;
 import com.fongmi.android.tv.gson.ExtAdapter;
 import com.github.catvod.utils.Json;
-import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/fongmi/android/tv/bean/Suggest.java

@@ -1,7 +1,6 @@
 package com.fongmi.android.tv.bean;
 
 import com.fongmi.android.tv.App;
-import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
 import java.util.ArrayList;

app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java

@@ -24,7 +24,6 @@ import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.Setting;
 import com.github.catvod.utils.Json;
-import com.github.catvod.utils.Util;
 import com.google.common.net.HttpHeaders;
 import com.google.gson.JsonParser;
 

app/src/main/java/com/fongmi/android/tv/utils/Util.java

@@ -12,7 +12,7 @@ import android.view.inputmethod.InputMethodManager;
 
 import com.fongmi.android.tv.App;
 
-public class Utils {
+public class Util {
 
     public static void toggleFullscreen(Activity activity, boolean fullscreen) {
         if (fullscreen) hideSystemUI(activity);