- Changed Text to "Hide Watched"

- Implemented isFinished in StreamStatisticsEntry.kt

Author: SandipLow

app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.kt

@@ -9,13 +9,14 @@ package org.schabi.newpipe.database.stream
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
 import androidx.room.Ignore
-import java.time.OffsetDateTime
 import org.schabi.newpipe.database.LocalItem
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity
 import org.schabi.newpipe.database.stream.model.StreamEntity
+import org.schabi.newpipe.database.stream.model.StreamStateEntity.Companion.PLAYBACK_FINISHED_END_MILLISECONDS
 import org.schabi.newpipe.database.stream.model.StreamStateEntity.Companion.STREAM_PROGRESS_MILLIS
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.util.image.ImageStrategy
+import java.time.OffsetDateTime
 
 data class StreamStatisticsEntry(
     @Embedded
@@ -52,6 +53,20 @@ data class StreamStatisticsEntry(
         }
     }
 
+    /**
+     * The video will be considered as finished, if the time left is less than
+     * [PLAYBACK_FINISHED_END_MILLISECONDS] and the progress is at least 3/4 of the video length.
+     * The state will be saved anyway, so that it can be shown under stream info items, but the
+     * player will not resume if a state is considered as finished. Finished streams are also the
+     * ones that can be filtered out in the feed fragment.
+     * @return whether the stream is finished or not
+     */
+    fun isFinished(): Boolean {
+        val durationInSeconds = streamEntity.duration
+        return progressMillis >= durationInSeconds * 1000 - PLAYBACK_FINISHED_END_MILLISECONDS &&
+            progressMillis >= durationInSeconds * 1000 * 3 / 4
+    }
+
     companion object {
         const val STREAM_LATEST_DATE = "latestAccess"
         const val STREAM_WATCH_COUNT = "watchCount"

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

@@ -83,7 +83,7 @@ private List<StreamStatisticsEntry> processResult(final List<StreamStatisticsEnt
         // Filter Fully Watched
         if (!includeFullyWatched) {
             return results.stream()
-                    .filter(e -> e.getStreamEntity().getDuration() != e.getProgressMillis() / 1000)
+                    .filter(e -> !e.isFinished())
                     .toList();
         }
 

app/src/main/res/layout/statistic_playlist_control.xml

@@ -8,6 +8,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:baselineAligned="false"
         android:orientation="horizontal">
 
         <RelativeLayout
@@ -66,7 +67,7 @@
                 android:layout_height="50dp"
                 android:layout_toEndOf="@id/fullyWatchedFilterButtonCheckBox"
                 android:gravity="start|center_vertical"
-                android:text="@string/title_fully_watched"
+                android:text="@string/title_hide_watched"
                 android:textSize="15sp"
                 android:textStyle="bold" />
         </RelativeLayout>

app/src/main/res/values/strings.xml

@@ -880,5 +880,5 @@
     <string name="youtube_player_http_403">HTTP error 403 received from server while playing, likely caused by an IP ban or streaming URL deobfuscation issues</string>
     <string name="sign_in_confirm_not_bot_error">%1$s refused to provide data, asking for a login to confirm the requester is not a bot.\n\nYour IP might have been temporarily banned by %1$s, you can wait some time or switch to a different IP (for example by turning on/off a VPN, or by switching from WiFi to mobile data).</string>
     <string name="unsupported_content_in_country">This content is not available for the currently selected content country.\n\nChange your selection from \"Settings > Content > Default content country\".</string>
-    <string name="title_fully_watched">Fully Watched</string>
+    <string name="title_hide_watched">Hide Watched</string>
 </resources>