Merge branch 'play' into dev

app/src/main/java/org/schabi/newpipe/util/Localization.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.support.annotation.PluralsRes;
 import android.support.annotation.StringRes;
 import android.text.TextUtils;
@@ -14,7 +15,9 @@ import java.text.DateFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 
 /*
@@ -39,9 +42,33 @@ import java.util.Locale;
 
 public class Localization {
 
+    public final static String DOT_SEPARATOR = " • ";
+
     private Localization() {
     }
 
+    @NonNull
+    public static String concatenateStrings(final String... strings) {
+        return concatenateStrings(Arrays.asList(strings));
+    }
+
+    @NonNull
+    public static String concatenateStrings(final List<String> strings) {
+        if (strings.isEmpty()) return "";
+
+        final StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(strings.get(0));
+
+        for (int i = 1; i < strings.size(); i++) {
+            final String string = strings.get(i);
+            if (!TextUtils.isEmpty(string)) {
+                stringBuilder.append(DOT_SEPARATOR).append(strings.get(i));
+            }
+        }
+
+        return stringBuilder.toString();
+    }
+
     public static Locale getPreferredLocale(Context context) {
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
 

app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java

@@ -33,6 +33,9 @@ import org.schabi.newpipe.fragments.list.feed.FeedFragment;
 import org.schabi.newpipe.fragments.list.kiosk.KioskFragment;
 import org.schabi.newpipe.fragments.list.playlist.PlaylistFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
+import org.schabi.newpipe.fragments.local.bookmark.LocalPlaylistFragment;
+import org.schabi.newpipe.fragments.local.bookmark.MostPlayedFragment;
+import org.schabi.newpipe.fragments.local.bookmark.LastPlayedFragment;
 import org.schabi.newpipe.history.HistoryActivity;
 import org.schabi.newpipe.player.BackgroundPlayer;
 import org.schabi.newpipe.player.BackgroundPlayerActivity;
@@ -322,6 +325,30 @@ public class NavigationHelper {
                 .commit();
     }
 
+    public static void openLocalPlaylistFragment(FragmentManager fragmentManager, long playlistId, String name) {
+        if (name == null) name = "";
+        fragmentManager.beginTransaction()
+                .setCustomAnimations(R.animator.custom_fade_in, R.animator.custom_fade_out, R.animator.custom_fade_in, R.animator.custom_fade_out)
+                .replace(R.id.fragment_holder, LocalPlaylistFragment.getInstance(playlistId, name))
+                .addToBackStack(null)
+                .commit();
+    }
+
+    public static void openLastPlayedFragment(FragmentManager fragmentManager) {
+        fragmentManager.beginTransaction()
+                .setCustomAnimations(R.animator.custom_fade_in, R.animator.custom_fade_out, R.animator.custom_fade_in, R.animator.custom_fade_out)
+                .replace(R.id.fragment_holder, new LastPlayedFragment())
+                .addToBackStack(null)
+                .commit();
+    }
+
+    public static void openMostPlayedFragment(FragmentManager fragmentManager) {
+        fragmentManager.beginTransaction()
+                .setCustomAnimations(R.animator.custom_fade_in, R.animator.custom_fade_out, R.animator.custom_fade_in, R.animator.custom_fade_out)
+                .replace(R.id.fragment_holder, new MostPlayedFragment())
+                .addToBackStack(null)
+                .commit();
+    }
     /*//////////////////////////////////////////////////////////////////////////
     // Through Intents
     //////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/util/OnClickGesture.java

@@ -0,0 +1,16 @@
+package org.schabi.newpipe.util;
+
+import android.support.v7.widget.RecyclerView;
+
+public abstract class OnClickGesture<T> {
+
+    public abstract void selected(T selectedItem);
+
+    public void held(T selectedItem) {
+        // Optional gesture
+    }
+
+    public void drag(T selectedItem, RecyclerView.ViewHolder viewHolder) {
+        // Optional gesture
+    }
+}