From 3e7487de6c986bdb4d542490e57d9ec0d1de5870 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 5 Nov 2022 14:38:08 +0800
Subject: [PATCH] Fix crash

---
 app/build.gradle                                       |  1 -
 app/src/leanback/res/layout/adapter_vod.xml            | 10 ++++------
 app/src/leanback/res/values/styles.xml                 |  5 +++++
 app/src/main/AndroidManifest.xml                       |  1 +
 .../main/java/com/fongmi/android/tv/api/ApiConfig.java | 10 +++++-----
 .../main/java/com/fongmi/android/tv/utils/ImgUtil.java |  2 +-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6987ac700..4eb41d31a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,7 +75,6 @@ dependencies {
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'com.google.zxing:core:3.5.0'
-    implementation 'com.makeramen:roundedimageview:2.3.0'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'me.jessyan:autosize:1.2.1'
     implementation 'org.greenrobot:eventbus:3.3.1'
diff --git a/app/src/leanback/res/layout/adapter_vod.xml b/app/src/leanback/res/layout/adapter_vod.xml
index c346e0650..79c1b1542 100644
--- a/app/src/leanback/res/layout/adapter_vod.xml
+++ b/app/src/leanback/res/layout/adapter_vod.xml
@@ -7,17 +7,16 @@
     android:focusable="true"
     android:focusableInTouchMode="true">
 
-    <com.makeramen.roundedimageview.RoundedImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/black_20"
         android:scaleType="center"
-        app:riv_corner_radius="8dp"
-        app:riv_mutate_background="true"
+        app:shapeAppearanceOverlay="@style/VodStyle"
         tools:src="@drawable/ic_img_loading" />
 
-    <com.makeramen.roundedimageview.RoundedImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/delete"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -25,8 +24,7 @@
         android:scaleType="center"
         android:src="@drawable/ic_delete"
         android:visibility="gone"
-        app:riv_corner_radius="8dp"
-        app:riv_mutate_background="true"
+        app:shapeAppearanceOverlay="@style/VodStyle"
         tools:visibility="visible" />
 
     <TextView
diff --git a/app/src/leanback/res/values/styles.xml b/app/src/leanback/res/values/styles.xml
index ff64a577a..ddbb5f5ae 100644
--- a/app/src/leanback/res/values/styles.xml
+++ b/app/src/leanback/res/values/styles.xml
@@ -19,6 +19,11 @@
         <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
 
+    <style name="VodStyle">
+        <item name="cornerSize">8dp</item>
+        <item name="cornerFamily">rounded</item>
+    </style>
+
     <style name="VodPlayerStyle">
         <item name="auto_show">false</item>
         <item name="resize_mode">fit</item>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 71713be44..94afe26bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
index e5ca0c3d0..40252e9aa 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
@@ -196,13 +196,13 @@ public class ApiConfig {
     }
 
     public Site getSite(String key) {
-        int index = sites.indexOf(Site.get(key));
-        return index == -1 ? new Site() : sites.get(index);
+        int index = getSites().indexOf(Site.get(key));
+        return index == -1 ? new Site() : getSites().get(index);
     }
 
     public Parse getParse(String name) {
-        int index = parses.indexOf(Parse.get(name));
-        return index == -1 ? null : parses.get(index);
+        int index = getParses().indexOf(Parse.get(name));
+        return index == -1 ? null : getParses().get(index);
     }
 
     public List<Site> getSites() {
@@ -257,6 +257,6 @@ public class ApiConfig {
         this.home = home;
         this.home.setActivated(true);
         config.home(home.getKey()).update();
-        for (Site item : sites) item.setActivated(home);
+        for (Site item : getSites()) item.setActivated(home);
     }
 }
\ No newline at end of file
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 c8368b15f..96d3b5302 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
@@ -24,7 +24,7 @@ public class ImgUtil {
     public static void load(String url, ImageView view) {
         view.setScaleType(ImageView.ScaleType.CENTER);
         if (TextUtils.isEmpty(url)) view.setImageResource(R.drawable.ic_img_error);
-        else Glide.with(App.get()).asBitmap().load(url).skipMemoryCache(true).sizeMultiplier(Prefers.getThumbnail()).signature(new ObjectKey(url + "_" + Prefers.getQuality())).placeholder(R.drawable.ic_img_loading).listener(getListener(view)).into(view);
+        else Glide.with(App.get()).asBitmap().load(url).skipMemoryCache(true).dontAnimate().sizeMultiplier(Prefers.getThumbnail()).signature(new ObjectKey(url + "_" + Prefers.getQuality())).placeholder(R.drawable.ic_img_loading).listener(getListener(view)).into(view);
     }
 
     private static RequestListener<Bitmap> getListener(ImageView view) {