From e4954e01bb6d0c74ceff8c501172cb2bb371af48 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 4 Feb 2023 11:31:05 +0800
Subject: [PATCH] [mobile] adjust ui

---
 .../fongmi/android/tv/ui/adapter/FilterAdapter.java   |  3 +++
 .../android/tv/ui/fragment/child/SiteFragment.java    |  2 +-
 .../android/tv/ui/fragment/child/TypeFragment.java    | 11 +++++++----
 app/src/mobile/res/layout/adapter_filter.xml          |  5 ++++-
 app/src/mobile/res/layout/adapter_value.xml           |  2 --
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/FilterAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/FilterAdapter.java
index b2acf05c9..7fd291c3f 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/FilterAdapter.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/FilterAdapter.java
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.fongmi.android.tv.bean.Filter;
 import com.fongmi.android.tv.databinding.AdapterFilterBinding;
+import com.fongmi.android.tv.ui.custom.SpaceItemDecoration;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,6 +59,8 @@ public class FilterAdapter extends RecyclerView.Adapter<FilterAdapter.ViewHolder
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         Filter item = mItems.get(position);
         holder.binding.recycler.setHasFixedSize(true);
+        holder.binding.recycler.setItemAnimator(null);
+        holder.binding.recycler.addItemDecoration(new SpaceItemDecoration(item.getValue().size(), 8));
         holder.binding.recycler.setLayoutManager(new LinearLayoutManager(holder.itemView.getContext(), LinearLayoutManager.HORIZONTAL, false));
         holder.binding.recycler.setAdapter(new ValueAdapter(mListener, item));
     }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/SiteFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/SiteFragment.java
index 758c1995c..20162fb3e 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/SiteFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/SiteFragment.java
@@ -89,7 +89,7 @@ public class SiteFragment extends BaseFragment implements VodAdapter.OnClickList
                 mBinding.progressLayout.showProgress();
                 break;
             case IMAGE:
-                mVodAdapter.notifyItemRangeChanged(0, mVodAdapter.getItemCount());
+                mVodAdapter.notifyDataSetChanged();
                 break;
             case HISTORY:
                 getHistory();
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java
index f4990a12b..a7b74f1e6 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java
@@ -14,6 +14,7 @@ import com.fongmi.android.tv.api.ApiConfig;
 import com.fongmi.android.tv.bean.Filter;
 import com.fongmi.android.tv.bean.Vod;
 import com.fongmi.android.tv.databinding.FragmentTypeBinding;
+import com.fongmi.android.tv.event.RefreshEvent;
 import com.fongmi.android.tv.model.SiteViewModel;
 import com.fongmi.android.tv.ui.activity.BaseFragment;
 import com.fongmi.android.tv.ui.adapter.FilterAdapter;
@@ -22,6 +23,9 @@ import com.fongmi.android.tv.ui.adapter.VodAdapter;
 import com.fongmi.android.tv.ui.custom.CustomScroller;
 import com.fongmi.android.tv.ui.custom.SpaceItemDecoration;
 
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -162,9 +166,8 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
         return false;
     }
 
-    @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (mBinding != null && !isVisibleToUser) mBinding.recycler.scrollToPosition(0);
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onRefreshEvent(RefreshEvent event) {
+        if (event.getType() == RefreshEvent.Type.IMAGE) mVodAdapter.notifyDataSetChanged();
     }
 }
diff --git a/app/src/mobile/res/layout/adapter_filter.xml b/app/src/mobile/res/layout/adapter_filter.xml
index ad7e1060c..f8217c4d2 100644
--- a/app/src/mobile/res/layout/adapter_filter.xml
+++ b/app/src/mobile/res/layout/adapter_filter.xml
@@ -5,4 +5,7 @@
     android:layout_height="wrap_content"
     android:clipChildren="false"
     android:clipToPadding="false"
-    android:padding="8dp" />
\ No newline at end of file
+    android:paddingStart="16dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="8dp" />
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/adapter_value.xml b/app/src/mobile/res/layout/adapter_value.xml
index a8cabf3b5..e53967949 100644
--- a/app/src/mobile/res/layout/adapter_value.xml
+++ b/app/src/mobile/res/layout/adapter_value.xml
@@ -4,8 +4,6 @@
     android:id="@+id/text"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginStart="8dp"
-    android:layout_marginEnd="8dp"
     android:background="@drawable/selector_item_round"
     android:textColor="@color/white"
     android:textSize="14sp"