Clean code

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

@@ -39,7 +39,7 @@ public class ImgUtil {
 
     public static void load(String url, int error, CustomTarget<Drawable> target) {
         if (TextUtils.isEmpty(url)) target.onLoadFailed(ResUtil.getDrawable(error));
-        else Glide.with(App.get()).load(getUrl(url)).error(error).dontAnimate().into(target);
+        else Glide.with(App.get()).load(getUrl(url)).error(error).skipMemoryCache(true).dontAnimate().signature(new ObjectKey(url + "_" + Setting.getQuality())).into(target);
     }
 
     public static void load(String url, ImageView view, ImageView.ScaleType scaleType) {

app/src/main/res/values-zh-rCN/strings.xml

@@ -169,10 +169,4 @@
         <item>手动</item>
     </string-array>
 
-    <string-array name="select_background">
-        <item>关闭</item>
-        <item>开启</item>
-        <item>画中画</item>
-    </string-array>
-
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -169,10 +169,4 @@
         <item>手動</item>
     </string-array>
 
-    <string-array name="select_background">
-        <item>關閉</item>
-        <item>開啟</item>
-        <item>子母畫面</item>
-    </string-array>
-
 </resources>

app/src/main/res/values/strings.xml

@@ -174,10 +174,4 @@
         <item>Manual</item>
     </string-array>
 
-    <string-array name="select_background">
-        <item>Off</item>
-        <item>On</item>
-        <item>PiP</item>
-    </string-array>
-
 </resources>

app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java

@@ -27,8 +27,8 @@ public class PiP {
 
     private PictureInPictureParams.Builder builder;
 
-    private boolean noPiP() {
-        return Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !App.get().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) || !Setting.isBackgroundPiP();
+    public static boolean noPiP() {
+        return Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !App.get().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
     }
 
     @TargetApi(Build.VERSION_CODES.O)
@@ -73,7 +73,7 @@ public class PiP {
 
     public void enter(Activity activity, boolean four) {
         try {
-            if (noPiP() || activity.isInPictureInPictureMode()) return;
+            if (noPiP() || activity.isInPictureInPictureMode() || !Setting.isBackgroundPiP()) return;
             builder.setAspectRatio(new Rational(four ? 4 : 16, four ? 3 : 9));
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) builder.setAutoEnterEnabled(true);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) builder.setSeamlessResizeEnabled(true);

app/src/mobile/res/values-zh-rCN/strings.xml

@@ -35,4 +35,10 @@
     <string name="dialog_delete_keep">收藏纪录将会全部删除。</string>
     <string name="dialog_delete_history">观看纪录将会全部删除。</string>
 
+    <string-array name="select_background">
+        <item>关闭</item>
+        <item>开启</item>
+        <item>画中画</item>
+    </string-array>
+
 </resources>

app/src/mobile/res/values-zh-rTW/strings.xml

@@ -35,4 +35,10 @@
     <string name="dialog_delete_keep">收藏紀錄將會全部刪除。</string>
     <string name="dialog_delete_history">觀看紀錄將會全部刪除。</string>
 
+    <string-array name="select_background">
+        <item>關閉</item>
+        <item>開啟</item>
+        <item>子母畫面</item>
+    </string-array>
+
 </resources>

app/src/mobile/res/values/strings.xml

@@ -35,4 +35,10 @@
     <string name="dialog_delete_keep">All keep records will be removed.</string>
     <string name="dialog_delete_history">All history records will be removed.</string>
 
+    <string-array name="select_background">
+        <item>Off</item>
+        <item>On</item>
+        <item>PiP</item>
+    </string-array>
+
 </resources>