From c9fe40f7a45fa3998afb942261eba55edcfa8237 Mon Sep 17 00:00:00 2001
From: jhengazuki <jhengazuki3@gmail.com>
Date: Sun, 12 Oct 2025 21:39:29 +0800
Subject: [PATCH] Optimize glide

---
 app/build.gradle                                         | 4 ++--
 app/src/leanback/res/layout/activity_search.xml          | 1 -
 app/src/leanback/res/layout/activity_setting.xml         | 6 ------
 app/src/leanback/res/layout/adapter_config.xml           | 1 -
 app/src/leanback/res/layout/adapter_file.xml             | 1 -
 app/src/leanback/res/layout/adapter_live.xml             | 2 --
 app/src/leanback/res/layout/adapter_restore.xml          | 1 -
 app/src/leanback/res/layout/adapter_vod_list.xml         | 1 -
 app/src/leanback/res/layout/view_widget_cast.xml         | 2 --
 app/src/leanback/res/layout/view_widget_live.xml         | 2 --
 app/src/leanback/res/layout/view_widget_vod.xml          | 2 --
 .../main/java/com/fongmi/android/tv/utils/ImgUtil.java   | 9 ++++++---
 app/src/mobile/res/layout/adapter_config.xml             | 1 -
 app/src/mobile/res/layout/adapter_file.xml               | 1 -
 app/src/mobile/res/layout/adapter_live.xml               | 2 --
 app/src/mobile/res/layout/adapter_site.xml               | 2 --
 app/src/mobile/res/layout/adapter_vod_list.xml           | 1 -
 app/src/mobile/res/layout/fragment_setting.xml           | 6 ------
 app/src/mobile/res/layout/view_widget_live.xml           | 1 -
 app/src/mobile/res/layout/view_widget_vod.xml            | 1 -
 20 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8d2340b07..b96e609e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 24
         targetSdk 36
-        versionCode 445
-        versionName "4.4.5"
+        versionCode 446
+        versionName "4.4.6"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString(), "eventBusIndex": "com.fongmi.android.tv.event.EventIndex"]
diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml
index 5c9648f66..20465ce16 100644
--- a/app/src/leanback/res/layout/activity_search.xml
+++ b/app/src/leanback/res/layout/activity_search.xml
@@ -52,7 +52,6 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:nextFocusLeft="@id/record"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_search_mic" />
 
         <com.fongmi.android.tv.ui.custom.CustomSearchView
diff --git a/app/src/leanback/res/layout/activity_setting.xml b/app/src/leanback/res/layout/activity_setting.xml
index 50f465941..65e5b86d5 100644
--- a/app/src/leanback/res/layout/activity_setting.xml
+++ b/app/src/leanback/res/layout/activity_setting.xml
@@ -62,7 +62,6 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:padding="8dp"
-                android:scaleType="fitCenter"
                 android:src="@drawable/ic_setting_home" />
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -73,7 +72,6 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:padding="8dp"
-                android:scaleType="fitCenter"
                 android:src="@drawable/ic_setting_history" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -129,7 +127,6 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:padding="8dp"
-                android:scaleType="fitCenter"
                 android:src="@drawable/ic_setting_home" />
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -140,7 +137,6 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:padding="8dp"
-                android:scaleType="fitCenter"
                 android:src="@drawable/ic_setting_history" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -196,7 +192,6 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:padding="8dp"
-                android:scaleType="fitCenter"
                 android:src="@drawable/ic_setting_home" />
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -207,7 +202,6 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:padding="8dp"
-                android:scaleType="fitCenter"
                 android:src="@drawable/ic_setting_refresh" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/leanback/res/layout/adapter_config.xml b/app/src/leanback/res/layout/adapter_config.xml
index 0fe009e81..9cb903c02 100644
--- a/app/src/leanback/res/layout/adapter_config.xml
+++ b/app/src/leanback/res/layout/adapter_config.xml
@@ -29,7 +29,6 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:padding="8dp"
-        android:scaleType="fitCenter"
         android:src="@drawable/ic_setting_delete" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/adapter_file.xml b/app/src/leanback/res/layout/adapter_file.xml
index cfb652dea..7083edc1a 100644
--- a/app/src/leanback/res/layout/adapter_file.xml
+++ b/app/src/leanback/res/layout/adapter_file.xml
@@ -19,7 +19,6 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_margin="16dp"
-            android:scaleType="fitCenter"
             tools:src="@drawable/ic_folder" />
 
         <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/leanback/res/layout/adapter_live.xml b/app/src/leanback/res/layout/adapter_live.xml
index 357e4b832..27eda3212 100644
--- a/app/src/leanback/res/layout/adapter_live.xml
+++ b/app/src/leanback/res/layout/adapter_live.xml
@@ -29,7 +29,6 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:padding="8dp"
-        android:scaleType="fitCenter"
         android:src="@drawable/ic_live_pass" />
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -41,7 +40,6 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:padding="8dp"
-        android:scaleType="fitCenter"
         android:src="@drawable/ic_live_boot" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/adapter_restore.xml b/app/src/leanback/res/layout/adapter_restore.xml
index 65d4bb134..50930aa3c 100644
--- a/app/src/leanback/res/layout/adapter_restore.xml
+++ b/app/src/leanback/res/layout/adapter_restore.xml
@@ -29,7 +29,6 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:padding="8dp"
-        android:scaleType="fitCenter"
         android:src="@drawable/ic_setting_delete" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/adapter_vod_list.xml b/app/src/leanback/res/layout/adapter_vod_list.xml
index 4e8a79941..608cca4b6 100644
--- a/app/src/leanback/res/layout/adapter_vod_list.xml
+++ b/app/src/leanback/res/layout/adapter_vod_list.xml
@@ -20,7 +20,6 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_margin="16dp"
-            android:scaleType="fitCenter"
             app:shapeAppearanceOverlay="@style/Vod.Grid.Large" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/leanback/res/layout/view_widget_cast.xml b/app/src/leanback/res/layout/view_widget_cast.xml
index 242fc5161..92693227e 100644
--- a/app/src/leanback/res/layout/view_widget_cast.xml
+++ b/app/src/leanback/res/layout/view_widget_cast.xml
@@ -92,7 +92,6 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_widget_error" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -123,7 +122,6 @@
             android:id="@+id/action"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_widget_play" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/leanback/res/layout/view_widget_live.xml b/app/src/leanback/res/layout/view_widget_live.xml
index f33a64203..2985d31d2 100644
--- a/app/src/leanback/res/layout/view_widget_live.xml
+++ b/app/src/leanback/res/layout/view_widget_live.xml
@@ -93,7 +93,6 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_widget_error" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -140,7 +139,6 @@
             android:id="@+id/action"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_widget_play" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/leanback/res/layout/view_widget_vod.xml b/app/src/leanback/res/layout/view_widget_vod.xml
index 9dbd67981..dda57ea24 100644
--- a/app/src/leanback/res/layout/view_widget_vod.xml
+++ b/app/src/leanback/res/layout/view_widget_vod.xml
@@ -91,7 +91,6 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_widget_error" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -122,7 +121,6 @@
             android:id="@+id/action"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_widget_play" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
index 808a969ba..dc427ff41 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
@@ -13,6 +13,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.load.model.GlideUrl;
@@ -47,10 +48,13 @@ public class ImgUtil {
     }
 
     public static void load(String text, String url, ImageView view, boolean vod) {
+        view.setScaleType(vod ? CENTER_CROP : FIT_CENTER);
         if (!vod) view.setVisibility(TextUtils.isEmpty(url) ? View.GONE : View.VISIBLE);
         if (TextUtils.isEmpty(url) || failed.contains(url)) view.setImageDrawable(getTextDrawable(text, vod));
         else try {
-            Glide.with(view).load(getUrl(url)).listener(getListener(text, url, view, vod)).into(view);
+            RequestBuilder<Drawable> builder = Glide.with(view).load(getUrl(url)).listener(getListener(text, url, view, vod));
+            if (vod) builder.centerCrop().into(view);
+            else builder.fitCenter().into(view);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -91,8 +95,7 @@ public class ImgUtil {
             }
 
             @Override
-            public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target<Drawable> target, @NonNull DataSource dataSource, boolean isFirstResource) {
-                view.setScaleType(vod ? CENTER_CROP : FIT_CENTER);
+            public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
                 return false;
             }
         };
diff --git a/app/src/mobile/res/layout/adapter_config.xml b/app/src/mobile/res/layout/adapter_config.xml
index b6c1c5c83..e0a9e0c17 100644
--- a/app/src/mobile/res/layout/adapter_config.xml
+++ b/app/src/mobile/res/layout/adapter_config.xml
@@ -24,7 +24,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
-        android:scaleType="fitCenter"
         android:src="@drawable/ic_setting_delete" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_file.xml b/app/src/mobile/res/layout/adapter_file.xml
index 17a9d013b..a5f6a0846 100644
--- a/app/src/mobile/res/layout/adapter_file.xml
+++ b/app/src/mobile/res/layout/adapter_file.xml
@@ -15,7 +15,6 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="12dp"
-        android:scaleType="fitCenter"
         tools:src="@drawable/ic_folder" />
 
     <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/mobile/res/layout/adapter_live.xml b/app/src/mobile/res/layout/adapter_live.xml
index a377ba9f1..c0ddfc9ce 100644
--- a/app/src/mobile/res/layout/adapter_live.xml
+++ b/app/src/mobile/res/layout/adapter_live.xml
@@ -24,7 +24,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
-        android:scaleType="fitCenter"
         android:src="@drawable/ic_live_pass" />
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -33,7 +32,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
-        android:scaleType="fitCenter"
         android:src="@drawable/ic_live_boot" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_site.xml b/app/src/mobile/res/layout/adapter_site.xml
index 73d985f5b..8ac425451 100644
--- a/app/src/mobile/res/layout/adapter_site.xml
+++ b/app/src/mobile/res/layout/adapter_site.xml
@@ -24,7 +24,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
-        android:scaleType="fitCenter"
         android:src="@drawable/ic_site_search" />
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -33,7 +32,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:background="?attr/selectableItemBackgroundBorderless"
-        android:scaleType="fitCenter"
         android:src="@drawable/ic_site_change" />
 
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_vod_list.xml b/app/src/mobile/res/layout/adapter_vod_list.xml
index 6e7fdf725..0a19764bb 100644
--- a/app/src/mobile/res/layout/adapter_vod_list.xml
+++ b/app/src/mobile/res/layout/adapter_vod_list.xml
@@ -16,7 +16,6 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="12dp"
-        android:scaleType="fitCenter"
         app:shapeAppearanceOverlay="@style/Vod.Grid.Large" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/mobile/res/layout/fragment_setting.xml b/app/src/mobile/res/layout/fragment_setting.xml
index e91b05ca8..69ea8a8b4 100644
--- a/app/src/mobile/res/layout/fragment_setting.xml
+++ b/app/src/mobile/res/layout/fragment_setting.xml
@@ -70,7 +70,6 @@
                     android:layout_marginEnd="12dp"
                     android:background="@drawable/shape_item"
                     android:padding="7dp"
-                    android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_home" />
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -79,7 +78,6 @@
                     android:layout_height="wrap_content"
                     android:background="@drawable/shape_item"
                     android:padding="7dp"
-                    android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_history" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -128,7 +126,6 @@
                     android:layout_marginEnd="12dp"
                     android:background="@drawable/shape_item"
                     android:padding="7dp"
-                    android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_home" />
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -137,7 +134,6 @@
                     android:layout_height="wrap_content"
                     android:background="@drawable/shape_item"
                     android:padding="7dp"
-                    android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_history" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -186,7 +182,6 @@
                     android:layout_marginEnd="12dp"
                     android:background="@drawable/shape_item"
                     android:padding="7dp"
-                    android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_home" />
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -195,7 +190,6 @@
                     android:layout_height="wrap_content"
                     android:background="@drawable/shape_item"
                     android:padding="7dp"
-                    android:scaleType="fitCenter"
                     android:src="@drawable/ic_setting_refresh" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/mobile/res/layout/view_widget_live.xml b/app/src/mobile/res/layout/view_widget_live.xml
index 776bf432d..cc6350e49 100644
--- a/app/src/mobile/res/layout/view_widget_live.xml
+++ b/app/src/mobile/res/layout/view_widget_live.xml
@@ -19,7 +19,6 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_widget_error" />
 
         <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/mobile/res/layout/view_widget_vod.xml b/app/src/mobile/res/layout/view_widget_vod.xml
index c13a82da5..f779e5d4d 100644
--- a/app/src/mobile/res/layout/view_widget_vod.xml
+++ b/app/src/mobile/res/layout/view_widget_vod.xml
@@ -19,7 +19,6 @@
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:scaleType="fitCenter"
             android:src="@drawable/ic_widget_error" />
 
         <com.google.android.material.textview.MaterialTextView