From 2b41f710a8cfa2ce8237de4a36bcba4b13dca78c Mon Sep 17 00:00:00 2001
From: Nathan Schulzke <nschulzke@gmail.com>
Date: Tue, 27 Jul 2021 13:26:51 -0600
Subject: [PATCH] Change played to watched

---
 .../main/java/org/schabi/newpipe/local/feed/FeedFragment.kt   | 4 ++--
 .../schabi/newpipe/local/history/HistoryRecordManager.java    | 2 +-
 .../main/java/org/schabi/newpipe/util/StreamDialogEntry.java  | 4 ++--
 app/src/main/res/values/strings.xml                           | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
index ab32e5fbb..85fea2efe 100644
--- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
@@ -332,7 +332,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
                     StreamDialogEntry.append_playlist,
                     StreamDialogEntry.share,
                     StreamDialogEntry.open_in_browser,
-                    StreamDialogEntry.mark_as_played
+                    StreamDialogEntry.mark_as_watched
                 )
             )
         } else {
@@ -343,7 +343,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
                     StreamDialogEntry.append_playlist,
                     StreamDialogEntry.share,
                     StreamDialogEntry.open_in_browser,
-                    StreamDialogEntry.mark_as_played
+                    StreamDialogEntry.mark_as_watched
                 )
             )
         }
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
index 3d151bad8..ad1b695cb 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
@@ -82,7 +82,7 @@ public class HistoryRecordManager {
     // Watch History
     ///////////////////////////////////////////////////////
 
-    public Maybe<Long> markAsPlayed(final StreamInfoItem info) {
+    public Maybe<Long> markAsWatched(final StreamInfoItem info) {
         if (!isStreamHistoryEnabled()) {
             return Maybe.empty();
         }
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
index 828e4ebfc..89b48c9a7 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -98,9 +98,9 @@ public enum StreamDialogEntry {
             ShareUtils.openUrlInBrowser(fragment.getContext(), item.getUrl())),
 
 
-    mark_as_played(R.string.mark_as_played, (fragment, item) -> {
+    mark_as_watched(R.string.mark_as_watched, (fragment, item) -> {
         new HistoryRecordManager(fragment.getContext())
-                .markAsPlayed(item)
+                .markAsWatched(item)
                 .onErrorComplete()
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f8c7f4515..dcef62110 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="cancel">Cancel</string>
     <string name="fdroid_vlc_url" translatable="false">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
     <string name="open_in_browser">Open in browser</string>
-    <string name="mark_as_played">Mark as played</string>
+    <string name="mark_as_watched">Mark as watched</string>
     <string name="open_in_popup_mode">Open in popup mode</string>
     <string name="open_with">Open with</string>
     <string name="share">Share</string>
@@ -710,7 +710,7 @@
     <string name="feed_use_dedicated_fetch_method_enable_button">Enable fast mode</string>
     <string name="feed_use_dedicated_fetch_method_disable_button">Disable fast mode</string>
     <string name="feed_use_dedicated_fetch_method_help_text">Do you think feed loading is too slow? If so, try enabling fast loading (you can change it in settings or by pressing the button below).\n\nNewPipe offers two feed loading strategies:\n• Fetching the whole subscription channel, which is slow but complete.\n• Using a dedicated service endpoint, which is fast but usually not complete.\n\nThe difference between the two is that the fast one usually lacks some information, like the item\'s duration or type (can\'t distinguish between live videos and normal ones) and it may return less items.\n\nYouTube is an example of a service that offers this fast method with its RSS feed.\n\nSo the choice boils down to what you prefer: speed or precise information.</string>
-    <string name="feed_toggle_show_played_items">Show played items</string>
+    <string name="feed_toggle_show_played_items">Show watched items</string>
     <string name="content_not_supported">This content is not yet supported by NewPipe.\n\nIt will hopefully be supported in a future version.</string>
     <string name="detail_sub_channel_thumbnail_view_description">Channel\'s avatar thumbnail</string>
     <string name="channel_created_by">Created by %s</string>