From 776ddddc8374e2bc2cabb189ca4c4ad6ec5b990c Mon Sep 17 00:00:00 2001
From: Grady Clark <50427197+GradyClark@users.noreply.github.com>
Date: Tue, 21 Apr 2020 01:03:42 -0500
Subject: [PATCH] fixed naming and formatting issues

---
 .../local/playlist/LocalPlaylistFragment.java    | 16 ++++++++--------
 app/src/main/res/menu/menu_local_playlist.xml    |  2 +-
 app/src/main/res/values/strings.xml              |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index 088615f9c..462bffb4e 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -259,8 +259,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     @Override
     public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
         if (DEBUG) {
-            Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu
-                    + "], inflater = [" + inflater + "]");
+            Log.d(TAG, "onCreateOptionsMenu() called with: "
+                    + "menu = [" + menu + "], inflater = [" + inflater + "]");
         }
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.menu_local_playlist, menu);
@@ -361,7 +361,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.menu_item_removeWatched:
+            case R.id.menu_item_remove_watched:
                 new AlertDialog.Builder(getActivity())
                         .setMessage(R.string.remove_watched_popup_warning)
                         .setTitle(R.string.remove_watched_popup_title)
@@ -391,16 +391,16 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
         removeWatchedDisposable = playlistManager.getPlaylistStreams(playlistId)
                 .subscribeOn(Schedulers.io())
                 .map((List<PlaylistStreamEntry> playlist) -> {
-                    //Playlist data
+                    // Playlist data
                     Iterator<PlaylistStreamEntry> playlistIter = playlist.iterator();
 
-                    //History data
+                    // History data
                     HistoryRecordManager recordManager = new HistoryRecordManager(getContext());
                     Iterator<StreamHistoryEntry> historyIter = recordManager
                             .getStreamHistorySortedById().blockingFirst().iterator();
                     Iterator<StreamStateEntity> streamStatesIter = null;
 
-                    //Remove Watched, Functionality data
+                    // Remove Watched, Functionality data
                     List<PlaylistStreamEntry> notWatchedItems = new ArrayList<>();
                     boolean thumbnailVideoRemoved = false;
 
@@ -471,8 +471,8 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
 
                     hideLoading();
 
-                    //If this is not done, 'removeWatchedDisposable', will never be disposed of.
-                    //Why: Because using the 'removePartiallyWatched' in this functions parms,
+                    // If this is not done, 'removeWatchedDisposable', will never be disposed of.
+                    // Why: Because using the 'removePartiallyWatched' in this functions parms,
                     // prevents it from disposing. Exact reason for this behavior is unknown
                     removeWatchedDisposable.dispose();
                     removeWatchedDisposable = null;
diff --git a/app/src/main/res/menu/menu_local_playlist.xml b/app/src/main/res/menu/menu_local_playlist.xml
index 4c499a51d..fdca9b31f 100644
--- a/app/src/main/res/menu/menu_local_playlist.xml
+++ b/app/src/main/res/menu/menu_local_playlist.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <item
-        android:id="@+id/menu_item_removeWatched"
+        android:id="@+id/menu_item_remove_watched"
         android:title="@string/remove_watched"
         app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8671565f9..ae02b5797 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -603,7 +603,7 @@
     <string name="systems_language">System default</string>
     <string name="remove_watched">Remove watched</string>
     <string name="remove_watched_popup_title">Remove watched videos?</string>
-    <string name="remove_watched_popup_warning">"Videos that have been watched\nbefore and after being added to the playlist will be removed.\nAre you sure? This cannot be undone!</string>
+    <string name="remove_watched_popup_warning">Videos that have been watched before and after being added to the playlist will be removed.\nAre you sure? This cannot be undone!</string>
     <string name="remove_watched_popup_yes_and_partially_watched_videos">Yes, and partially watched videos</string>
     <string name="new_seek_duration_toast">Due to ExoPlayer constraints the seek duration was set to %d seconds</string>
     <!-- Time duration plurals -->