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" />
@@ -129,7 +127,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
- android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
@@ -196,7 +192,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:padding="8dp"
- android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
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" />
\ 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" />
\ 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" />
\ 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" />
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 target, @NonNull DataSource dataSource, boolean isFirstResource) {
- view.setScaleType(vod ? CENTER_CROP : FIT_CENTER);
+ public boolean onResourceReady(Drawable resource, Object model, Target 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" />
\ 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" />
\ 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" />
\ 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" />
@@ -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" />
@@ -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" />
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 @@