Optimize logo

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

@@ -2,6 +2,7 @@ package com.fongmi.android.tv.ui.activity;
 
 import android.Manifest;
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
@@ -18,6 +19,10 @@ import androidx.viewbinding.ViewBinding;
 
 import com.android.cast.dlna.dmr.DLNARendererService;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.Product;
 import com.fongmi.android.tv.R;
@@ -204,9 +209,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     }
 
     private void setLogo() {
-        String logo = VodConfig.get().getConfig().getLogo();
-        mBinding.logo.setVisibility(TextUtils.isEmpty(logo) ? View.GONE : View.VISIBLE);
-        Glide.with(this).load(logo).error(R.drawable.ic_logo).circleCrop().into(mBinding.logo);
+        Glide.with(this).load(VodConfig.get().getConfig().getLogo()).circleCrop().listener(getListener()).into(mBinding.logo);
     }
 
     private void getVideo() {
@@ -277,14 +280,30 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         return -1;
     }
 
-    public boolean isLoading() {
+    private boolean isLoading() {
         return loading;
     }
 
-    public void setLoading(boolean loading) {
+    private void setLoading(boolean loading) {
         this.loading = loading;
     }
 
+    private RequestListener<Drawable> getListener() {
+        return new RequestListener<>() {
+            @Override
+            public boolean onLoadFailed(@Nullable GlideException e, Object model, @NonNull Target<Drawable> target, boolean isFirstResource) {
+                mBinding.logo.setVisibility(View.GONE);
+                return true;
+            }
+
+            @Override
+            public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target<Drawable> target, @NonNull DataSource dataSource, boolean isFirstResource) {
+                mBinding.logo.setVisibility(View.VISIBLE);
+                return false;
+            }
+        };
+    }
+
     @Override
     public void onItemClick(Func item) {
         switch (item.getResId()) {

app/src/leanback/res/layout/activity_home.xml

@@ -19,6 +19,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:animateLayoutChanges="true"
             android:gravity="center_vertical"
             android:orientation="horizontal">
 

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

@@ -125,8 +125,8 @@ public class ImgUtil {
         return new RequestListener<>() {
             @Override
             public boolean onLoadFailed(@Nullable GlideException e, Object model, @NonNull Target<Bitmap> target, boolean isFirstResource) {
-                view.setScaleType(scaleType);
                 view.setImageResource(R.drawable.ic_img_error);
+                view.setScaleType(scaleType);
                 return true;
             }
 

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java

@@ -246,7 +246,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
     private void setLogo() {
         String logo = VodConfig.get().getConfig().getLogo();
         if (TextUtils.isEmpty(logo)) mBinding.logo.setImageResource(R.drawable.ic_logo);
-        else Glide.with(this).load(logo).error(R.drawable.ic_logo).circleCrop().into(mBinding.logo);
+        else Glide.with(this).load(logo).placeholder(R.drawable.ic_logo).error(R.drawable.ic_logo).circleCrop().into(mBinding.logo);
     }
 
     public Result getResult() {

app/src/mobile/res/drawable/ic_action_search.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">

app/src/mobile/res/layout/fragment_vod.xml

@@ -55,8 +55,8 @@
 
                 <ImageView
                     android:id="@+id/search"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_action_search" />
 
             </LinearLayout>