Clean code

app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomFabBehavior.java

@@ -28,7 +28,7 @@ public class CustomFabBehavior extends FloatingActionButton.Behavior {
     @Override
     public void onNestedScroll(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FloatingActionButton child, @NonNull View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed, int type, @NonNull int[] consumed) {
         super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, type, consumed);
-        if ("uptop".equals(child.getTag())) {
+        if ("top".equals(child.getTag())) {
             if (dyConsumed > 0 && child.getVisibility() == View.INVISIBLE) {
                 child.show();
             } else if (dyConsumed < 0 && child.getVisibility() == View.VISIBLE) {

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

@@ -71,8 +71,8 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
         return new VodFragment();
     }
 
-    private BaseFragment getFragment() {
-        return (BaseFragment) mBinding.pager.getAdapter().instantiateItem(mBinding.pager, mBinding.pager.getCurrentItem());
+    private TypeFragment getFragment() {
+        return (TypeFragment) mBinding.pager.getAdapter().instantiateItem(mBinding.pager, mBinding.pager.getCurrentItem());
     }
 
     private Site getSite() {
@@ -97,12 +97,12 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
     @Override
     protected void initEvent() {
         mBinding.hot.setOnClickListener(this::onHot);
+        mBinding.top.setOnClickListener(this::onTop);
         mBinding.link.setOnClickListener(this::onLink);
         mBinding.logo.setOnClickListener(this::onLogo);
         mBinding.keep.setOnClickListener(this::onKeep);
         mBinding.retry.setOnClickListener(this::onRetry);
         mBinding.filter.setOnClickListener(this::onFilter);
-        mBinding.uptop.setOnClickListener(this::onUptop);
         mBinding.search.setOnClickListener(this::onSearch);
         mBinding.history.setOnClickListener(this::onHistory);
         mBinding.pager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
@@ -165,17 +165,17 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
 
     private void setFabVisible(int position) {
         if (mAdapter.getItemCount() == 0) {
-            mBinding.filter.setVisibility(View.GONE);
+            mBinding.top.setVisibility(View.INVISIBLE);
             mBinding.link.setVisibility(View.VISIBLE);
-            mBinding.uptop.setVisibility(View.INVISIBLE);
+            mBinding.filter.setVisibility(View.GONE);
         } else if (mAdapter.get(position).getFilters().size() > 0) {
+            mBinding.top.setVisibility(View.INVISIBLE);
             mBinding.link.setVisibility(View.GONE);
             mBinding.filter.show();
-            mBinding.uptop.setVisibility(View.INVISIBLE);
         } else if (position == 0 || mAdapter.get(position).getFilters().isEmpty()) {
-            mBinding.link.show();
+            mBinding.top.setVisibility(View.INVISIBLE);
             mBinding.filter.setVisibility(View.GONE);
-            mBinding.uptop.setVisibility(View.INVISIBLE);
+            mBinding.link.show();
         }
     }
 
@@ -183,9 +183,9 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
         mBinding.retry.setVisibility(mAdapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
     }
 
-    private void onUptop(View view) {
-        ((TypeFragment) getFragment()).scrollToTop();
-        mBinding.uptop.setVisibility(View.INVISIBLE);
+    private void onTop(View view) {
+        getFragment().scrollToTop();
+        mBinding.top.setVisibility(View.GONE);
         if (mBinding.filter.getVisibility() == View.INVISIBLE) mBinding.filter.show();
         else if (mBinding.link.getVisibility() == View.INVISIBLE) mBinding.link.show();
     }
@@ -279,7 +279,7 @@ public class VodFragment extends BaseFragment implements SiteCallback, FilterCal
 
     @Override
     public void setFilter(String key, Value value) {
-        ((TypeFragment) getFragment()).setFilter(key, value);
+        getFragment().setFilter(key, value);
     }
 
     @Override

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

@@ -6,5 +6,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z" />
+        android:pathData="M7,6h10l-5.01,6.3L7,6zM4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z" />
 </vector>

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

@@ -142,16 +142,17 @@
         tools:visibility="visible" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/uptop"
+        android:id="@+id/top"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-        android:tag="uptop"
+        android:tag="top"
+        android:visibility="invisible"
         app:backgroundTint="@color/blue_500"
         app:layout_anchor="@id/pager"
         app:layout_anchorGravity="end|bottom"
         app:layout_behavior="com.fongmi.android.tv.ui.custom.CustomFabBehavior"
-        app:srcCompat="@drawable/ic_fab_uptop"
+        app:srcCompat="@drawable/ic_fab_top"
         app:tint="@color/white"
         tools:visibility="visible" />