Revert "Adapt header handling changes from other recyclerview adapters to fix issue #4475 in StatisticsPlaylistFragment"

This reverts commit 2abe71c.

Author: j-haldane

app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java

@@ -28,8 +28,6 @@
 import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
 import static org.schabi.newpipe.util.ThemeHelper.getItemViewMode;
 
-import java.util.function.Supplier;
-
 /**
  * This fragment is design to be used with persistent data such as
  * {@link org.schabi.newpipe.database.LocalItem}, and does not cache the data contained
@@ -102,7 +100,7 @@ private void refreshItemViewMode() {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Nullable
-    protected Supplier<View> getListHeaderSupplier() {
+    protected ViewBinding getListHeader() {
         return null;
     }
 
@@ -133,9 +131,9 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
         itemsList = rootView.findViewById(R.id.items_list);
         refreshItemViewMode();
 
-        final Supplier<View> listHeaderSupplier = getListHeaderSupplier();
-        if (listHeaderSupplier != null) {
-            itemListAdapter.setHeaderSupplier(listHeaderSupplier);
+        headerRootBinding = getListHeader();
+        if (headerRootBinding != null) {
+            itemListAdapter.setHeader(headerRootBinding.getRoot());
         }
         footerRootBinding = getListFooter();
         itemListAdapter.setFooter(footerRootBinding.getRoot());

app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java

@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -38,7 +37,6 @@
 import java.time.format.FormatStyle;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Supplier;
 
 /*
  * Created by Christian Schabesberger on 01.08.16.
@@ -84,14 +82,13 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     private static final int REMOTE_PLAYLIST_CARD_HOLDER_TYPE = 0x3002;
     private static final int REMOTE_BOOKMARK_PLAYLIST_HOLDER_TYPE = 0x3003;
 
-    private final LayoutInflater layoutInflater;
     private final LocalItemBuilder localItemBuilder;
     private final ArrayList<LocalItem> localItems;
     private final HistoryRecordManager recordManager;
     private final DateTimeFormatter dateTimeFormatter;
 
     private boolean showFooter = false;
-    private Supplier<View> headerSupplier = null;
+    private View header = null;
     private View footer = null;
     private ItemViewMode itemViewMode = ItemViewMode.LIST;
     private boolean useItemHandle = false;
@@ -100,8 +97,6 @@ public LocalItemListAdapter(final Context context) {
         recordManager = new HistoryRecordManager(context);
         localItemBuilder = new LocalItemBuilder(context);
         localItems = new ArrayList<>();
-        layoutInflater = LayoutInflater.from(context);
-
         dateTimeFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
                 .withLocale(Localization.getPreferredLocale(context));
     }
@@ -129,7 +124,7 @@ public void addItems(@Nullable final List<? extends LocalItem> data) {
         if (DEBUG) {
             Log.d(TAG, "addItems() after > offsetStart = " + offsetStart + ", "
                     + "localItems.size() = " + localItems.size() + ", "
-                    + "header = " + hasHeader() + ", footer = " + footer + ", "
+                    + "header = " + header + ", footer = " + footer + ", "
                     + "showFooter = " + showFooter);
         }
         notifyItemRangeInserted(offsetStart, data.size());
@@ -149,7 +144,7 @@ public void removeItem(final LocalItem data) {
         final int index = localItems.indexOf(data);
         if (index != -1) {
             localItems.remove(index);
-            notifyItemRemoved(index + (hasHeader() ? 1 : 0));
+            notifyItemRemoved(index + (header != null ? 1 : 0));
         } else {
             // this happens when
             // 1) removeItem is called on infoItemDuplicate as in showStreamItemDialog of
@@ -194,9 +189,9 @@ public void setUseItemHandle(final boolean useItemHandle) {
         this.useItemHandle = useItemHandle;
     }
 
-    public void setHeaderSupplier(@Nullable final Supplier<View> headerSupplier) {
-        final boolean changed = headerSupplier != this.headerSupplier;
-        this.headerSupplier = headerSupplier;
+    public void setHeader(final View header) {
+        final boolean changed = header != this.header;
+        this.header = header;
         if (changed) {
             notifyDataSetChanged();
         }
@@ -206,10 +201,6 @@ public void setFooter(final View view) {
         this.footer = view;
     }
 
-    protected boolean hasHeader() {
-        return this.headerSupplier != null;
-    }
-
     public void showFooter(final boolean show) {
         if (DEBUG) {
             Log.d(TAG, "showFooter() called with: show = [" + show + "]");
@@ -227,11 +218,11 @@ public void showFooter(final boolean show) {
     }
 
     private int adapterOffsetWithoutHeader(final int offset) {
-        return offset - (hasHeader() ? 1 : 0);
+        return offset - (header != null ? 1 : 0);
     }
 
     private int sizeConsideringHeader() {
-        return localItems.size() + (hasHeader() ? 1 : 0);
+        return localItems.size() + (header != null ? 1 : 0);
     }
 
     public ArrayList<LocalItem> getItemsList() {
@@ -241,7 +232,7 @@ public ArrayList<LocalItem> getItemsList() {
     @Override
     public int getItemCount() {
         int count = localItems.size();
-        if (hasHeader()) {
+        if (header != null) {
             count++;
         }
         if (footer != null && showFooter) {
@@ -251,7 +242,7 @@ public int getItemCount() {
         if (DEBUG) {
             Log.d(TAG, "getItemCount() called, count = " + count + ", "
                     + "localItems.size() = " + localItems.size() + ", "
-                    + "header = " + hasHeader() + ", footer = " + footer + ", "
+                    + "header = " + header + ", footer = " + footer + ", "
                     + "showFooter = " + showFooter);
         }
         return count;
@@ -264,9 +255,9 @@ public int getItemViewType(int position) {
             Log.d(TAG, "getItemViewType() called with: position = [" + position + "]");
         }
 
-        if (hasHeader() && position == 0) {
+        if (header != null && position == 0) {
             return HEADER_TYPE;
-        } else if (hasHeader()) {
+        } else if (header != null) {
             position--;
         }
         if (footer != null && position == localItems.size() && showFooter) {
@@ -327,7 +318,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull final ViewGroup paren
         }
         switch (type) {
             case HEADER_TYPE:
-                return new HeaderFooterHolder(headerSupplier.get());
+                return new HeaderFooterHolder(header);
             case FOOTER_TYPE:
                 return new HeaderFooterHolder(footer);
             case LOCAL_PLAYLIST_HOLDER_TYPE:
@@ -375,14 +366,14 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
 
         if (holder instanceof LocalItemHolder) {
             // If header isn't null, offset the items by -1
-            if (hasHeader()) {
+            if (header != null) {
                 position--;
             }
 
             ((LocalItemHolder) holder)
                     .updateFromItem(localItems.get(position), recordManager, dateTimeFormatter);
-        } else if (holder instanceof HeaderFooterHolder && position == 0 && hasHeader()) {
-            ((HeaderFooterHolder) holder).view = headerSupplier.get();
+        } else if (holder instanceof HeaderFooterHolder && position == 0 && header != null) {
+            ((HeaderFooterHolder) holder).view = header;
         } else if (holder instanceof HeaderFooterHolder && position == sizeConsideringHeader()
                 && footer != null && showFooter) {
             ((HeaderFooterHolder) holder).view = footer;
@@ -396,10 +387,10 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, fina
             for (final Object payload : payloads) {
                 if (payload instanceof StreamStateEntity) {
                     ((LocalItemHolder) holder).updateState(localItems
-                            .get(hasHeader() ? position - 1 : position), recordManager);
+                            .get(header == null ? position : position - 1), recordManager);
                 } else if (payload instanceof Boolean) {
                     ((LocalItemHolder) holder).updateState(localItems
-                            .get(hasHeader() ? position - 1 : position), recordManager);
+                            .get(header == null ? position : position - 1), recordManager);
                 }
             }
         } else {

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

@@ -13,6 +13,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.viewbinding.ViewBinding;
 
 import com.evernote.android.state.State;
 import com.google.android.material.snackbar.Snackbar;
@@ -44,7 +45,6 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
-import java.util.function.Supplier;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
@@ -126,12 +126,12 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
     }
 
     @Override
-    protected Supplier<View> getListHeaderSupplier() {
+    protected ViewBinding getListHeader() {
         headerBinding = StatisticPlaylistControlBinding.inflate(activity.getLayoutInflater(),
                 itemsList, false);
         playlistControlBinding = headerBinding.playlistControl;
 
-        return headerBinding::getRoot;
+        return headerBinding;
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -29,6 +29,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewbinding.ViewBinding;
 
 import com.evernote.android.state.State;
 import org.reactivestreams.Subscriber;
@@ -66,7 +67,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@@ -158,14 +158,14 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
     }
 
     @Override
-    protected Supplier<View> getListHeaderSupplier() {
+    protected ViewBinding getListHeader() {
         headerBinding = LocalPlaylistHeaderBinding.inflate(activity.getLayoutInflater(), itemsList,
-            false);
+                false);
         playlistControlBinding = headerBinding.playlistControl;
 
         headerBinding.playlistTitleView.setSelected(true);
 
-        return headerBinding::getRoot;
+        return headerBinding;
     }
 
     @Override