Skip to content

Commit d0f32b3

Browse files
StypoxStypox
authored
Merge pull request #12996 from whistlingwoods/reapply-local-list-header-fix-by-j-haldane
2 parents 460cadf + cea5dd4 commit d0f32b3

4 files changed

Lines changed: 37 additions & 29 deletions

File tree

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
2929
import static org.schabi.newpipe.util.ThemeHelper.getItemViewMode;
3030

31+
import java.util.function.Supplier;
32+
3133
/**
3234
* This fragment is design to be used with persistent data such as
3335
* {@link org.schabi.newpipe.database.LocalItem}, and does not cache the data contained
@@ -100,7 +102,7 @@ private void refreshItemViewMode() {
100102
//////////////////////////////////////////////////////////////////////////*/
101103

102104
@Nullable
103-
protected ViewBinding getListHeader() {
105+
protected Supplier<View> getListHeaderSupplier() {
104106
return null;
105107
}
106108

@@ -131,9 +133,9 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
131133
itemsList = rootView.findViewById(R.id.items_list);
132134
refreshItemViewMode();
133135

134-
headerRootBinding = getListHeader();
135-
if (headerRootBinding != null) {
136-
itemListAdapter.setHeader(headerRootBinding.getRoot());
136+
final Supplier<View> listHeaderSupplier = getListHeaderSupplier();
137+
if (listHeaderSupplier != null) {
138+
itemListAdapter.setHeaderSupplier(listHeaderSupplier);
137139
}
138140
footerRootBinding = getListFooter();
139141
itemListAdapter.setFooter(footerRootBinding.getRoot());

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

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import java.time.format.FormatStyle;
3838
import java.util.ArrayList;
3939
import java.util.List;
40+
import java.util.function.Supplier;
4041

4142
/*
4243
* Created by Christian Schabesberger on 01.08.16.
@@ -88,7 +89,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
8889
private final DateTimeFormatter dateTimeFormatter;
8990

9091
private boolean showFooter = false;
91-
private View header = null;
92+
private Supplier<View> headerSupplier = null;
9293
private View footer = null;
9394
private ItemViewMode itemViewMode = ItemViewMode.LIST;
9495
private boolean useItemHandle = false;
@@ -97,6 +98,7 @@ public LocalItemListAdapter(final Context context) {
9798
recordManager = new HistoryRecordManager(context);
9899
localItemBuilder = new LocalItemBuilder(context);
99100
localItems = new ArrayList<>();
101+
100102
dateTimeFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
101103
.withLocale(Localization.getPreferredLocale(context));
102104
}
@@ -124,7 +126,7 @@ public void addItems(@Nullable final List<? extends LocalItem> data) {
124126
if (DEBUG) {
125127
Log.d(TAG, "addItems() after > offsetStart = " + offsetStart + ", "
126128
+ "localItems.size() = " + localItems.size() + ", "
127-
+ "header = " + header + ", footer = " + footer + ", "
129+
+ "header = " + hasHeader() + ", footer = " + footer + ", "
128130
+ "showFooter = " + showFooter);
129131
}
130132
notifyItemRangeInserted(offsetStart, data.size());
@@ -144,7 +146,7 @@ public void removeItem(final LocalItem data) {
144146
final int index = localItems.indexOf(data);
145147
if (index != -1) {
146148
localItems.remove(index);
147-
notifyItemRemoved(index + (header != null ? 1 : 0));
149+
notifyItemRemoved(index + (hasHeader() ? 1 : 0));
148150
} else {
149151
// this happens when
150152
// 1) removeItem is called on infoItemDuplicate as in showStreamItemDialog of
@@ -189,9 +191,9 @@ public void setUseItemHandle(final boolean useItemHandle) {
189191
this.useItemHandle = useItemHandle;
190192
}
191193

192-
public void setHeader(final View header) {
193-
final boolean changed = header != this.header;
194-
this.header = header;
194+
public void setHeaderSupplier(@Nullable final Supplier<View> headerSupplier) {
195+
final boolean changed = headerSupplier != this.headerSupplier;
196+
this.headerSupplier = headerSupplier;
195197
if (changed) {
196198
notifyDataSetChanged();
197199
}
@@ -201,6 +203,10 @@ public void setFooter(final View view) {
201203
this.footer = view;
202204
}
203205

206+
protected boolean hasHeader() {
207+
return this.headerSupplier != null;
208+
}
209+
204210
public void showFooter(final boolean show) {
205211
if (DEBUG) {
206212
Log.d(TAG, "showFooter() called with: show = [" + show + "]");
@@ -218,11 +224,11 @@ public void showFooter(final boolean show) {
218224
}
219225

220226
private int adapterOffsetWithoutHeader(final int offset) {
221-
return offset - (header != null ? 1 : 0);
227+
return offset - (hasHeader() ? 1 : 0);
222228
}
223229

224230
private int sizeConsideringHeader() {
225-
return localItems.size() + (header != null ? 1 : 0);
231+
return localItems.size() + (hasHeader() ? 1 : 0);
226232
}
227233

228234
public ArrayList<LocalItem> getItemsList() {
@@ -232,7 +238,7 @@ public ArrayList<LocalItem> getItemsList() {
232238
@Override
233239
public int getItemCount() {
234240
int count = localItems.size();
235-
if (header != null) {
241+
if (hasHeader()) {
236242
count++;
237243
}
238244
if (footer != null && showFooter) {
@@ -242,7 +248,7 @@ public int getItemCount() {
242248
if (DEBUG) {
243249
Log.d(TAG, "getItemCount() called, count = " + count + ", "
244250
+ "localItems.size() = " + localItems.size() + ", "
245-
+ "header = " + header + ", footer = " + footer + ", "
251+
+ "header = " + hasHeader() + ", footer = " + footer + ", "
246252
+ "showFooter = " + showFooter);
247253
}
248254
return count;
@@ -255,9 +261,9 @@ public int getItemViewType(int position) {
255261
Log.d(TAG, "getItemViewType() called with: position = [" + position + "]");
256262
}
257263

258-
if (header != null && position == 0) {
264+
if (hasHeader() && position == 0) {
259265
return HEADER_TYPE;
260-
} else if (header != null) {
266+
} else if (hasHeader()) {
261267
position--;
262268
}
263269
if (footer != null && position == localItems.size() && showFooter) {
@@ -318,7 +324,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull final ViewGroup paren
318324
}
319325
switch (type) {
320326
case HEADER_TYPE:
321-
return new HeaderFooterHolder(header);
327+
return new HeaderFooterHolder(headerSupplier.get());
322328
case FOOTER_TYPE:
323329
return new HeaderFooterHolder(footer);
324330
case LOCAL_PLAYLIST_HOLDER_TYPE:
@@ -366,14 +372,14 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
366372

367373
if (holder instanceof LocalItemHolder) {
368374
// If header isn't null, offset the items by -1
369-
if (header != null) {
375+
if (hasHeader()) {
370376
position--;
371377
}
372378

373379
((LocalItemHolder) holder)
374380
.updateFromItem(localItems.get(position), recordManager, dateTimeFormatter);
375-
} else if (holder instanceof HeaderFooterHolder && position == 0 && header != null) {
376-
((HeaderFooterHolder) holder).view = header;
381+
} else if (holder instanceof HeaderFooterHolder && position == 0 && hasHeader()) {
382+
((HeaderFooterHolder) holder).view = headerSupplier.get();
377383
} else if (holder instanceof HeaderFooterHolder && position == sizeConsideringHeader()
378384
&& footer != null && showFooter) {
379385
((HeaderFooterHolder) holder).view = footer;
@@ -387,10 +393,10 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, fina
387393
for (final Object payload : payloads) {
388394
if (payload instanceof StreamStateEntity) {
389395
((LocalItemHolder) holder).updateState(localItems
390-
.get(header == null ? position : position - 1), recordManager);
396+
.get(hasHeader() ? position - 1 : position), recordManager);
391397
} else if (payload instanceof Boolean) {
392398
((LocalItemHolder) holder).updateState(localItems
393-
.get(header == null ? position : position - 1), recordManager);
399+
.get(hasHeader() ? position - 1 : position), recordManager);
394400
}
395401
}
396402
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
import androidx.annotation.NonNull;
1515
import androidx.annotation.Nullable;
16-
import androidx.viewbinding.ViewBinding;
1716

1817
import com.evernote.android.state.State;
1918
import com.google.android.material.snackbar.Snackbar;
@@ -45,6 +44,7 @@
4544
import java.util.Comparator;
4645
import java.util.List;
4746
import java.util.Objects;
47+
import java.util.function.Supplier;
4848

4949
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
5050
import io.reactivex.rxjava3.disposables.CompositeDisposable;
@@ -126,12 +126,12 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
126126
}
127127

128128
@Override
129-
protected ViewBinding getListHeader() {
129+
protected Supplier<View> getListHeaderSupplier() {
130130
headerBinding = StatisticPlaylistControlBinding.inflate(activity.getLayoutInflater(),
131131
itemsList, false);
132132
playlistControlBinding = headerBinding.playlistControl;
133133

134-
return headerBinding;
134+
return headerBinding::getRoot;
135135
}
136136

137137
@Override

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import androidx.appcompat.app.AlertDialog;
3030
import androidx.recyclerview.widget.ItemTouchHelper;
3131
import androidx.recyclerview.widget.RecyclerView;
32-
import androidx.viewbinding.ViewBinding;
3332

3433
import com.evernote.android.state.State;
3534
import org.reactivestreams.Subscriber;
@@ -67,6 +66,7 @@
6766
import java.util.Collections;
6867
import java.util.List;
6968
import java.util.concurrent.atomic.AtomicBoolean;
69+
import java.util.function.Supplier;
7070
import java.util.stream.Collectors;
7171

7272
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
@@ -158,14 +158,14 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
158158
}
159159

160160
@Override
161-
protected ViewBinding getListHeader() {
161+
protected Supplier<View> getListHeaderSupplier() {
162162
headerBinding = LocalPlaylistHeaderBinding.inflate(activity.getLayoutInflater(), itemsList,
163-
false);
163+
false);
164164
playlistControlBinding = headerBinding.playlistControl;
165165

166166
headerBinding.playlistTitleView.setSelected(true);
167167

168-
return headerBinding;
168+
return headerBinding::getRoot;
169169
}
170170

171171
@Override

0 commit comments

Comments
 (0)