Use contrast background for history date headers

Cellulose-Type-C · Cellulose-Type-C · commit a0e8b2e08307 · 2026-03-21T11:06:49.000+05:30
diff --git a/app/src/main/java/org/schabi/newpipe/database/LocalItem.kt b/app/src/main/java/org/schabi/newpipe/database/LocalItem.kt
@@ -14,6 +14,8 @@ interface LocalItem {
         PLAYLIST_REMOTE_ITEM,
 
         PLAYLIST_STREAM_ITEM,
-        STATISTIC_STREAM_ITEM
+        STATISTIC_STREAM_ITEM,
+
+        DATE_HEADER
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/database/history/model/DateHeaderItem.kt b/app/src/main/java/org/schabi/newpipe/database/history/model/DateHeaderItem.kt
@@ -0,0 +1,11 @@
+package org.schabi.newpipe.database.history.model
+
+import java.time.LocalDate
+import org.schabi.newpipe.database.LocalItem
+
+data class DateHeaderItem(
+    val date: LocalDate
+) : LocalItem {
+    override val localItemType: LocalItem.LocalItemType
+        get() = LocalItem.LocalItemType.DATE_HEADER
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -2,15 +2,19 @@
 
 import android.content.Context;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.history.model.DateHeaderItem;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;
 import org.schabi.newpipe.info_list.ItemViewMode;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
@@ -66,6 +70,8 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
     private static final int HEADER_TYPE = 0;
     private static final int FOOTER_TYPE = 1;
 
+    private static final int DATE_HEADER_HOLDER_TYPE = 0x4000;
+
     private static final int STREAM_STATISTICS_HOLDER_TYPE = 0x1000;
     private static final int STREAM_PLAYLIST_HOLDER_TYPE = 0x1001;
     private static final int STREAM_STATISTICS_GRID_HOLDER_TYPE = 0x1002;
@@ -311,6 +317,8 @@ public int getItemViewType(int position) {
                 } else {
                     return STREAM_STATISTICS_HOLDER_TYPE;
                 }
+            case DATE_HEADER:
+                return DATE_HEADER_HOLDER_TYPE;
             default:
                 Log.e(TAG, "No holder type has been considered for item: ["
                         + item.getLocalItemType() + "]");
@@ -331,6 +339,9 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull final ViewGroup paren
                 return new HeaderFooterHolder(headerSupplier.get());
             case FOOTER_TYPE:
                 return new HeaderFooterHolder(footer);
+            case DATE_HEADER_HOLDER_TYPE:
+                return new DateHeaderHolder(LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.list_date_header_item, parent, false));
             case LOCAL_PLAYLIST_HOLDER_TYPE:
                 return new LocalPlaylistItemHolder(localItemBuilder, parent);
             case LOCAL_PLAYLIST_GRID_HOLDER_TYPE:
@@ -374,7 +385,18 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
                     + "position = [" + position + "]");
         }
 
-        if (holder instanceof LocalItemHolder) {
+        if (holder instanceof DateHeaderHolder) {
+            // If header isn't null, offset the items by -1
+            if (hasHeader()) {
+                position--;
+            }
+
+            final LocalItem localItem = localItems.get(position);
+            if (localItem instanceof DateHeaderItem) {
+                ((DateHeaderHolder) holder).dateHeaderText.setText(
+                        dateTimeFormatter.format(((DateHeaderItem) localItem).getDate()));
+            }
+        } else if (holder instanceof LocalItemHolder) {
             // If header isn't null, offset the items by -1
             if (hasHeader()) {
                 position--;
@@ -408,12 +430,23 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, fina
         }
     }
 
+    private static class DateHeaderHolder extends RecyclerView.ViewHolder {
+        private final TextView dateHeaderText;
+
+        DateHeaderHolder(@NonNull final View itemView) {
+            super(itemView);
+            dateHeaderText = itemView.findViewById(R.id.dateHeaderText);
+        }
+    }
+
+
     public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) {
         return new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(final int position) {
                 final int type = getItemViewType(position);
-                return type == HEADER_TYPE || type == FOOTER_TYPE ? spanCount : 1;
+                return type == HEADER_TYPE || type == FOOTER_TYPE
+                        || type == DATE_HEADER_HOLDER_TYPE ? spanCount : 1;
             }
         };
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -21,6 +21,7 @@
 import org.reactivestreams.Subscription;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
+import org.schabi.newpipe.database.history.model.DateHeaderItem;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.PlaylistControlBinding;
@@ -39,6 +40,7 @@
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.PlayButtonHelper;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -65,7 +67,7 @@ public class StatisticsPlaylistFragment
     private Subscription databaseSubscription;
     private HistoryRecordManager recordManager;
 
-    private List<StreamStatisticsEntry> processResult(final List<StreamStatisticsEntry> results) {
+    private List<LocalItem> processResult(final List<StreamStatisticsEntry> results) {
         final Comparator<StreamStatisticsEntry> comparator;
         switch (sortMode) {
             case LAST_PLAYED:
@@ -77,8 +79,26 @@ private List<StreamStatisticsEntry> processResult(final List<StreamStatisticsEnt
             default:
                 return null;
         }
+
         Collections.sort(results, comparator.reversed());
-        return results;
+
+        if (sortMode == StatisticSortMode.MOST_PLAYED) {
+            return new ArrayList<>(results);
+        }
+
+        final List<LocalItem> itemsWithHeaders = new ArrayList<>(results.size());
+        LocalDate lastDate = null;
+
+        for (final StreamStatisticsEntry entry : results) {
+            final LocalDate entryDate = entry.getLatestAccessDate().toLocalDate();
+            if (!entryDate.equals(lastDate)) {
+                itemsWithHeaders.add(new DateHeaderItem(entryDate));
+                lastDate = entryDate;
+            }
+            itemsWithHeaders.add(entry);
+        }
+
+        return itemsWithHeaders;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -314,7 +334,22 @@ private void toggleSortMode() {
     }
 
     private PlayQueue getPlayQueueStartingAt(final StreamStatisticsEntry infoItem) {
-        return getPlayQueue(Math.max(itemListAdapter.getItemsList().indexOf(infoItem), 0));
+        if (itemListAdapter == null) {
+            return new SinglePlayQueue(Collections.emptyList(), 0);
+        }
+
+        final List<LocalItem> items = itemListAdapter.getItemsList();
+        int streamIndex = 0;
+        for (final LocalItem item : items) {
+            if (item == infoItem) {
+                break;
+            }
+            if (item instanceof StreamStatisticsEntry) {
+                streamIndex++;
+            }
+        }
+
+        return getPlayQueue(streamIndex);
     }
 
     private void showInfoItemDialog(final StreamStatisticsEntry item) {
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
@@ -69,12 +69,10 @@ public LocalStatisticStreamItemHolder(final LocalItemBuilder itemBuilder,
         itemProgressView = itemView.findViewById(R.id.itemProgressView);
     }
 
-    private String getStreamInfoDetailLine(final StreamStatisticsEntry entry,
-                                           final DateTimeFormatter dateTimeFormatter) {
+    private String getStreamInfoDetailLine(final StreamStatisticsEntry entry) {
         return Localization.concatenateStrings(
                 // watchCount
                 Localization.shortViewCount(itemBuilder.getContext(), entry.getWatchCount()),
-                dateTimeFormatter.format(entry.getLatestAccessDate()),
                 // serviceName
                 ServiceHelper.getNameOfServiceById(entry.getStreamEntity().getServiceId()));
     }
@@ -113,7 +111,7 @@ public void updateFromItem(final LocalItem localItem,
         }
 
         if (itemAdditionalDetails != null) {
-            itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateTimeFormatter));
+            itemAdditionalDetails.setText(getStreamInfoDetailLine(item));
         }
 
         // Default thumbnail is shown on error, while loading and if the url is empty
diff --git a/app/src/main/res/layout/list_date_header_item.xml b/app/src/main/res/layout/list_date_header_item.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dateHeaderText"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/contrast_background_color"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="12dp"
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textStyle="bold" />

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ interface LocalItem {`
`14`	`14`	`PLAYLIST_REMOTE_ITEM,`
`15`	`15`
`16`	`16`	`PLAYLIST_STREAM_ITEM,`
`17`		`- STATISTIC_STREAM_ITEM`
	`17`	`+ STATISTIC_STREAM_ITEM,`
	`18`	`+`
	`19`	`+ DATE_HEADER`
`18`	`20`	`}`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,10 @@ public LocalStatisticStreamItemHolder(final LocalItemBuilder itemBuilder,`
`69`	`69`	`itemProgressView = itemView.findViewById(R.id.itemProgressView);`
`70`	`70`	`}`
`71`	`71`
`72`		`- private String getStreamInfoDetailLine(final StreamStatisticsEntry entry,`
`73`		`- final DateTimeFormatter dateTimeFormatter) {`
	`72`	`+ private String getStreamInfoDetailLine(final StreamStatisticsEntry entry) {`
`74`	`73`	`return Localization.concatenateStrings(`
`75`	`74`	`// watchCount`
`76`	`75`	`Localization.shortViewCount(itemBuilder.getContext(), entry.getWatchCount()),`
`77`		`- dateTimeFormatter.format(entry.getLatestAccessDate()),`
`78`	`76`	`// serviceName`
`79`	`77`	`ServiceHelper.getNameOfServiceById(entry.getStreamEntity().getServiceId()));`
`80`	`78`	`}`
`@@ -113,7 +111,7 @@ public void updateFromItem(final LocalItem localItem,`
`113`	`111`	`}`
`114`	`112`
`115`	`113`	`if (itemAdditionalDetails != null) {`
`116`		`- itemAdditionalDetails.setText(getStreamInfoDetailLine(item, dateTimeFormatter));`
	`114`	`+ itemAdditionalDetails.setText(getStreamInfoDetailLine(item));`
`117`	`115`	`}`
`118`	`116`
`119`	`117`	`// Default thumbnail is shown on error, while loading and if the url is empty`