From 53a1833e26e949e3ec541f40a549c3b8ca3d3247 Mon Sep 17 00:00:00 2001
From: John Zhen Mo <zhenmogukl@gmail.com>
Date: Tue, 30 Jan 2018 18:17:27 -0800
Subject: [PATCH] -Increased save join debounce time to 2 seconds. -Added add
 to playlist option for videos available as base list items. -Moved video
 count to second row on local playlist header. -Removed bottom line on
 playlist control UI.

---
 .../fragments/list/BaseListFragment.java      |  33 ++--
 .../local/LocalPlaylistFragment.java          |   2 +-
 .../main/res/layout/local_playlist_header.xml |  17 +-
 app/src/main/res/layout/playlist_control.xml  | 157 ++++++++----------
 4 files changed, 100 insertions(+), 109 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index aad6e95fa..8bc68a4c7 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -29,6 +29,7 @@ import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.StateSaver;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Queue;
 
@@ -194,22 +195,26 @@ public abstract class BaseListFragment<I, N> extends BaseStateFragment<I> implem
 
         final String[] commands = new String[]{
                 context.getResources().getString(R.string.enqueue_on_background),
-                context.getResources().getString(R.string.enqueue_on_popup)
+                context.getResources().getString(R.string.enqueue_on_popup),
+                context.getResources().getString(R.string.append_playlist)
         };
 
-        final DialogInterface.OnClickListener actions = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                switch (i) {
-                    case 0:
-                        NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
-                        break;
-                    case 1:
-                        NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
-                        break;
-                    default:
-                        break;
-                }
+        final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+            switch (i) {
+                case 0:
+                    NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item));
+                    break;
+                case 1:
+                    NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item));
+                    break;
+                case 2:
+                    if (getFragmentManager() != null) {
+                        PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item))
+                                .show(getFragmentManager(), TAG);
+                    }
+                    break;
+                default:
+                    break;
             }
         };
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistFragment.java
index 7d73b14b9..0a6f9158e 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/local/LocalPlaylistFragment.java
@@ -47,7 +47,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
 public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistStreamEntry>, Void> {
 
-    private static final long SAVE_DEBOUNCE_MILLIS = 1000;
+    private static final long SAVE_DEBOUNCE_MILLIS = 2000;
 
     private View headerRootLayout;
     private TextView headerTitleView;
diff --git a/app/src/main/res/layout/local_playlist_header.xml b/app/src/main/res/layout/local_playlist_header.xml
index 4d686c515..ab5dd4440 100644
--- a/app/src/main/res/layout/local_playlist_header.xml
+++ b/app/src/main/res/layout/local_playlist_header.xml
@@ -5,20 +5,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:padding="6dp"
     android:background="?attr/contrast_background_color">
 
     <TextView
         android:id="@+id/playlist_title_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="6dp"
-        android:paddingBottom="6dp"
-        android:paddingLeft="12dp"
-        android:paddingRight="12dp"
+        android:padding="6dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_toLeftOf="@id/playlist_stream_count"
-        android:layout_toStartOf="@id/playlist_stream_count"
+        android:layout_alignParentTop="true"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
@@ -35,9 +32,11 @@
         android:id="@+id/playlist_stream_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/playlist_title_view"
-        android:layout_alignParentRight="true"
-        android:padding="6dp"
+        android:layout_below="@id/playlist_title_view"
+        android:layout_alignParentLeft="true"
+        android:paddingLeft="6dp"
+        android:paddingRight="6dp"
+        android:paddingBottom="6dp"
         android:ellipsize="end"
         android:gravity="right|center_vertical"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/playlist_control.xml b/app/src/main/res/layout/playlist_control.xml
index 01632f9fc..1135aedd5 100644
--- a/app/src/main/res/layout/playlist_control.xml
+++ b/app/src/main/res/layout/playlist_control.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout
+<LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
@@ -10,91 +10,78 @@
     tools:visibility="visible">
 
     <LinearLayout
-        android:id="@+id/playlist_panel"
+        android:id="@+id/playlist_ctrl_play_bg_button"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/playlist_ctrl_height">
-        <LinearLayout
-            android:id="@+id/playlist_ctrl_play_bg_button"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="@string/controls_background_title"
-                android:textSize="@dimen/channel_rss_title_size"
-                android:textColor="?attr/colorAccent"
-                android:drawablePadding="4dp"
-                android:drawableLeft="?attr/audio"
-                android:drawableStart="?attr/audio"/>
-        </LinearLayout>
-
-        <View android:id="@+id/anchorLeft"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:clickable="false"
-            android:layout_marginBottom="@dimen/playlist_ctrl_seperator_margin"
-            android:layout_marginTop="@dimen/playlist_ctrl_seperator_margin"
-            android:background="?attr/colorAccent"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground"
-            android:id="@+id/playlist_ctrl_play_all_button">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="@string/play_all"
-                android:textSize="@dimen/channel_rss_title_size"
-                android:textColor="?attr/colorAccent"/>
-        </LinearLayout>
-
-        <View android:id="@+id/anchorRight"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:clickable="false"
-            android:layout_marginBottom="@dimen/playlist_ctrl_seperator_margin"
-            android:layout_marginTop="@dimen/playlist_ctrl_seperator_margin"
-            android:background="?attr/colorAccent"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground"
-            android:id="@+id/playlist_ctrl_play_popup_button">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:text="@string/controls_popup_title"
-                android:textSize="@dimen/channel_rss_title_size"
-                android:textColor="?attr/colorAccent"
-                android:drawablePadding="4dp"
-                android:drawableLeft="?attr/popup"
-                android:drawableStart="?attr/popup"/>
-        </LinearLayout>
+        android:layout_height="@dimen/playlist_ctrl_height"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?attr/selectableItemBackground">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/controls_background_title"
+            android:textSize="@dimen/channel_rss_title_size"
+            android:textColor="?attr/colorAccent"
+            android:drawablePadding="4dp"
+            android:drawableLeft="?attr/audio"
+            android:drawableStart="?attr/audio"/>
     </LinearLayout>
 
-    <View
+    <View android:id="@+id/anchorLeft"
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:clickable="false"
+        android:layout_marginBottom="@dimen/playlist_ctrl_seperator_margin"
+        android:layout_marginTop="@dimen/playlist_ctrl_seperator_margin"
+        android:background="?attr/colorAccent"/>
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_below="@+id/playlist_panel"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:background="?attr/separator_color"/>
-</RelativeLayout>
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?attr/selectableItemBackground"
+        android:id="@+id/playlist_ctrl_play_all_button">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/play_all"
+            android:textSize="@dimen/channel_rss_title_size"
+            android:textColor="?attr/colorAccent"/>
+    </LinearLayout>
+
+    <View android:id="@+id/anchorRight"
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:clickable="false"
+        android:layout_marginBottom="@dimen/playlist_ctrl_seperator_margin"
+        android:layout_marginTop="@dimen/playlist_ctrl_seperator_margin"
+        android:background="?attr/colorAccent"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?attr/selectableItemBackground"
+        android:id="@+id/playlist_ctrl_play_popup_button">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/controls_popup_title"
+            android:textSize="@dimen/channel_rss_title_size"
+            android:textColor="?attr/colorAccent"
+            android:drawablePadding="4dp"
+            android:drawableLeft="?attr/popup"
+            android:drawableStart="?attr/popup"/>
+    </LinearLayout>
+</LinearLayout>