Merge branch 'fix-next-video' of git://github.com/mauriciocolli/NewPipe into strfx

Fix list in readme

.travis.yml

@@ -5,35 +5,15 @@ android:
   components:
     # The BuildTools version used by NewPipe
     - tools
-    - build-tools-23.0.3
+    - build-tools-25.0.0
 
     # The SDK version used to compile NewPipe
     - android-25
 
     # Additional components
-    - extra-android-support
     - extra-android-m2repository
-    - extra-google-m2repository
 
-    # Emulators
-    - sys-img-armeabi-v7a-android-21
-    - sys-img-armeabi-v7a-android-19
-    - sys-img-armeabi-v7a-android-15
-
-env:
-  global:
-    - ADB_INSTALL_TIMEOUT=8 # minutes (2 by default)
-    - GRADLE_OPTS=-Xmx512m # give gradle more memory since it seem to fail otherwise
-  matrix:
-    - ANDROID_TARGET=android-21  ANDROID_ABI=armeabi-v7a
-
-before_script:
-  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
-
-script: ./gradlew --info build connectedCheck
+script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
 
 licenses:
   - '.+'

README.md

@@ -37,23 +37,27 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Listen to YouTube videos (experimental)
 * Select the streaming player to watch the video with
 * Download videos 
-* Download audio only * Open a video in Kodi
+* Download audio only
+* Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
 * Watch age restricted material
 * Display general information about channels
 * Search channels
+* Watch videos from a channel
+* Orbot/Tor support (not yet directly)
 
 ### Coming Features
 
-* Orbot/Tor support
 * Bookmarks
 * View history
 * Search history
 * Subscribe to channels
-* Watch videos from a channel
 * Search/Watch Playlists
 * Queeing videos
+* Subtitles support
+* 1080p support
+* livestream support
 * ... and many more
 
 ### Multiservice support

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '23.0.3'
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 25
-        versionName "0.8.11"
+        versionCode 27
+        versionName "0.9.0"
     }
     buildTypes {
         release {
@@ -32,6 +32,9 @@ android {
 
 dependencies {
     testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.json:json:20160810'
+
     compile 'com.android.support:appcompat-v7:25.1.0'
     compile 'com.android.support:support-v4:25.1.0'
     compile 'com.android.support:design:25.1.0'
@@ -42,11 +45,8 @@ dependencies {
     compile 'de.hdodenhof:circleimageview:2.0.0'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'com.github.nirhart:parallaxscroll:1.0'
-    compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.nononsenseapps:filepicker:3.0.0'
     compile 'ch.acra:acra:4.9.0'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.json:json:20160810'
+    compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
 }

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
         android:name=".App"
@@ -50,24 +51,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleInstance"
-            android:theme="@style/PlayerTheme">
-            <intent-filter>
-                <action android:name="org.schabi.newpipe.exoplayer.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:scheme="content" />
-                <data android:scheme="asset" />
-                <data android:scheme="file" />
-            </intent-filter>
-        </activity>
-
-        <service
-            android:name=".player.BackgroundPlayer"
-            android:exported="false"
-            android:label="@string/background_player_name" />
+            android:theme="@style/PlayerTheme"/>
 
         <activity
             android:name=".settings.SettingsActivity"
@@ -137,6 +121,7 @@
                 <data android:host="www.youtube.com" />
                 <!-- video prefix -->
                 <data android:pathPrefix="/v/" />
+                <data android:pathPrefix="/embed/" />
                 <data android:pathPrefix="/watch" />
                 <data android:pathPrefix="/attribution_link" />
                 <!-- channel prefix -->
@@ -175,6 +160,67 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".PopupActivity"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:label="@string/popup_mode_share_menu_title">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtube.com" />
+                <data android:host="m.youtube.com" />
+                <data android:host="www.youtube.com" />
+                <!-- video prefix -->
+                <data android:pathPrefix="/v/" />
+                <data android:pathPrefix="/embed/" />
+                <data android:pathPrefix="/watch" />
+                <data android:pathPrefix="/attribution_link" />
+                <!-- channel prefix -->
+                <data android:pathPrefix="/channel/"/>
+                <data android:pathPrefix="/user/"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtu.be" />
+                <data android:pathPrefix="/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="vnd.youtube" />
+                <data android:scheme="vnd.youtube.launch" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+
+        <service android:name=".player.PopupVideoPlayer"/>
+
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/org/schabi/newpipe/ChannelActivity.java

@@ -19,7 +19,7 @@ import android.widget.Toast;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
@@ -31,10 +31,12 @@ import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.settings.SettingsActivity;
 import org.schabi.newpipe.util.NavStack;
-import java.io.IOException;
-import static android.os.Build.VERSION.SDK_INT;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.io.IOException;
+
+import static android.os.Build.VERSION.SDK_INT;
+
 
 /**
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -147,6 +149,7 @@ public class ChannelActivity extends AppCompatActivity {
             serviceId = savedInstanceState.getInt(NavStack.SERVICE_ID);
             NavStack.getInstance()
                     .restoreSavedInstanceState(savedInstanceState);
+            handleIntent(getIntent());
         }
 
     }
@@ -298,7 +301,7 @@ public class ChannelActivity extends AppCompatActivity {
                     postNewErrorToast(h, R.string.network_error);
                     ioe.printStackTrace();
                 } catch(ParsingException pe) {
-                    ErrorActivity.reportError(h, ChannelActivity.this, pe, VideoItemDetailFragment.class, null,
+                    ErrorActivity.reportError(h, ChannelActivity.this, pe, VideoItemDetailActivity.class, null,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
                                     service.getServiceInfo().name, channelUrl, R.string.parsing_error));
                     h.post(new Runnable() {
@@ -313,7 +316,7 @@ public class ChannelActivity extends AppCompatActivity {
                     if(service != null) {
                         name = service.getServiceInfo().name;
                     }
-                    ErrorActivity.reportError(h, ChannelActivity.this, ex, VideoItemDetailFragment.class, null,
+                    ErrorActivity.reportError(h, ChannelActivity.this, ex, VideoItemDetailActivity.class, null,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
                                     name, channelUrl, R.string.parsing_error));
                     h.post(new Runnable() {
@@ -324,7 +327,7 @@ public class ChannelActivity extends AppCompatActivity {
                     });
                     ex.printStackTrace();
                 } catch(Exception e) {
-                    ErrorActivity.reportError(h, ChannelActivity.this, e, VideoItemDetailFragment.class, null,
+                    ErrorActivity.reportError(h, ChannelActivity.this, e, VideoItemDetailActivity.class, null,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_CHANNEL,
                                     service.getServiceInfo().name, channelUrl, R.string.general_error));
                     h.post(new Runnable() {

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -85,9 +85,4 @@ public class MainActivity extends AppCompatActivity {
                 return super.onOptionsItemSelected(item);
         }
     }
-
-    @Override
-    public void onBackPressed() {
-        //ignore back
-    }
 }

app/src/main/java/org/schabi/newpipe/PopupActivity.java

@@ -0,0 +1,136 @@
+package org.schabi.newpipe;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.player.PopupVideoPlayer;
+import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.PermissionHelper;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * This activity is thought to open video streams form an external app using the popup playser.
+ */
+
+public class PopupActivity extends Activity {
+    private static final String TAG = RouterActivity.class.toString();
+
+    /**
+     * Removes invisible separators (\p{Z}) and punctuation characters including
+     * brackets (\p{P}). See http://www.regular-expressions.info/unicode.html for
+     * more details.
+     */
+    private final static String REGEX_REMOVE_FROM_URL = "[\\p{Z}\\p{P}]";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        handleIntent(getIntent());
+        finish();
+    }
+
+
+    private static String removeHeadingGibberish(final String input) {
+        int start = 0;
+        for (int i = input.indexOf("://") - 1; i >= 0; i--) {
+            if (!input.substring(i, i + 1).matches("\\p{L}")) {
+                start = i + 1;
+                break;
+            }
+        }
+        return input.substring(start, input.length());
+    }
+
+    private static String trim(final String input) {
+        if (input == null || input.length() < 1) {
+            return input;
+        } else {
+            String output = input;
+            while (output.length() > 0 && output.substring(0, 1).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(1);
+            }
+            while (output.length() > 0
+                    && output.substring(output.length() - 1, output.length()).matches(REGEX_REMOVE_FROM_URL)) {
+                output = output.substring(0, output.length() - 1);
+            }
+            return output;
+        }
+    }
+
+    /**
+     * Retrieves all Strings which look remotely like URLs from a text.
+     * Used if NewPipe was called through share menu.
+     *
+     * @param sharedText text to scan for URLs.
+     * @return potential URLs
+     */
+    private String[] getUris(final String sharedText) {
+        final Collection<String> result = new HashSet<>();
+        if (sharedText != null) {
+            final String[] array = sharedText.split("\\p{Space}");
+            for (String s : array) {
+                s = trim(s);
+                if (s.length() != 0) {
+                    if (s.matches(".+://.+")) {
+                        result.add(removeHeadingGibberish(s));
+                    } else if (s.matches(".+\\..+")) {
+                        result.add("http://" + s);
+                    }
+                }
+            }
+        }
+        return result.toArray(new String[result.size()]);
+    }
+
+    private void handleIntent(Intent intent) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                && !PermissionHelper.checkSystemAlertWindowPermission(this)) {
+            Toast.makeText(this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+            return;
+        }
+        String videoUrl = "";
+        StreamingService service = null;
+
+        // first gather data and find service
+        if (intent.getData() != null) {
+            // this means the video was called though another app
+            videoUrl = intent.getData().toString();
+        } else if (intent.getStringExtra(Intent.EXTRA_TEXT) != null) {
+            //this means that vidoe was called through share menu
+            String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
+            videoUrl = getUris(extraText)[0];
+        }
+
+        service = NewPipe.getServiceByUrl(videoUrl);
+        if (service == null) {
+            Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
+                    .show();
+            return;
+        } else {
+            Intent callIntent = new Intent();
+            switch (service.getLinkTypeByUrl(videoUrl)) {
+                case STREAM:
+                    callIntent.setClass(this, PopupVideoPlayer.class);
+                    break;
+                case PLAYLIST:
+                    Log.e(TAG, "NOT YET DEFINED");
+                    break;
+                default:
+                    Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG).show();
+                    return;
+            }
+
+            callIntent.putExtra(NavStack.URL, videoUrl);
+            callIntent.putExtra(NavStack.SERVICE_ID, service.getServiceId());
+            startService(callIntent);
+        }
+    }
+}

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -2,14 +2,12 @@ package org.schabi.newpipe;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
 
 import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.util.NavStack;
@@ -136,7 +134,7 @@ public class RouterActivity extends Activity {
                     break;
                 case STREAM:
                     callIntent.setClass(this, VideoItemDetailActivity.class);
-                    callIntent.putExtra(VideoItemDetailFragment.AUTO_PLAY,
+                    callIntent.putExtra(VideoItemDetailActivity.AUTO_PLAY,
                             PreferenceManager.getDefaultSharedPreferences(this)
                                     .getBoolean(
                                             getString(R.string.autoplay_through_intent_key), false));

app/src/main/java/org/schabi/newpipe/detail/ActionBarHandler.java

@@ -53,6 +53,7 @@ class ActionBarHandler {
     // those are edited directly. Typically VideoItemDetailFragment will implement those callbacks.
     private OnActionListener onShareListener;
     private OnActionListener onOpenInBrowserListener;
+    private OnActionListener onOpenInPopupListener;
     private OnActionListener onDownloadListener;
     private OnActionListener onPlayWithKodiListener;
     private OnActionListener onPlayAudioListener;
@@ -190,6 +191,12 @@ class ActionBarHandler {
                 activity.startActivity(intent);
                 return true;
             }
+            case R.id.menu_item_popup: {
+                if(onOpenInPopupListener != null) {
+                    onOpenInPopupListener.onActionSelected(selectedVideoStream);
+                }
+                return true;
+            }
             default:
                 Log.e(TAG, "Menu Item not known");
         }
@@ -208,6 +215,10 @@ class ActionBarHandler {
         onOpenInBrowserListener = listener;
     }
 
+    public void setOnOpenInPopupListener(OnActionListener listener) {
+        onOpenInPopupListener = listener;
+    }
+
     public void setOnDownloadListener(OnActionListener listener) {
         onDownloadListener = listener;
     }

app/src/main/java/org/schabi/newpipe/detail/StreamExtractorWorker.java

@@ -0,0 +1,250 @@
+package org.schabi.newpipe.detail;
+
+import android.app.Activity;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.report.ErrorActivity;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Extract {@link StreamInfo} with {@link StreamExtractor} from the given url of the given service
+ */
+@SuppressWarnings("WeakerAccess")
+public class StreamExtractorWorker extends Thread {
+    private static final String TAG = "StreamExtractorWorker";
+
+    private Activity activity;
+    private final String videoUrl;
+    private final int serviceId;
+    private OnStreamInfoReceivedListener callback;
+
+    private final AtomicBoolean isRunning = new AtomicBoolean(false);
+    private final Handler handler = new Handler();
+
+
+    public interface OnStreamInfoReceivedListener {
+        void onReceive(StreamInfo info);
+        void onError(int messageId);
+        void onReCaptchaException();
+        void onBlockedByGemaError();
+        void onContentErrorWithMessage(int messageId);
+        void onContentError();
+    }
+
+    public StreamExtractorWorker(Activity activity, String videoUrl, int serviceId, OnStreamInfoReceivedListener callback) {
+        this.serviceId = serviceId;
+        this.videoUrl = videoUrl;
+        this.activity = activity;
+        this.callback = callback;
+    }
+
+    /**
+     * Returns a new instance <b>already</b> started  of {@link StreamExtractorWorker}.<br>
+     * The caller is responsible to check if {@link StreamExtractorWorker#isRunning()}, or {@link StreamExtractorWorker#cancel()} it
+     *
+     * @param serviceId id of the request service
+     * @param url       videoUrl of the service (e.g. https://www.youtube.com/watch?v=HyHNuVaZJ-k)
+     * @param activity  activity for error reporting purposes
+     * @param callback  listener that will be called-back when events occur (check {@link OnStreamInfoReceivedListener})
+     * @return new instance already started of {@link StreamExtractorWorker}
+     */
+    public static StreamExtractorWorker startExtractorThread(int serviceId, String url, Activity activity, OnStreamInfoReceivedListener callback) {
+        StreamExtractorWorker extractorThread = getExtractorThread(serviceId, url, activity, callback);
+        extractorThread.start();
+        return extractorThread;
+    }
+
+    /**
+     * Returns a new instance of {@link StreamExtractorWorker}.<br>
+     * The caller is responsible to check if {@link StreamExtractorWorker#isRunning()}, or {@link StreamExtractorWorker#cancel()}
+     * when it doesn't need it anymore
+     * <p>
+     * <b>Note:</b> this instance is <b>not</b> started yet
+     *
+     * @param serviceId id of the request service
+     * @param url       videoUrl of the service (e.g. https://www.youtube.com/watch?v=HyHNuVaZJ-k)
+     * @param activity  activity for error reporting purposes
+     * @param callback  listener that will be called-back when events occur (check {@link OnStreamInfoReceivedListener})
+     * @return instance of {@link StreamExtractorWorker}
+     */
+    public static StreamExtractorWorker getExtractorThread(int serviceId, String url, Activity activity, OnStreamInfoReceivedListener callback) {
+        return new StreamExtractorWorker(activity, url, serviceId, callback);
+    }
+
+    @Override
+    //Just ignore the errors for now
+    @SuppressWarnings("ConstantConditions")
+    public void run() {
+        // TODO: Improve error checking
+        // and this method in general
+
+        StreamInfo streamInfo = null;
+        StreamingService service;
+        try {
+            service = NewPipe.getService(serviceId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                            "", videoUrl, R.string.could_not_get_stream));
+            return;
+        }
+        try {
+            isRunning.set(true);
+            StreamExtractor streamExtractor = service.getExtractorInstance(videoUrl);
+            streamInfo = StreamInfo.getVideoInfo(streamExtractor);
+
+            final StreamInfo info = streamInfo;
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onReceive(info);
+                }
+            });
+            isRunning.set(false);
+            // look for errors during extraction
+            // this if statement only covers extra information.
+            // if these are not available or caused an error, they are just not available
+            // but don't render the stream information unusalbe.
+            if (streamInfo != null && !streamInfo.errors.isEmpty()) {
+                Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
+                for (Throwable e : streamInfo.errors) {
+                    e.printStackTrace();
+                    Log.e(TAG, "------");
+                }
+
+                View rootView = activity != null ? activity.findViewById(R.id.video_item_detail) : null;
+                ErrorActivity.reportError(handler, activity,
+                        streamInfo.errors, null, rootView,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, 0 /* no message for the user */));
+            }
+
+            // These errors render the stream information unusable.
+        } catch (ReCaptchaException e) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onReCaptchaException();
+                }
+            });
+        } catch (IOException e) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onError(R.string.network_error);
+                }
+            });
+            if (callback != null) e.printStackTrace();
+        } catch (YoutubeStreamExtractor.DecryptException de) {
+            // custom service related exceptions
+            ErrorActivity.reportError(handler, activity, de, VideoItemDetailActivity.class, null,
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                            service.getServiceInfo().name, videoUrl, R.string.youtube_signature_decryption_error));
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    activity.finish();
+                }
+            });
+            de.printStackTrace();
+        } catch (YoutubeStreamExtractor.GemaException ge) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onBlockedByGemaError();
+                }
+            });
+        } catch (YoutubeStreamExtractor.LiveStreamException e) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onContentErrorWithMessage(R.string.live_streams_not_supported);
+                }
+            });
+        }
+        // ----------------------------------------
+        catch (StreamExtractor.ContentNotAvailableException e) {
+            if (callback != null) handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    callback.onContentError();
+                }
+            });
+            e.printStackTrace();
+        } catch (StreamInfo.StreamExctractException e) {
+            if (!streamInfo.errors.isEmpty()) {
+                // !!! if this case ever kicks in someone gets kicked out !!!
+                ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+            } else {
+                ErrorActivity.reportError(handler, activity, streamInfo.errors, VideoItemDetailActivity.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+            }
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    activity.finish();
+                }
+            });
+            e.printStackTrace();
+        } catch (ParsingException e) {
+            ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                            service.getServiceInfo().name, videoUrl, R.string.parsing_error));
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    activity.finish();
+                }
+            });
+            e.printStackTrace();
+        } catch (Exception e) {
+            ErrorActivity.reportError(handler, activity, e, VideoItemDetailActivity.class, null,
+                    ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                            service.getServiceInfo().name, videoUrl, R.string.general_error));
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    activity.finish();
+                }
+            });
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Return true if the extraction is not completed yet
+     *
+     * @return the value of the AtomicBoolean {@link #isRunning}
+     */
+    public boolean isRunning() {
+        return isRunning.get();
+    }
+
+    /**
+     * Cancel this ExtractorThread, setting the callback to null, the AtomicBoolean {@link #isRunning} to false and interrupt this thread.
+     * <p>
+     * <b>Note:</b> Any I/O that is active in the moment that this method is called will be canceled and a Exception will be thrown, because of the {@link #interrupt()}.<br>
+     * This is useful when you don't want the resulting {@link StreamInfo} anymore, but don't want to waste bandwidth, otherwise it'd run till it receives the StreamInfo.
+     */
+    public void cancel() {
+        this.callback = null;
+        this.isRunning.set(false);
+        this.interrupt();
+    }
+}

app/src/main/java/org/schabi/newpipe/detail/StreamInfoWorker.java

@@ -1,230 +0,0 @@
-package org.schabi.newpipe.detail;
-
-import android.app.Activity;
-import android.os.Handler;
-import android.util.Log;
-import android.view.View;
-
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
-import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
-import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
-
-import java.io.IOException;
-
-/**
- * Created by Christian Schabesberger on 02.08.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * StreamInfoWorker.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class StreamInfoWorker {
-
-    private static final String TAG = StreamInfoWorker.class.toString();
-
-    public interface OnStreamInfoReceivedListener {
-        void onReceive(StreamInfo info);
-        void onError(int messageId);
-        void onReCaptchaException();
-        void onBlockedByGemaError();
-        void onContentErrorWithMessage(int messageId);
-        void onContentError();
-    }
-
-    private class StreamExtractorRunnable implements Runnable {
-        private final Handler h = new Handler();
-        private StreamExtractor streamExtractor;
-        private final int serviceId;
-        private final String videoUrl;
-        private Activity a;
-
-        public StreamExtractorRunnable(Activity a, String videoUrl, int serviceId) {
-            this.serviceId = serviceId;
-            this.videoUrl = videoUrl;
-            this.a = a;
-        }
-
-        @Override
-        public void run() {
-            StreamInfo streamInfo = null;
-            StreamingService service = null;
-            try {
-                service = NewPipe.getService(serviceId);
-            } catch (Exception e) {
-                e.printStackTrace();
-                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                "", videoUrl, R.string.could_not_get_stream));
-                return;
-            }
-            try {
-                streamExtractor = service.getExtractorInstance(videoUrl);
-                streamInfo = StreamInfo.getVideoInfo(streamExtractor);
-
-                final StreamInfo info = streamInfo;
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener.onReceive(info);
-                    }
-                });
-
-                // look for errors during extraction
-                // this if statement only covers extra information.
-                // if these are not available or caused an error, they are just not available
-                // but don't render the stream information unusalbe.
-                if(streamInfo != null &&
-                        !streamInfo.errors.isEmpty()) {
-                    Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
-                    for (Throwable e : streamInfo.errors) {
-                        e.printStackTrace();
-                        Log.e(TAG, "------");
-                    }
-
-                    View rootView = a != null ? a.findViewById(R.id.video_item_detail) : null;
-                    ErrorActivity.reportError(h, a,
-                            streamInfo.errors, null, rootView,
-                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                    service.getServiceInfo().name, videoUrl, 0 /* no message for the user */));
-                }
-
-                // These errors render the stream information unusable.
-            } catch (ReCaptchaException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener.onReCaptchaException();
-                    }
-                });
-            } catch (IOException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener.onError(R.string.network_error);
-                    }
-                });
-                e.printStackTrace();
-            } catch (YoutubeStreamExtractor.DecryptException de) {
-                // custom service related exceptions
-                ErrorActivity.reportError(h, a, de, VideoItemDetailFragment.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.youtube_signature_decryption_error));
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        a.finish();
-                    }
-                });
-                de.printStackTrace();
-            } catch (YoutubeStreamExtractor.GemaException ge) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener.onBlockedByGemaError();
-                    }
-                });
-            } catch(YoutubeStreamExtractor.LiveStreamException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener
-                                .onContentErrorWithMessage(R.string.live_streams_not_supported);
-                    }
-                });
-            }
-            // ----------------------------------------
-            catch(StreamExtractor.ContentNotAvailableException e) {
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onStreamInfoReceivedListener
-                                .onContentError();
-                    }
-                });
-                e.printStackTrace();
-            } catch(StreamInfo.StreamExctractException e) {
-                if(!streamInfo.errors.isEmpty()) {
-                    // !!! if this case ever kicks in someone gets kicked out !!!
-                    ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
-                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
-                } else {
-                    ErrorActivity.reportError(h, a, streamInfo.errors, VideoItemDetailFragment.class, null,
-                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
-                }
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        a.finish();
-                    }
-                });
-                e.printStackTrace();
-            } catch (ParsingException e) {
-                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.parsing_error));
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        a.finish();
-                    }
-                });
-                e.printStackTrace();
-            } catch(Exception e) {
-                ErrorActivity.reportError(h, a, e, VideoItemDetailFragment.class, null,
-                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                service.getServiceInfo().name, videoUrl, R.string.general_error));
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        a.finish();
-                    }
-                });
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static StreamInfoWorker streamInfoWorker = null;
-    private StreamExtractorRunnable runnable = null;
-    private OnStreamInfoReceivedListener onStreamInfoReceivedListener = null;
-
-    private StreamInfoWorker() {
-
-    }
-
-    public static StreamInfoWorker getInstance() {
-        return streamInfoWorker == null ? (streamInfoWorker = new StreamInfoWorker()) : streamInfoWorker;
-    }
-
-    public void search(int serviceId, String url, Activity a) {
-        runnable = new StreamExtractorRunnable(a, url, serviceId);
-        Thread thread = new Thread(runnable);
-        thread.start();
-    }
-
-    public void setOnStreamInfoReceivedListener(
-            OnStreamInfoReceivedListener onStreamInfoReceivedListener) {
-        this.onStreamInfoReceivedListener = onStreamInfoReceivedListener;
-    }
-}

app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java

@@ -1,77 +1,167 @@
 package org.schabi.newpipe.detail;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
 import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
 import android.util.Log;
+import android.util.TypedValue;
+import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
 
-import org.schabi.newpipe.App;
+import com.nirhart.parallaxscroll.views.ParallaxScrollView;
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.assist.FailReason;
+import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
+import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
+
+import org.schabi.newpipe.ActivityCommunicator;
+import org.schabi.newpipe.ImageErrorLoadingListener;
+import org.schabi.newpipe.Localization;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.ReCaptchaActivity;
+import org.schabi.newpipe.download.DownloadDialog;
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+import org.schabi.newpipe.player.AbstractPlayer;
+import org.schabi.newpipe.player.BackgroundPlayer;
+import org.schabi.newpipe.player.ExoPlayerActivity;
+import org.schabi.newpipe.player.PlayVideoActivity;
+import org.schabi.newpipe.player.PopupVideoPlayer;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
 
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoItemDetailActivity.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
+@SuppressWarnings("FieldCanBeLocal")
+public class VideoItemDetailActivity extends AppCompatActivity implements StreamExtractorWorker.OnStreamInfoReceivedListener, SharedPreferences.OnSharedPreferenceChangeListener {
 
-public class VideoItemDetailActivity extends AppCompatActivity {
-    private static final String TAG = VideoItemDetailActivity.class.toString();
+    private static final String TAG = "VideoItemDetailActivity";
+    private static final String KORE_PACKET = "org.xbmc.kore";
 
-    private VideoItemDetailFragment fragment;
+    /**
+     * The fragment argument representing the item ID that this fragment
+     * represents.
+     */
+    public static final String AUTO_PLAY = "auto_play";
 
+    private ActionBarHandler actionBarHandler;
+
+    private InfoItemBuilder infoItemBuilder = null;
+    private StreamInfo currentStreamInfo = null;
+    private StreamExtractorWorker curExtractorThread;
     private String videoUrl;
-    private int currentStreamingService = -1;
+    private int serviceId = -1;
 
-    protected void onCreate(Bundle savedInstanceState) {
+    private AtomicBoolean isLoading = new AtomicBoolean(false);
+    private boolean needUpdate = false;
+
+    private boolean autoPlayEnabled;
+    private boolean showRelatedStreams;
+
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private DisplayImageOptions displayImageOptions =
+            new DisplayImageOptions.Builder().displayer(new FadeInBitmapDisplayer(400)).cacheInMemory(true).build();
+    private Bitmap streamThumbnail = null;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Views
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private ProgressBar loadingProgressBar;
+
+    private ParallaxScrollView parallaxScrollRootView;
+    private RelativeLayout contentRootLayout;
+
+    private Button thumbnailBackgroundButton;
+    private ImageView thumbnailImageView;
+    private ImageView thumbnailPlayButton;
+
+    private View videoTitleRoot;
+    private TextView videoTitleTextView;
+    private ImageView videoTitleToggleArrow;
+    private TextView videoCountView;
+
+    private RelativeLayout videoDescriptionRootLayout;
+    private TextView videoUploadDateView;
+    private TextView videoDescriptionView;
+
+    private Button uploaderButton;
+    private TextView uploaderTextView;
+    private ImageView uploaderThumb;
+
+    private TextView thumbsUpTextView;
+    private ImageView thumbsUpImageView;
+    private TextView thumbsDownTextView;
+    private ImageView thumbsDownImageView;
+    private TextView thumbsDisabledTextView;
+
+    private TextView nextStreamTitle;
+    private RelativeLayout relatedStreamRootLayout;
+    private LinearLayout relatedStreamsView;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Activity's Lifecycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        showRelatedStreams = PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.show_next_video_key), true);
+        PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
+
         ThemeHelper.setTheme(this, true);
         setContentView(R.layout.activity_videoitem_detail);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
-        // Show the Up button in the action bar.
-        try {
-            //noinspection ConstantConditions
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        } catch(Exception e) {
-            Log.d(TAG, "Could not get SupportActionBar");
-            e.printStackTrace();
-        }
 
-        // savedInstanceState is non-null when there is fragment state
-        // saved from previous configurations of this activity
-        // (e.g. when rotating the screen from portrait to landscape).
-        // In this case, the fragment will automatically be re-added
-        // to its container so we don't need to manually add it.
-        // For more information, see the Fragments API guide at:
-        //
-        // http://developer.android.com/guide/components/fragments.html
-        //
+        if (getSupportActionBar() != null) getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        else Log.e(TAG, "Could not get SupportActionBar");
 
-        if (savedInstanceState == null) {
-            handleIntent(getIntent());
-        } else {
-            videoUrl = savedInstanceState.getString(NavStack.URL);
-            currentStreamingService = savedInstanceState.getInt(NavStack.SERVICE_ID);
-            NavStack.getInstance()
-                    .restoreSavedInstanceState(savedInstanceState);
-            addFragment(savedInstanceState);
+        initViews();
+        initListeners();
+        handleIntent(getIntent());
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        // Currently only used for enable/disable related videos
+        // but can be extended for other live settings change
+        if (needUpdate) {
+            if (relatedStreamsView != null) initRelatedVideos(currentStreamInfo);
+            needUpdate = false;
         }
     }
 
@@ -82,74 +172,696 @@ public class VideoItemDetailActivity extends AppCompatActivity {
         handleIntent(intent);
     }
 
-    private void handleIntent(Intent intent) {
-        Bundle arguments = new Bundle();
-        boolean autoplay = false;
-
-        videoUrl = intent.getStringExtra(NavStack.URL);
-        currentStreamingService = intent.getIntExtra(NavStack.SERVICE_ID, -1);
-        if(intent.hasExtra(VideoItemDetailFragment.AUTO_PLAY)) {
-            arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
-                    intent.getBooleanExtra(VideoItemDetailFragment.AUTO_PLAY, false));
-        }
-        arguments.putString(NavStack.URL, videoUrl);
-        arguments.putInt(NavStack.SERVICE_ID, currentStreamingService);
-        addFragment(arguments);
-    }
-
-    private void addFragment(final Bundle arguments) {
-        // Create the detail fragment and add it to the activity
-        // using a fragment transaction.
-        fragment = new VideoItemDetailFragment();
-        fragment.setArguments(arguments);
-        getSupportFragmentManager().beginTransaction()
-                .replace(R.id.videoitem_detail_container, fragment)
-                .commit();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        App.checkStartTor(this);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(NavStack.URL, videoUrl);
-        outState.putInt(NavStack.SERVICE_ID, currentStreamingService);
-        outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
-        NavStack.getInstance()
-                .onSaveInstanceState(outState);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        super.onOptionsItemSelected(item);
-        int id = item.getItemId();
-        if (id == android.R.id.home) {
-            // This ID represents the Home or Up button. In the case of this
-            // activity, the Up button is shown. Use NavUtils to allow users
-            // to navigate up one level in the application structure. For
-            // more details, see the Navigation pattern on Android Design:
-
-            // http://developer.android.com/design/patterns/navigation.html#up-vs-back
-
-            NavStack.getInstance()
-                    .openMainActivity(this);
-            return true;
-        } else {
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
     @Override
     public void onBackPressed() {
         try {
-            NavStack.getInstance()
-                    .navBack(this);
+            NavStack.getInstance().navBack(this);
         } catch (Exception e) {
             ErrorActivity.reportUiError(this, e);
         }
     }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case ReCaptchaActivity.RECAPTCHA_REQUEST:
+                if (resultCode == RESULT_OK) {
+                    String videoUrl = getIntent().getStringExtra(NavStack.URL);
+                    NavStack.getInstance().openDetailActivity(this, videoUrl, serviceId);
+                } else Log.e(TAG, "ReCaptcha failed");
+                break;
+            default:
+                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
+                break;
+        }
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (key.equals(getString(R.string.show_next_video_key))) {
+            showRelatedStreams = sharedPreferences.getBoolean(key, true);
+            needUpdate = true;
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public void initViews() {
+        loadingProgressBar = (ProgressBar) findViewById(R.id.detail_loading_progress_bar);
+
+        parallaxScrollRootView = (ParallaxScrollView) findViewById(R.id.detail_main_content);
+
+        //thumbnailRootLayout = (RelativeLayout) findViewById(R.id.detail_thumbnail_root_layout);
+        thumbnailBackgroundButton = (Button) findViewById(R.id.detail_stream_thumbnail_background_button);
+        thumbnailImageView = (ImageView) findViewById(R.id.detail_thumbnail_image_view);
+        thumbnailPlayButton = (ImageView) findViewById(R.id.detail_thumbnail_play_button);
+
+        contentRootLayout = (RelativeLayout) findViewById(R.id.detail_content_root_layout);
+
+        videoTitleRoot = findViewById(R.id.detail_title_root_layout);
+        videoTitleTextView = (TextView) findViewById(R.id.detail_video_title_view);
+        videoTitleToggleArrow = (ImageView) findViewById(R.id.detail_toggle_description_view);
+        videoCountView = (TextView) findViewById(R.id.detail_view_count_view);
+
+        videoDescriptionRootLayout = (RelativeLayout) findViewById(R.id.detail_description_root_layout);
+        videoUploadDateView = (TextView) findViewById(R.id.detail_upload_date_view);
+        videoDescriptionView = (TextView) findViewById(R.id.detail_description_view);
+
+        //thumbsRootLayout = (LinearLayout) findViewById(R.id.detail_thumbs_root_layout);
+        thumbsUpTextView = (TextView) findViewById(R.id.detail_thumbs_up_count_view);
+        thumbsUpImageView = (ImageView) findViewById(R.id.detail_thumbs_up_img_view);
+        thumbsDownTextView = (TextView) findViewById(R.id.detail_thumbs_down_count_view);
+        thumbsDownImageView = (ImageView) findViewById(R.id.detail_thumbs_down_img_view);
+        thumbsDisabledTextView = (TextView) findViewById(R.id.detail_thumbs_disabled_view);
+
+        //uploaderRootLayout = (FrameLayout) findViewById(R.id.detail_uploader_root_layout);
+        uploaderButton = (Button) findViewById(R.id.detail_uploader_button);
+        uploaderTextView = (TextView) findViewById(R.id.detail_uploader_text_view);
+        uploaderThumb = (ImageView) findViewById(R.id.detail_uploader_thumbnail_view);
+
+        relatedStreamRootLayout = (RelativeLayout) findViewById(R.id.detail_related_streams_root_layout);
+        nextStreamTitle = (TextView) findViewById(R.id.detail_next_stream_title);
+        relatedStreamsView = (LinearLayout) findViewById(R.id.detail_related_streams_view);
+
+        actionBarHandler = new ActionBarHandler(this);
+        actionBarHandler.setupNavMenu(this);
+        videoDescriptionView.setMovementMethod(LinkMovementMethod.getInstance());
+
+        infoItemBuilder = new InfoItemBuilder(this, findViewById(android.R.id.content));
+
+        setHeightThumbnail();
+    }
+
+    private void initListeners() {
+        videoTitleRoot.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (videoDescriptionRootLayout.getVisibility() == View.VISIBLE) {
+                    videoTitleTextView.setMaxLines(1);
+                    videoDescriptionRootLayout.setVisibility(View.GONE);
+                    videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+                } else {
+                    videoTitleTextView.setMaxLines(10);
+                    videoDescriptionRootLayout.setVisibility(View.VISIBLE);
+                    videoTitleToggleArrow.setImageResource(R.drawable.arrow_up);
+                }
+            }
+        });
+        thumbnailBackgroundButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!isLoading.get() && currentStreamInfo != null) playVideo(currentStreamInfo);
+            }
+        });
+
+        infoItemBuilder.setOnStreamInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
+            @Override
+            public void selected(String url, int serviceId) {
+                NavStack.getInstance().openDetailActivity(VideoItemDetailActivity.this, url, serviceId);
+            }
+        });
+
+        uploaderButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                NavStack.getInstance().openChannelActivity(VideoItemDetailActivity.this, currentStreamInfo.channel_url, currentStreamInfo.service_id);
+            }
+        });
+    }
+
+    private void initThumbnailViews(StreamInfo info) {
+        if (info.thumbnail_url != null && !info.thumbnail_url.isEmpty()) {
+            imageLoader.displayImage(info.thumbnail_url, thumbnailImageView,
+                    displayImageOptions, new SimpleImageLoadingListener() {
+
+                        @Override
+                        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
+                            streamThumbnail = loadedImage;
+
+                            if (streamThumbnail != null) {
+                                // TODO: Change the thumbnail implementation
+
+                                // When the thumbnail is not loaded yet, it not passes to the service in time
+                                // so, I can notify the service through a broadcast, but the problem is
+                                // when I click in another video, another thumbnail will be load, and will
+                                // notify again, so I send the videoUrl and compare with the service's url
+                                ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail = streamThumbnail;
+                                Intent intent = new Intent(AbstractPlayer.ACTION_UPDATE_THUMB);
+                                intent.putExtra(AbstractPlayer.VIDEO_URL, currentStreamInfo.webpage_url);
+                                sendBroadcast(intent);
+                            }
+                        }
+
+                        @Override
+                        public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
+                            ErrorActivity.reportError(VideoItemDetailActivity.this,
+                                    failReason.getCause(), null, findViewById(android.R.id.content),
+                                    ErrorActivity.ErrorInfo.make(ErrorActivity.LOAD_IMAGE,
+                                            NewPipe.getNameOfService(currentStreamInfo.service_id), imageUri,
+                                            R.string.could_not_load_thumbnails));
+                        }
+
+                    });
+        } else thumbnailImageView.setImageResource(R.drawable.dummy_thumbnail_dark);
+
+        if (info.uploader_thumbnail_url != null && !info.uploader_thumbnail_url.isEmpty()) {
+            imageLoader.displayImage(info.uploader_thumbnail_url,
+                    uploaderThumb, displayImageOptions,
+                    new ImageErrorLoadingListener(this, findViewById(android.R.id.content), info.service_id));
+        }
+    }
+
+    private void initRelatedVideos(StreamInfo info) {
+        if (relatedStreamsView.getChildCount() > 0) relatedStreamsView.removeAllViews();
+
+        if (info.next_video != null && showRelatedStreams) {
+            nextStreamTitle.setVisibility(View.VISIBLE);
+            relatedStreamsView.addView(infoItemBuilder.buildView(relatedStreamsView, info.next_video));
+            relatedStreamsView.addView(getSeparatorView());
+            relatedStreamsView.setVisibility(View.VISIBLE);
+        } else nextStreamTitle.setVisibility(View.GONE);
+
+        if (info.related_streams != null && !info.related_streams.isEmpty() && showRelatedStreams) {
+            for (InfoItem item : info.related_streams) {
+                relatedStreamsView.addView(infoItemBuilder.buildView(relatedStreamsView, item));
+            }
+            relatedStreamsView.setVisibility(View.VISIBLE);
+        } else if (info.next_video == null) relatedStreamsView.setVisibility(View.GONE);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Menu
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        actionBarHandler.setupMenu(menu, getMenuInflater());
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            NavStack.getInstance().openMainActivity(this);
+            return true;
+        }
+        return actionBarHandler.onItemSelected(item) || super.onOptionsItemSelected(item);
+    }
+
+    private void setupActionBarHandler(final StreamInfo info) {
+        actionBarHandler.setupStreamList(info.video_streams);
+        actionBarHandler.setOnShareListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                if (isLoading.get()) return;
+
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_SEND);
+                intent.putExtra(Intent.EXTRA_TEXT, info.webpage_url);
+                intent.setType("text/plain");
+                startActivity(Intent.createChooser(intent, VideoItemDetailActivity.this.getString(R.string.share_dialog_title)));
+            }
+        });
+
+        actionBarHandler.setOnOpenInBrowserListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                if (isLoading.get()) return;
+
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(info.webpage_url));
+                startActivity(Intent.createChooser(intent, VideoItemDetailActivity.this.getString(R.string.choose_browser)));
+            }
+        });
+
+        actionBarHandler.setOnOpenInPopupListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                if (isLoading.get()) return;
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !PermissionHelper.checkSystemAlertWindowPermission(VideoItemDetailActivity.this)) {
+                    Toast.makeText(VideoItemDetailActivity.this, R.string.msg_popup_permission, Toast.LENGTH_LONG).show();
+                    return;
+                }
+                if (streamThumbnail != null) ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail = streamThumbnail;
+
+                Intent i = new Intent(VideoItemDetailActivity.this, PopupVideoPlayer.class);
+                Toast.makeText(VideoItemDetailActivity.this, R.string.popup_playing_toast, Toast.LENGTH_SHORT).show();
+                i.putExtra(AbstractPlayer.VIDEO_TITLE, info.title)
+                        .putExtra(AbstractPlayer.CHANNEL_NAME, info.uploader)
+                        .putExtra(AbstractPlayer.VIDEO_URL, info.webpage_url)
+                        .putExtra(AbstractPlayer.INDEX_SEL_VIDEO_STREAM, selectedStreamId)
+                        .putExtra(AbstractPlayer.VIDEO_STREAMS_LIST, new ArrayList<>(info.video_streams));
+                if (info.start_position > 0) i.putExtra(AbstractPlayer.START_POSITION, info.start_position * 1000);
+                VideoItemDetailActivity.this.startService(i);
+            }
+        });
+
+        actionBarHandler.setOnPlayWithKodiListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+                if (isLoading.get()) return;
+
+                try {
+                    Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setPackage(KORE_PACKET);
+                    intent.setData(Uri.parse(info.webpage_url.replace("https", "http")));
+                    VideoItemDetailActivity.this.startActivity(intent);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    AlertDialog.Builder builder = new AlertDialog.Builder(VideoItemDetailActivity.this);
+                    builder.setMessage(R.string.kore_not_found)
+                            .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    Intent intent = new Intent();
+                                    intent.setAction(Intent.ACTION_VIEW);
+                                    intent.setData(Uri.parse(VideoItemDetailActivity.this.getString(R.string.fdroid_kore_url)));
+                                    VideoItemDetailActivity.this.startActivity(intent);
+                                }
+                            })
+                            .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+
+                                }
+                            });
+                    builder.create().show();
+                }
+            }
+        });
+
+        actionBarHandler.setOnDownloadListener(new ActionBarHandler.OnActionListener() {
+            @Override
+            public void onActionSelected(int selectedStreamId) {
+
+                if (isLoading.get() || !PermissionHelper.checkStoragePermissions(VideoItemDetailActivity.this)) {
+                    return;
+                }
+
+                try {
+                    Bundle args = new Bundle();
+
+                    // Sometimes it may be that some information is not available due to changes fo the
+                    // website which was crawled. Then the ui has to understand this and act right.
+
+                    if (info.audio_streams != null) {
+                        AudioStream audioStream =
+                                info.audio_streams.get(getPreferredAudioStreamId(info));
+
+                        String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
+                        args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
+                        args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
+                    }
+
+                    if (info.video_streams != null) {
+                        VideoStream selectedStreamItem = info.video_streams.get(selectedStreamId);
+                        String videoSuffix = "." + MediaFormat.getSuffixById(selectedStreamItem.format);
+                        args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
+                        args.putString(DownloadDialog.VIDEO_URL, selectedStreamItem.url);
+                    }
+
+                    args.putString(DownloadDialog.TITLE, info.title);
+                    DownloadDialog downloadDialog = DownloadDialog.newInstance(args);
+                    downloadDialog.show(VideoItemDetailActivity.this.getSupportFragmentManager(), "downloadDialog");
+                } catch (Exception e) {
+                    Toast.makeText(VideoItemDetailActivity.this,
+                            R.string.could_not_setup_download_menu, Toast.LENGTH_LONG).show();
+                    e.printStackTrace();
+                }
+            }
+        });
+
+        if (info.audio_streams == null) {
+            actionBarHandler.showAudioAction(false);
+        } else {
+            actionBarHandler.setOnPlayAudioListener(new ActionBarHandler.OnActionListener() {
+                @Override
+                public void onActionSelected(int selectedStreamId) {
+                    if (isLoading.get()) return;
+
+                    boolean useExternalAudioPlayer = PreferenceManager.getDefaultSharedPreferences(VideoItemDetailActivity.this)
+                            .getBoolean(VideoItemDetailActivity.this.getString(R.string.use_external_audio_player_key), false);
+                    Intent intent;
+                    AudioStream audioStream =
+                            info.audio_streams.get(getPreferredAudioStreamId(info));
+                    if (!useExternalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 18) {
+                        //internal music player: explicit intent
+                        if (!BackgroundPlayer.isRunning && streamThumbnail != null) {
+                            ActivityCommunicator.getCommunicator()
+                                    .backgroundPlayerThumbnail = streamThumbnail;
+                            intent = new Intent(VideoItemDetailActivity.this, BackgroundPlayer.class);
+
+                            intent.setAction(Intent.ACTION_VIEW);
+                            intent.setDataAndType(Uri.parse(audioStream.url),
+                                    MediaFormat.getMimeById(audioStream.format));
+                            intent.putExtra(BackgroundPlayer.TITLE, info.title);
+                            intent.putExtra(BackgroundPlayer.WEB_URL, info.webpage_url);
+                            intent.putExtra(BackgroundPlayer.SERVICE_ID, serviceId);
+                            intent.putExtra(BackgroundPlayer.CHANNEL_NAME, info.uploader);
+                            VideoItemDetailActivity.this.startService(intent);
+                        }
+                    } else {
+                        intent = new Intent();
+                        try {
+                            intent.setAction(Intent.ACTION_VIEW);
+                            intent.setDataAndType(Uri.parse(audioStream.url),
+                                    MediaFormat.getMimeById(audioStream.format));
+                            intent.putExtra(Intent.EXTRA_TITLE, info.title);
+                            intent.putExtra("title", info.title);
+                            // HERE !!!
+                            VideoItemDetailActivity.this.startActivity(intent);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            AlertDialog.Builder builder = new AlertDialog.Builder(VideoItemDetailActivity.this);
+                            builder.setMessage(R.string.no_player_found)
+                                    .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            Intent intent = new Intent();
+                                            intent.setAction(Intent.ACTION_VIEW);
+                                            intent.setData(Uri.parse(VideoItemDetailActivity.this.getString(R.string.fdroid_vlc_url)));
+                                            VideoItemDetailActivity.this.startActivity(intent);
+                                        }
+                                    })
+                                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            Log.i(TAG, "You unlocked a secret unicorn.");
+                                        }
+                                    });
+                            builder.create().show();
+                            Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            });
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void handleIntent(Intent intent) {
+        if (intent == null) return;
+
+        serviceId = intent.getIntExtra(NavStack.SERVICE_ID, 0);
+        videoUrl = intent.getStringExtra(NavStack.URL);
+        autoPlayEnabled = intent.getBooleanExtra(AUTO_PLAY, false);
+        selectVideo(videoUrl, serviceId);
+    }
+
+    private void selectVideo(String url, int serviceId) {
+        if (curExtractorThread != null && curExtractorThread.isRunning()) curExtractorThread.cancel();
+
+        animateView(contentRootLayout, false, 200, null);
+
+        thumbnailPlayButton.setVisibility(View.GONE);
+        loadingProgressBar.setVisibility(View.VISIBLE);
+
+        imageLoader.cancelDisplayTask(thumbnailImageView);
+        imageLoader.cancelDisplayTask(uploaderThumb);
+        thumbnailImageView.setImageDrawable(null);
+
+        curExtractorThread = StreamExtractorWorker.startExtractorThread(serviceId, url, this, this);
+        isLoading.set(true);
+    }
+
+    public void playVideo(StreamInfo info) {
+        // ----------- THE MAGIC MOMENT ---------------
+        VideoStream selectedVideoStream = info.video_streams.get(actionBarHandler.getSelectedVideoStream());
+
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(this.getString(R.string.use_external_video_player_key), false)) {
+
+            // External Player
+            Intent intent = new Intent();
+            try {
+                intent.setAction(Intent.ACTION_VIEW)
+                        .setDataAndType(Uri.parse(selectedVideoStream.url), MediaFormat.getMimeById(selectedVideoStream.format))
+                        .putExtra(Intent.EXTRA_TITLE, info.title)
+                        .putExtra("title", info.title);
+                this.startActivity(intent);
+            } catch (Exception e) {
+                e.printStackTrace();
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setMessage(R.string.no_player_found)
+                        .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Intent intent = new Intent()
+                                        .setAction(Intent.ACTION_VIEW)
+                                        .setData(Uri.parse(getString(R.string.fdroid_vlc_url)));
+                                startActivity(intent);
+                            }
+                        })
+                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                            }
+                        });
+                builder.create().show();
+            }
+        } else {
+            Intent intent;
+            boolean useOldPlayer = PreferenceManager
+                    .getDefaultSharedPreferences(this)
+                    .getBoolean(getString(R.string.use_old_player_key), false)
+                    || (Build.VERSION.SDK_INT < 16);
+            if (!useOldPlayer) {
+                // ExoPlayer
+                if (streamThumbnail != null) ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail = streamThumbnail;
+                intent = new Intent(this, ExoPlayerActivity.class)
+                        .putExtra(AbstractPlayer.VIDEO_TITLE, info.title)
+                        .putExtra(AbstractPlayer.VIDEO_URL, info.webpage_url)
+                        .putExtra(AbstractPlayer.CHANNEL_NAME, info.uploader)
+                        .putExtra(AbstractPlayer.INDEX_SEL_VIDEO_STREAM, actionBarHandler.getSelectedVideoStream())
+                        .putExtra(AbstractPlayer.VIDEO_STREAMS_LIST, new ArrayList<>(info.video_streams));
+                if (info.start_position > 0) intent.putExtra(AbstractPlayer.START_POSITION, info.start_position * 1000);
+            } else {
+                // Internal Player
+                intent = new Intent(this, PlayVideoActivity.class)
+                        .putExtra(PlayVideoActivity.VIDEO_TITLE, info.title)
+                        .putExtra(PlayVideoActivity.STREAM_URL, selectedVideoStream.url)
+                        .putExtra(PlayVideoActivity.VIDEO_URL, info.webpage_url)
+                        .putExtra(PlayVideoActivity.START_POSITION, info.start_position);
+            }
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        }
+    }
+
+    private int getPreferredAudioStreamId(final StreamInfo info) {
+        String preferredFormatString = PreferenceManager.getDefaultSharedPreferences(this)
+                .getString(getString(R.string.default_audio_format_key), "webm");
+
+        int preferredFormat = MediaFormat.WEBMA.id;
+        switch (preferredFormatString) {
+            case "webm":
+                preferredFormat = MediaFormat.WEBMA.id;
+                break;
+            case "m4a":
+                preferredFormat = MediaFormat.M4A.id;
+                break;
+            default:
+                break;
+        }
+
+        for (int i = 0; i < info.audio_streams.size(); i++) {
+            if (info.audio_streams.get(i).format == preferredFormat) {
+                return i;
+            }
+        }
+
+        //todo: make this a proper error
+        Log.e(TAG, "FAILED to set audioStream value!");
+        return 0;
+    }
+
+    private View getSeparatorView() {
+        View separator = new View(this);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1);
+        int m8 = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8, getResources().getDisplayMetrics());
+        int m5 = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5, getResources().getDisplayMetrics());
+        params.setMargins(m8, m5, m8, m5);
+        separator.setLayoutParams(params);
+
+        TypedValue typedValue = new TypedValue();
+        getTheme().resolveAttribute(R.attr.separatorColor, typedValue, true);
+        separator.setBackgroundColor(typedValue.data);
+        return separator;
+    }
+
+    private void setHeightThumbnail() {
+        boolean isPortrait = getResources().getDisplayMetrics().heightPixels > getResources().getDisplayMetrics().widthPixels;
+        int height = isPortrait ? (int) (getResources().getDisplayMetrics().widthPixels / (16.0f / 9.0f))
+                : (int) (getResources().getDisplayMetrics().heightPixels / 2f);
+        thumbnailImageView.setScaleType(isPortrait ? ImageView.ScaleType.CENTER_CROP : ImageView.ScaleType.FIT_CENTER);
+        thumbnailImageView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, height));
+        thumbnailImageView.setMinimumHeight(height);
+        thumbnailBackgroundButton.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, height));
+        thumbnailBackgroundButton.setMinimumHeight(height);
+    }
+
+    /**
+     * Animate the view
+     *
+     * @param view        view that will be animated
+     * @param enterOrExit true to enter, false to exit
+     * @param duration    how long the animation will take, in milliseconds
+     * @param execOnEnd   runnable that will be executed when the animation ends
+     */
+    public void animateView(final View view, final boolean enterOrExit, long duration, final Runnable execOnEnd) {
+        if (view.getVisibility() == View.VISIBLE && enterOrExit) {
+            view.animate().setListener(null).cancel();
+            view.setVisibility(View.VISIBLE);
+            view.setAlpha(1f);
+            if (execOnEnd != null) execOnEnd.run();
+            return;
+        } else if ((view.getVisibility() == View.GONE || view.getVisibility() == View.INVISIBLE) && !enterOrExit) {
+            view.animate().setListener(null).cancel();
+            view.setVisibility(View.GONE);
+            view.setAlpha(0f);
+            if (execOnEnd != null) execOnEnd.run();
+            return;
+        }
+
+        view.animate().setListener(null).cancel();
+        view.setVisibility(View.VISIBLE);
+
+        if (enterOrExit) {
+            view.animate().alpha(1f).setDuration(duration)
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            if (execOnEnd != null) execOnEnd.run();
+                        }
+                    }).start();
+        } else {
+            view.animate().alpha(0f)
+                    .setDuration(duration)
+                    .setListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            view.setVisibility(View.GONE);
+                            if (execOnEnd != null) execOnEnd.run();
+                        }
+                    })
+                    .start();
+        }
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // OnStreamInfoReceivedListener callbacks
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onReceive(StreamInfo info) {
+        currentStreamInfo = info;
+
+        loadingProgressBar.setVisibility(View.GONE);
+        thumbnailPlayButton.setVisibility(View.VISIBLE);
+        relatedStreamRootLayout.setVisibility(showRelatedStreams ? View.VISIBLE : View.GONE);
+        parallaxScrollRootView.scrollTo(0, 0);
+
+        // Since newpipe is designed to work even if certain information is not available,
+        // the UI has to react on missing information.
+        videoTitleTextView.setText(info.title);
+        if (!info.uploader.isEmpty()) uploaderTextView.setText(info.uploader);
+        uploaderTextView.setVisibility(!info.uploader.isEmpty() ? View.VISIBLE : View.GONE);
+        uploaderButton.setVisibility(!info.channel_url.isEmpty() ? View.VISIBLE : View.GONE);
+        uploaderThumb.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.buddy));
+
+        if (info.view_count >= 0) videoCountView.setText(Localization.localizeViewCount(info.view_count, this));
+        videoCountView.setVisibility(info.view_count >= 0 ? View.VISIBLE : View.GONE);
+
+        if (info.dislike_count == -1 && info.like_count == -1) {
+            thumbsDownImageView.setVisibility(View.VISIBLE);
+            thumbsUpImageView.setVisibility(View.VISIBLE);
+            thumbsUpTextView.setVisibility(View.GONE);
+            thumbsDownTextView.setVisibility(View.GONE);
+
+            thumbsDisabledTextView.setVisibility(View.VISIBLE);
+        } else {
+            thumbsDisabledTextView.setVisibility(View.GONE);
+
+            if (info.dislike_count >= 0) thumbsDownTextView.setText(Localization.localizeNumber(info.dislike_count, this));
+            thumbsDownTextView.setVisibility(info.dislike_count >= 0 ? View.VISIBLE : View.GONE);
+            thumbsDownImageView.setVisibility(info.dislike_count >= 0 ? View.VISIBLE : View.GONE);
+
+            if (info.like_count >= 0) thumbsUpTextView.setText(Localization.localizeNumber(info.like_count, this));
+            thumbsUpTextView.setVisibility(info.like_count >= 0 ? View.VISIBLE : View.GONE);
+            thumbsUpImageView.setVisibility(info.like_count >= 0 ? View.VISIBLE : View.GONE);
+        }
+
+        if (!info.upload_date.isEmpty()) videoUploadDateView.setText(Localization.localizeDate(info.upload_date, this));
+        videoUploadDateView.setVisibility(!info.upload_date.isEmpty() ? View.VISIBLE : View.GONE);
+
+        if (!info.description.isEmpty()) videoDescriptionView.setText(
+                Build.VERSION.SDK_INT >= 24 ? Html.fromHtml(info.description, 0) : Html.fromHtml(info.description)
+        );
+        videoDescriptionView.setVisibility(!info.description.isEmpty() ? View.VISIBLE : View.GONE);
+
+        videoDescriptionRootLayout.setVisibility(View.GONE);
+        videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
+
+        setupActionBarHandler(info);
+        initRelatedVideos(info);
+        initThumbnailViews(info);
+
+        animateView(contentRootLayout, true, 200, null);
+
+        isLoading.set(false);
+        if (autoPlayEnabled) playVideo(info);
+    }
+
+    @Override
+    public void onError(int messageId) {
+        Toast.makeText(this, messageId, Toast.LENGTH_LONG).show();
+        loadingProgressBar.setVisibility(View.GONE);
+        thumbnailImageView.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.not_available_monkey));
+    }
+
+    @Override
+    public void onReCaptchaException() {
+        Toast.makeText(this, R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show();
+        // Starting ReCaptcha Challenge Activity
+        startActivityForResult(new Intent(this, ReCaptchaActivity.class), ReCaptchaActivity.RECAPTCHA_REQUEST);
+    }
+
+    @Override
+    public void onBlockedByGemaError() {
+        loadingProgressBar.setVisibility(View.GONE);
+        thumbnailImageView.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.gruese_die_gema));
+        thumbnailBackgroundButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(getString(R.string.c3s_url)));
+                startActivity(intent);
+            }
+        });
+
+        Toast.makeText(this, R.string.blocked_by_gema, Toast.LENGTH_LONG).show();
+    }
+
+    @Override
+    public void onContentErrorWithMessage(int messageId) {
+        loadingProgressBar.setVisibility(View.GONE);
+        thumbnailImageView.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.not_available_monkey));
+        Toast.makeText(this, messageId, Toast.LENGTH_LONG).show();
+    }
+
+    @Override
+    public void onContentError() {
+        loadingProgressBar.setVisibility(View.GONE);
+        thumbnailImageView.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.not_available_monkey));
+        Toast.makeText(this, R.string.content_not_available, Toast.LENGTH_LONG).show();
+    }
 }

app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java

@@ -1,836 +0,0 @@
-package org.schabi.newpipe.detail;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Point;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-
-import com.google.android.exoplayer.util.Util;
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-
-import org.schabi.newpipe.ActivityCommunicator;
-import org.schabi.newpipe.ImageErrorLoadingListener;
-import org.schabi.newpipe.Localization;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.ReCaptchaActivity;
-import org.schabi.newpipe.download.DownloadDialog;
-import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.stream_info.AudioStream;
-import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-import org.schabi.newpipe.extractor.stream_info.VideoStream;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
-import org.schabi.newpipe.player.BackgroundPlayer;
-import org.schabi.newpipe.player.ExoPlayerActivity;
-import org.schabi.newpipe.player.PlayVideoActivity;
-import org.schabi.newpipe.report.ErrorActivity;
-import java.util.Vector;
-
-import org.schabi.newpipe.util.NavStack;
-import org.schabi.newpipe.util.PermissionHelper;
-
-import static android.app.Activity.RESULT_OK;
-import static org.schabi.newpipe.ReCaptchaActivity.RECAPTCHA_REQUEST;
-
-
-/**
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoItemDetailFragment.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-public class VideoItemDetailFragment extends Fragment {
-
-    private static final String TAG = VideoItemDetailFragment.class.toString();
-    private static final String KORE_PACKET = "org.xbmc.kore";
-
-    /**
-     * The fragment argument representing the item ID that this fragment
-     * represents.
-     */
-    public static final String AUTO_PLAY = "auto_play";
-
-    private AppCompatActivity activity;
-    private ActionBarHandler actionBarHandler;
-    private ProgressBar progressBar;
-
-    private int streamingServiceId = -1;
-
-    private boolean autoPlayEnabled;
-    private boolean showNextStreamItem;
-
-    private View thumbnailWindowLayout;
-    //this only remains due to downwards compatibility
-    private FloatingActionButton playVideoButton;
-    private final Point initialThumbnailPos = new Point(0, 0);
-    private View rootView = null;
-    private Bitmap streamThumbnail = null;
-
-    private ImageLoader imageLoader = ImageLoader.getInstance();
-    private DisplayImageOptions displayImageOptions =
-            new DisplayImageOptions.Builder().cacheInMemory(true).build();
-
-    private InfoItemBuilder infoItemBuilder = null;
-
-    public interface OnInvokeCreateOptionsMenuListener {
-        void createOptionsMenu();
-    }
-
-    private OnInvokeCreateOptionsMenuListener onInvokeCreateOptionsMenuListener;
-
-    private void updateInfo(final StreamInfo info) {
-        Activity a = getActivity();
-
-        RelativeLayout textContentLayout =
-                (RelativeLayout) activity.findViewById(R.id.detail_text_content_layout);
-        final TextView videoTitleView =
-                (TextView) activity.findViewById(R.id.detail_video_title_view);
-        TextView uploaderView = (TextView) activity.findViewById(R.id.detail_uploader_view);
-        TextView viewCountView = (TextView) activity.findViewById(R.id.detail_view_count_view);
-        TextView thumbsUpView = (TextView) activity.findViewById(R.id.detail_thumbs_up_count_view);
-        TextView thumbsDownView =
-                (TextView) activity.findViewById(R.id.detail_thumbs_down_count_view);
-        TextView uploadDateView = (TextView) activity.findViewById(R.id.detail_upload_date_view);
-        TextView descriptionView = (TextView) activity.findViewById(R.id.detail_description_view);
-        RecyclerView nextStreamView =
-                (RecyclerView) activity.findViewById(R.id.detail_next_stream_content);
-        RelativeLayout nextVideoRootFrame =
-                (RelativeLayout) activity.findViewById(R.id.detail_next_stream_root_layout);
-        TextView similarTitle = (TextView) activity.findViewById(R.id.detail_similar_title);
-        Button backgroundButton = (Button)
-                activity.findViewById(R.id.detail_stream_thumbnail_window_background_button);
-        View thumbnailView = activity.findViewById(R.id.detail_thumbnail_view);
-        View topView = activity.findViewById(R.id.detailTopView);
-        Button channelButton = (Button) activity.findViewById(R.id.channel_button);
-
-        // prevents a crash if the activity/fragment was already left when the response came
-        if(channelButton != null) {
-
-            progressBar.setVisibility(View.GONE);
-            if (info.next_video != null) {
-                // todo: activate this function or remove it
-                nextStreamView.setVisibility(View.GONE);
-            } else {
-                nextStreamView.setVisibility(View.GONE);
-                activity.findViewById(R.id.detail_similar_title).setVisibility(View.GONE);
-            }
-
-            textContentLayout.setVisibility(View.VISIBLE);
-            if (android.os.Build.VERSION.SDK_INT < 18) {
-                playVideoButton.setVisibility(View.VISIBLE);
-            } else {
-                ImageView playArrowView = (ImageView) activity.findViewById(R.id.play_arrow_view);
-                playArrowView.setVisibility(View.VISIBLE);
-            }
-
-            if (!showNextStreamItem) {
-                nextVideoRootFrame.setVisibility(View.GONE);
-                similarTitle.setVisibility(View.GONE);
-            }
-
-            videoTitleView.setText(info.title);
-
-            topView.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    if (event.getAction() == android.view.MotionEvent.ACTION_UP) {
-                        ImageView arrow = (ImageView) activity.findViewById(R.id.toggle_description_view);
-                        View extra = activity.findViewById(R.id.detailExtraView);
-                        if (extra.getVisibility() == View.VISIBLE) {
-                            extra.setVisibility(View.GONE);
-                            arrow.setImageResource(R.drawable.arrow_down);
-                        } else {
-                            extra.setVisibility(View.VISIBLE);
-                            arrow.setImageResource(R.drawable.arrow_up);
-                        }
-                    }
-                    return true;
-                }
-            });
-
-            // Since newpipe is designed to work even if certain information is not available,
-            // the UI has to react on missing information.
-            videoTitleView.setText(info.title);
-            if (!info.uploader.isEmpty()) {
-                uploaderView.setText(info.uploader);
-            } else {
-                activity.findViewById(R.id.detail_uploader_view).setVisibility(View.GONE);
-            }
-            if (info.view_count >= 0) {
-                viewCountView.setText(Localization.localizeViewCount(info.view_count, a));
-            } else {
-                viewCountView.setVisibility(View.GONE);
-            }
-            if (info.dislike_count >= 0) {
-                thumbsDownView.setText(Localization.localizeNumber(info.dislike_count, a));
-            } else {
-                thumbsDownView.setVisibility(View.INVISIBLE);
-                activity.findViewById(R.id.detail_thumbs_down_count_view).setVisibility(View.GONE);
-            }
-            if (info.like_count >= 0) {
-                thumbsUpView.setText(Localization.localizeNumber(info.like_count, a));
-            } else {
-                thumbsUpView.setVisibility(View.GONE);
-                activity.findViewById(R.id.detail_thumbs_up_img_view).setVisibility(View.GONE);
-                thumbsDownView.setVisibility(View.GONE);
-                activity.findViewById(R.id.detail_thumbs_down_img_view).setVisibility(View.GONE);
-            }
-            if (!info.upload_date.isEmpty()) {
-                uploadDateView.setText(Localization.localizeDate(info.upload_date, a));
-            } else {
-                uploadDateView.setVisibility(View.GONE);
-            }
-            if (!info.description.isEmpty()) {
-                descriptionView.setText(Html.fromHtml(info.description));
-            } else {
-                descriptionView.setVisibility(View.GONE);
-            }
-
-            descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
-
-            // parse streams
-            Vector<VideoStream> streamsToUse = new Vector<>();
-            for (VideoStream i : info.video_streams) {
-                if (useStream(i, streamsToUse)) {
-                    streamsToUse.add(i);
-                }
-            }
-
-            textContentLayout.setVisibility(View.VISIBLE);
-
-            if (info.next_video == null) {
-                activity.findViewById(R.id.detail_next_stream_title).setVisibility(View.GONE);
-            }
-
-            if (info.related_streams != null && !info.related_streams.isEmpty()) {
-                initSimilarVideos(info);
-            } else {
-                activity.findViewById(R.id.detail_similar_title).setVisibility(View.GONE);
-                activity.findViewById(R.id.similar_streams_view).setVisibility(View.GONE);
-            }
-
-            setupActionBarHandler(info);
-
-            if (autoPlayEnabled) {
-                playVideo(info);
-            }
-
-            if (android.os.Build.VERSION.SDK_INT < 18) {
-                playVideoButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        playVideo(info);
-                    }
-                });
-            }
-
-            backgroundButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    playVideo(info);
-                }
-            });
-
-            //todo: make backgroundButton handle this
-            thumbnailView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    playVideo(info);
-                }
-            });
-
-            if (info.channel_url != null && info.channel_url != "") {
-                channelButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        NavStack.getInstance()
-                                .openChannelActivity(getActivity(), info.channel_url, info.service_id);
-                    }
-                });
-            } else {
-                channelButton.setVisibility(Button.GONE);
-            }
-
-            initThumbnailViews(info);
-        }
-    }
-
-    private void initThumbnailViews(final StreamInfo info) {
-        ImageView videoThumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
-        ImageView uploaderThumb
-                = (ImageView) activity.findViewById(R.id.detail_uploader_thumbnail_view);
-
-        if (info.thumbnail_url != null && !info.thumbnail_url.isEmpty()) {
-            imageLoader.displayImage(info.thumbnail_url, videoThumbnailView,
-                    displayImageOptions, new ImageLoadingListener() {
-                        @Override
-                        public void onLoadingStarted(String imageUri, View view) {
-                        }
-
-                        @Override
-                        public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
-                            ErrorActivity.reportError(getActivity(),
-                                    failReason.getCause(), null, rootView,
-                                    ErrorActivity.ErrorInfo.make(ErrorActivity.LOAD_IMAGE,
-                                            NewPipe.getNameOfService(info.service_id), imageUri,
-                                            R.string.could_not_load_thumbnails));
-                        }
-
-                        @Override
-                        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
-                            streamThumbnail = loadedImage;
-                        }
-
-                        @Override
-                        public void onLoadingCancelled(String imageUri, View view) {
-                        }
-                    });
-        } else {
-            videoThumbnailView.setImageResource(R.drawable.dummy_thumbnail_dark);
-        }
-        if (info.uploader_thumbnail_url != null && !info.uploader_thumbnail_url.isEmpty()) {
-            imageLoader.displayImage(info.uploader_thumbnail_url,
-                    uploaderThumb, displayImageOptions,
-                    new ImageErrorLoadingListener(activity, rootView, info.service_id));
-        }
-    }
-
-    private void setupActionBarHandler(final StreamInfo info) {
-        actionBarHandler.setupStreamList(info.video_streams);
-
-        actionBarHandler.setOnShareListener(new ActionBarHandler.OnActionListener() {
-            @Override
-            public void onActionSelected(int selectedStreamId) {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_SEND);
-                intent.putExtra(Intent.EXTRA_TEXT, info.webpage_url);
-                intent.setType("text/plain");
-                activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
-            }
-        });
-
-        actionBarHandler.setOnOpenInBrowserListener(new ActionBarHandler.OnActionListener() {
-            @Override
-            public void onActionSelected(int selectedStreamId) {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(info.webpage_url));
-
-                activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.choose_browser)));
-            }
-        });
-
-        actionBarHandler.setOnPlayWithKodiListener(new ActionBarHandler.OnActionListener() {
-            @Override
-            public void onActionSelected(int selectedStreamId) {
-                try {
-                    Intent intent = new Intent(Intent.ACTION_VIEW);
-                    intent.setPackage(KORE_PACKET);
-                    intent.setData(Uri.parse(info.webpage_url.replace("https", "http")));
-                    activity.startActivity(intent);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                    builder.setMessage(R.string.kore_not_found)
-                            .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    Intent intent = new Intent();
-                                    intent.setAction(Intent.ACTION_VIEW);
-                                    intent.setData(Uri.parse(activity.getString(R.string.fdroid_kore_url)));
-                                    activity.startActivity(intent);
-                                }
-                            })
-                            .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-
-                                }
-                            });
-                    builder.create().show();
-                }
-            }
-        });
-
-        actionBarHandler.setOnDownloadListener(new ActionBarHandler.OnActionListener() {
-            @Override
-            public void onActionSelected(int selectedStreamId) {
-                if(!PermissionHelper.checkStoragePermissions(getActivity())) {
-                    return;
-                }
-
-                try {
-                    Bundle args = new Bundle();
-
-                    // Sometimes it may be that some information is not available due to changes fo the
-                    // website which was crawled. Then the ui has to understand this and act right.
-
-                    if (info.audio_streams != null) {
-                        AudioStream audioStream =
-                                info.audio_streams.get(getPreferredAudioStreamId(info));
-
-                        String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
-                        args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
-                        args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
-                    }
-
-                    if (info.video_streams != null) {
-                        VideoStream selectedStreamItem = info.video_streams.get(selectedStreamId);
-                        String videoSuffix = "." + MediaFormat.getSuffixById(selectedStreamItem.format);
-                        args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
-                        args.putString(DownloadDialog.VIDEO_URL, selectedStreamItem.url);
-                    }
-
-                    args.putString(DownloadDialog.TITLE, info.title);
-                    DownloadDialog downloadDialog = DownloadDialog.newInstance(args);
-                    downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
-                } catch (Exception e) {
-                    Toast.makeText(VideoItemDetailFragment.this.getActivity(),
-                            R.string.could_not_setup_download_menu, Toast.LENGTH_LONG).show();
-                    e.printStackTrace();
-                }
-            }
-        });
-
-        if (info.audio_streams == null) {
-            actionBarHandler.showAudioAction(false);
-        } else {
-            actionBarHandler.setOnPlayAudioListener(new ActionBarHandler.OnActionListener() {
-                @Override
-                public void onActionSelected(int selectedStreamId) {
-                    boolean useExternalAudioPlayer = PreferenceManager.getDefaultSharedPreferences(activity)
-                            .getBoolean(activity.getString(R.string.use_external_audio_player_key), false);
-                    Intent intent;
-                    AudioStream audioStream =
-                            info.audio_streams.get(getPreferredAudioStreamId(info));
-                    if (!useExternalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 18) {
-                        //internal music player: explicit intent
-                        if (!BackgroundPlayer.isRunning && streamThumbnail != null) {
-                            ActivityCommunicator.getCommunicator()
-                                    .backgroundPlayerThumbnail = streamThumbnail;
-                            intent = new Intent(activity, BackgroundPlayer.class);
-
-                            intent.setAction(Intent.ACTION_VIEW);
-                            Log.i(TAG, "audioStream is null:" + (audioStream == null));
-                            Log.i(TAG, "audioStream.url is null:" + (audioStream.url == null));
-                            intent.setDataAndType(Uri.parse(audioStream.url),
-                                    MediaFormat.getMimeById(audioStream.format));
-                            intent.putExtra(BackgroundPlayer.TITLE, info.title);
-                            intent.putExtra(BackgroundPlayer.WEB_URL, info.webpage_url);
-                            intent.putExtra(BackgroundPlayer.SERVICE_ID, streamingServiceId);
-                            intent.putExtra(BackgroundPlayer.CHANNEL_NAME, info.uploader);
-                            activity.startService(intent);
-                        }
-                    } else {
-                        intent = new Intent();
-                        try {
-                            intent.setAction(Intent.ACTION_VIEW);
-                            intent.setDataAndType(Uri.parse(audioStream.url),
-                                    MediaFormat.getMimeById(audioStream.format));
-                            intent.putExtra(Intent.EXTRA_TITLE, info.title);
-                            intent.putExtra("title", info.title);
-                            // HERE !!!
-                            activity.startActivity(intent);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                            builder.setMessage(R.string.no_player_found)
-                                    .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            Intent intent = new Intent();
-                                            intent.setAction(Intent.ACTION_VIEW);
-                                            intent.setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
-                                            activity.startActivity(intent);
-                                        }
-                                    })
-                                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            Log.i(TAG, "You unlocked a secret unicorn.");
-                                        }
-                                    });
-                            builder.create().show();
-                            Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            });
-        }
-    }
-
-    private int getPreferredAudioStreamId(final StreamInfo info) {
-        String preferredFormatString = PreferenceManager.getDefaultSharedPreferences(getActivity())
-                .getString(activity.getString(R.string.default_audio_format_key), "webm");
-
-        int preferredFormat = MediaFormat.WEBMA.id;
-        switch(preferredFormatString) {
-            case "webm":
-                preferredFormat = MediaFormat.WEBMA.id;
-                break;
-            case "m4a":
-                preferredFormat = MediaFormat.M4A.id;
-                break;
-            default:
-                break;
-        }
-
-        for(int i = 0; i < info.audio_streams.size(); i++) {
-            if(info.audio_streams.get(i).format == preferredFormat) {
-                return i;
-            }
-        }
-
-        //todo: make this a proper error
-        Log.e(TAG, "FAILED to set audioStream value!");
-        return 0;
-    }
-
-    private void initSimilarVideos(final StreamInfo info) {
-        LinearLayout similarLayout = (LinearLayout) activity.findViewById(R.id.similar_streams_view);
-        for (final InfoItem item : info.related_streams) {
-            similarLayout.addView(infoItemBuilder.buildView(similarLayout, item));
-        }
-        infoItemBuilder.setOnStreamInfoItemSelectedListener(
-                new InfoItemBuilder.OnInfoItemSelectedListener() {
-            @Override
-            public void selected(String url, int serviceId) {
-                NavStack.getInstance()
-                        .openDetailActivity(getContext(), url, serviceId);
-            }
-        });
-    }
-
-    private void onErrorBlockedByGema() {
-        Button backgroundButton = (Button)
-                activity.findViewById(R.id.detail_stream_thumbnail_window_background_button);
-        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
-
-        progressBar.setVisibility(View.GONE);
-        thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                getResources(), R.drawable.gruese_die_gema));
-        backgroundButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent();
-                intent.setAction(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(activity.getString(R.string.c3s_url)));
-                activity.startActivity(intent);
-            }
-        });
-
-        Toast.makeText(VideoItemDetailFragment.this.getActivity(),
-                R.string.blocked_by_gema, Toast.LENGTH_LONG).show();
-    }
-
-    private void onNotSpecifiedContentError() {
-        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
-        progressBar.setVisibility(View.GONE);
-        thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                getResources(), R.drawable.not_available_monkey));
-        Toast.makeText(activity, R.string.content_not_available, Toast.LENGTH_LONG)
-                .show();
-    }
-
-    private void onNotSpecifiedContentErrorWithMessage(int resourceId) {
-        ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
-        progressBar.setVisibility(View.GONE);
-        thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                getResources(), R.drawable.not_available_monkey));
-        Toast.makeText(activity, resourceId, Toast.LENGTH_LONG)
-                .show();
-    }
-
-    private boolean useStream(VideoStream stream, Vector<VideoStream> streams) {
-        for(VideoStream i : streams) {
-            if(i.resolution.equals(stream.resolution)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        activity = (AppCompatActivity) getActivity();
-        showNextStreamItem = PreferenceManager.getDefaultSharedPreferences(getActivity())
-                .getBoolean(activity.getString(R.string.show_next_video_key), true);
-
-
-        StreamInfoWorker siw = StreamInfoWorker.getInstance();
-        siw.setOnStreamInfoReceivedListener(new StreamInfoWorker.OnStreamInfoReceivedListener() {
-            @Override
-            public void onReceive(StreamInfo info) {
-                updateInfo(info);
-            }
-
-            @Override
-            public void onError(int messageId) {
-                postNewErrorToast(messageId);
-            }
-
-            @Override
-            public void onReCaptchaException() {
-                Toast.makeText(getActivity(), R.string.recaptcha_request_toast,
-                        Toast.LENGTH_LONG).show();
-
-                // Starting ReCaptcha Challenge Activity
-                startActivityForResult(
-                        new Intent(getActivity(), ReCaptchaActivity.class),
-                        RECAPTCHA_REQUEST);
-            }
-
-            @Override
-            public void onBlockedByGemaError() {
-                onErrorBlockedByGema();
-            }
-
-            @Override
-            public void onContentErrorWithMessage(int messageId) {
-                onNotSpecifiedContentErrorWithMessage(messageId);
-            }
-
-            @Override
-            public void onContentError() {
-                onNotSpecifiedContentError();
-            }
-        });
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        rootView = inflater.inflate(R.layout.fragment_videoitem_detail, container, false);
-        progressBar = (ProgressBar) rootView.findViewById(R.id.detail_progress_bar);
-
-        actionBarHandler = new ActionBarHandler(activity);
-        actionBarHandler.setupNavMenu(activity);
-        if(onInvokeCreateOptionsMenuListener != null) {
-            onInvokeCreateOptionsMenuListener.createOptionsMenu();
-        }
-
-        return rootView;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        Activity a = getActivity();
-        infoItemBuilder = new InfoItemBuilder(a, a.findViewById(android.R.id.content));
-
-        if (android.os.Build.VERSION.SDK_INT < 18) {
-            playVideoButton = (FloatingActionButton) a.findViewById(R.id.play_video_button);
-        }
-        thumbnailWindowLayout = a.findViewById(R.id.detail_stream_thumbnail_window_layout);
-        Button backgroundButton = (Button)
-                a.findViewById(R.id.detail_stream_thumbnail_window_background_button);
-
-        // Sometimes when this fragment is not visible it still gets initiated
-        // then we must not try to access objects of this fragment.
-        // Otherwise the applications would crash.
-        if(backgroundButton != null) {
-            streamingServiceId = getArguments().getInt(NavStack.SERVICE_ID);
-            String videoUrl = getArguments().getString(NavStack.URL);
-            StreamInfoWorker siw = StreamInfoWorker.getInstance();
-            siw.search(streamingServiceId, videoUrl, getActivity());
-
-            autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
-
-            if(Build.VERSION.SDK_INT >= 18) {
-                ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detail_thumbnail_view);
-                thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-                    // This is used to synchronize the thumbnailWindowButton and the playVideoButton
-                    // inside the ScrollView with the actual size of the thumbnail.
-                    //todo: onLayoutChage sometimes not triggered
-                    // background buttons area seem to overlap the thumbnail view
-                    // So although you just clicked slightly beneath the thumbnail the action still
-                    // gets triggered.
-                    @Override
-                    public void onLayoutChange(View v, int left, int top, int right, int bottom,
-                                               int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                        RelativeLayout.LayoutParams newWindowLayoutParams =
-                                (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
-                        newWindowLayoutParams.height = bottom - top;
-                        thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
-
-                        //noinspection SuspiciousNameCombination
-                        initialThumbnailPos.set(top, left);
-
-                    }
-                });
-            }
-        }
-    }
-
-    public void playVideo(final StreamInfo info) {
-        // ----------- THE MAGIC MOMENT ---------------
-        VideoStream selectedVideoStream =
-                info.video_streams.get(actionBarHandler.getSelectedVideoStream());
-
-        if (PreferenceManager.getDefaultSharedPreferences(activity)
-                .getBoolean(activity.getString(R.string.use_external_video_player_key), false)) {
-
-            // External Player
-            Intent intent = new Intent();
-            try {
-                intent.setAction(Intent.ACTION_VIEW)
-                        .setDataAndType(Uri.parse(selectedVideoStream.url),
-                            MediaFormat.getMimeById(selectedVideoStream.format))
-                        .putExtra(Intent.EXTRA_TITLE, info.title)
-                        .putExtra("title", info.title);
-
-                activity.startActivity(intent);      // HERE !!!
-            } catch (Exception e) {
-                e.printStackTrace();
-                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                builder.setMessage(R.string.no_player_found)
-                        .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                Intent intent = new Intent()
-                                        .setAction(Intent.ACTION_VIEW)
-                                        .setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
-                                activity.startActivity(intent);
-                            }
-                        })
-                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-
-                            }
-                        });
-                builder.create().show();
-            }
-        } else {
-            if (PreferenceManager.getDefaultSharedPreferences(activity)
-                    .getBoolean(activity.getString(R.string.use_exoplayer_key), false)) {
-
-                // exo player
-
-                if(info.dashMpdUrl != null && !info.dashMpdUrl.isEmpty()) {
-                    // try dash
-                    Intent intent = new Intent(activity, ExoPlayerActivity.class)
-                            .setData(Uri.parse(info.dashMpdUrl))
-                            .putExtra(ExoPlayerActivity.CONTENT_TYPE_EXTRA, Util.TYPE_DASH);
-                    startActivity(intent);
-                } else if((info.audio_streams != null  && !info.audio_streams.isEmpty()) &&
-                        (info.video_only_streams != null && !info.video_only_streams.isEmpty())) {
-                    // try smooth streaming
-
-                } else {
-                    //default streaming
-                    Intent intent = new Intent(activity, ExoPlayerActivity.class)
-                            .setDataAndType(Uri.parse(selectedVideoStream.url),
-                                MediaFormat.getMimeById(selectedVideoStream.format))
-                            .putExtra(ExoPlayerActivity.CONTENT_TYPE_EXTRA, Util.TYPE_OTHER);
-
-                    activity.startActivity(intent);      // HERE !!!
-                }
-                //-------------
-
-            } else {
-                // Internal Player
-                Intent intent = new Intent(activity, PlayVideoActivity.class)
-                        .putExtra(PlayVideoActivity.VIDEO_TITLE, info.title)
-                        .putExtra(PlayVideoActivity.STREAM_URL, selectedVideoStream.url)
-                        .putExtra(PlayVideoActivity.VIDEO_URL, info.webpage_url)
-                        .putExtra(PlayVideoActivity.START_POSITION, info.start_position);
-                activity.startActivity(intent);     //also HERE !!!
-            }
-        }
-
-        // --------------------------------------------
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        actionBarHandler.setupMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if(!actionBarHandler.onItemSelected(item)) {
-            return super.onOptionsItemSelected(item);
-        } else {
-            return true;
-        }
-    }
-
-    public void setOnInvokeCreateOptionsMenuListener(OnInvokeCreateOptionsMenuListener listener) {
-        this.onInvokeCreateOptionsMenuListener = listener;
-    }
-
-    private void postNewErrorToast(final int stringResource) {
-        Toast.makeText(VideoItemDetailFragment.this.getActivity(),
-                stringResource, Toast.LENGTH_LONG).show();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case RECAPTCHA_REQUEST:
-                if (resultCode == RESULT_OK) {
-                    String videoUrl = getArguments().getString(NavStack.URL);
-                    StreamInfoWorker siw = StreamInfoWorker.getInstance();
-                    siw.search(streamingServiceId, videoUrl, getActivity());
-                } else {
-                    Log.d(TAG, "ReCaptcha failed");
-                }
-                break;
-
-            default:
-                Log.e(TAG, "Request code from activity not supported [" + requestCode + "]");
-                break;
-        }
-    }
-}

app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java

@@ -26,7 +26,6 @@ import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.util.NavStack;
 
 import java.io.IOException;
@@ -343,7 +342,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
 
             /*
             NotificationCompat.Action pauseButton = new NotificationCompat.Action.Builder
-                    (R.drawable.ic_pause_white_24dp, "Pause", playPI).build();
+                    (R.drawable.ic_pause_white, "Pause", playPI).build();
             */
 
             PendingIntent playPI = PendingIntent.getBroadcast(owner, noteID,
@@ -465,7 +464,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
                 RemoteViews views = getContentView(), bigViews = getBigContentView();
                 int imageSrc;
                 if(isPlaying) {
-                    imageSrc = R.drawable.ic_pause_white_24dp;
+                    imageSrc = R.drawable.ic_pause_white;
                 } else {
                     imageSrc = R.drawable.ic_play_circle_filled_white_24dp;
                 }

app/src/main/java/org/schabi/newpipe/player/PlayVideoActivity.java

@@ -5,9 +5,8 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
-import android.media.MediaPlayer;
 import android.media.AudioManager;
+import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -28,7 +27,6 @@ import android.widget.MediaController;
 import android.widget.ProgressBar;
 import android.widget.VideoView;
 
-import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 
 /**

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

@@ -0,0 +1,617 @@
+package org.schabi.newpipe.player;
+
+import android.annotation.SuppressLint;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.PixelFormat;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.os.IBinder;
+import android.support.v4.app.NotificationCompat;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.PopupMenu;
+import android.widget.RemoteViews;
+import android.widget.Toast;
+
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
+
+import org.schabi.newpipe.ActivityCommunicator;
+import org.schabi.newpipe.BuildConfig;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.detail.VideoItemDetailActivity;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.stream_info.StreamExtractor;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.util.NavStack;
+import org.schabi.newpipe.util.ThemeHelper;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+/**
+ * Service Popup Player implementing AbstractPlayer
+ *
+ * @author mauriciocolli
+ */
+public class PopupVideoPlayer extends Service {
+    private static final String TAG = ".PopupVideoPlayer";
+    private static final boolean DEBUG = AbstractPlayer.DEBUG;
+
+    private static final int NOTIFICATION_ID = 40028922;
+    public static final String ACTION_CLOSE = "org.schabi.newpipe.player.PopupVideoPlayer.CLOSE";
+    public static final String ACTION_PLAY_PAUSE = "org.schabi.newpipe.player.PopupVideoPlayer.PLAY_PAUSE";
+    public static final String ACTION_OPEN_DETAIL = "org.schabi.newpipe.player.PopupVideoPlayer.OPEN_DETAIL";
+    public static final String ACTION_REPEAT = "org.schabi.newpipe.player.PopupVideoPlayer.REPEAT";
+
+    private BroadcastReceiver broadcastReceiver;
+
+    private WindowManager windowManager;
+    private WindowManager.LayoutParams windowLayoutParams;
+    private GestureDetector gestureDetector;
+
+    private float screenWidth, screenHeight;
+    private float popupWidth, popupHeight;
+    private float currentPopupHeight = 110.0f * Resources.getSystem().getDisplayMetrics().density;
+    //private float minimumHeight = 100; // TODO: Use it when implementing the resize of the popup
+
+    private final String setAlphaMethodName = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) ? "setImageAlpha" : "setAlpha";
+    private NotificationManager notificationManager;
+    private NotificationCompat.Builder notBuilder;
+    private RemoteViews notRemoteView;
+
+
+    private ImageLoader imageLoader = ImageLoader.getInstance();
+    private DisplayImageOptions displayImageOptions = new DisplayImageOptions.Builder().cacheInMemory(true).build();
+
+    private AbstractPlayerImpl playerImpl;
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Service LifeCycle
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Override
+    public void onCreate() {
+        windowManager = (WindowManager) getSystemService(WINDOW_SERVICE);
+        notificationManager = ((NotificationManager) getSystemService(NOTIFICATION_SERVICE));
+        initReceiver();
+
+        playerImpl = new AbstractPlayerImpl();
+        ThemeHelper.setTheme(this, false);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public int onStartCommand(final Intent intent, int flags, int startId) {
+        if (DEBUG) Log.d(TAG, "onStartCommand() called with: intent = [" + intent + "], flags = [" + flags + "], startId = [" + startId + "]");
+        if (playerImpl.getPlayer() == null) initPopup();
+        if (!playerImpl.isPlaying()) playerImpl.getPlayer().setPlayWhenReady(true);
+
+        if (imageLoader != null) imageLoader.clearMemoryCache();
+        if (intent.getStringExtra(NavStack.URL) != null) {
+            playerImpl.setStartedFromNewPipe(false);
+            Thread fetcher = new Thread(new FetcherRunnable(intent));
+            fetcher.start();
+        } else {
+            playerImpl.setStartedFromNewPipe(true);
+            playerImpl.handleIntent(intent);
+        }
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        updateScreenSize();
+    }
+
+    @Override
+    public void onDestroy() {
+        if (DEBUG) Log.d(TAG, "onDestroy() called");
+        stopForeground(true);
+        if (playerImpl != null) {
+            playerImpl.destroy();
+            if (playerImpl.getRootView() != null) windowManager.removeView(playerImpl.getRootView());
+        }
+        if (imageLoader != null) imageLoader.clearMemoryCache();
+        if (notificationManager != null) notificationManager.cancel(NOTIFICATION_ID);
+        if (broadcastReceiver != null) unregisterReceiver(broadcastReceiver);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Init
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void initReceiver() {
+        broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (DEBUG) Log.d(TAG, "onReceive() called with: context = [" + context + "], intent = [" + intent + "]");
+                switch (intent.getAction()) {
+                    case ACTION_CLOSE:
+                        onVideoClose();
+                        break;
+                    case ACTION_PLAY_PAUSE:
+                        playerImpl.onVideoPlayPause();
+                        break;
+                    case ACTION_OPEN_DETAIL:
+                        onOpenDetail(PopupVideoPlayer.this, playerImpl.getVideoUrl());
+                        break;
+                    case ACTION_REPEAT:
+                        playerImpl.onRepeatClicked();
+                        break;
+                    case AbstractPlayer.ACTION_UPDATE_THUMB:
+                        playerImpl.onUpdateThumbnail(intent);
+                        break;
+                }
+            }
+        };
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(ACTION_CLOSE);
+        intentFilter.addAction(ACTION_PLAY_PAUSE);
+        intentFilter.addAction(ACTION_OPEN_DETAIL);
+        intentFilter.addAction(ACTION_REPEAT);
+        intentFilter.addAction(AbstractPlayer.ACTION_UPDATE_THUMB);
+        registerReceiver(broadcastReceiver, intentFilter);
+    }
+
+    @SuppressLint("RtlHardcoded")
+    private void initPopup() {
+        if (DEBUG) Log.d(TAG, "initPopup() called");
+        View rootView = View.inflate(this, R.layout.player_popup, null);
+
+        playerImpl.setup(rootView);
+
+        updateScreenSize();
+        windowLayoutParams = new WindowManager.LayoutParams(
+                (int) getMinimumVideoWidth(currentPopupHeight), (int) currentPopupHeight,
+                WindowManager.LayoutParams.TYPE_PHONE,
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+                PixelFormat.TRANSLUCENT);
+
+        windowLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+
+        MySimpleOnGestureListener listener = new MySimpleOnGestureListener();
+        gestureDetector = new GestureDetector(this, listener);
+        gestureDetector.setIsLongpressEnabled(false);
+        rootView.setOnTouchListener(listener);
+        playerImpl.getLoadingPanel().setMinimumWidth(windowLayoutParams.width);
+        playerImpl.getLoadingPanel().setMinimumHeight(windowLayoutParams.height);
+        windowManager.addView(rootView, windowLayoutParams);
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Notification
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private NotificationCompat.Builder createNotification() {
+        notRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_popup_notification);
+
+        if (playerImpl.getVideoThumbnail() != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, playerImpl.getVideoThumbnail());
+        else notRemoteView.setImageViewResource(R.id.notificationCover, R.drawable.dummy_thumbnail);
+        notRemoteView.setTextViewText(R.id.notificationSongName, playerImpl.getVideoTitle());
+        notRemoteView.setTextViewText(R.id.notificationArtist, playerImpl.getChannelName());
+
+        notRemoteView.setOnClickPendingIntent(R.id.notificationPlayPause,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_PLAY_PAUSE), PendingIntent.FLAG_UPDATE_CURRENT));
+        notRemoteView.setOnClickPendingIntent(R.id.notificationStop,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_CLOSE), PendingIntent.FLAG_UPDATE_CURRENT));
+        notRemoteView.setOnClickPendingIntent(R.id.notificationContent,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_OPEN_DETAIL), PendingIntent.FLAG_UPDATE_CURRENT));
+        notRemoteView.setOnClickPendingIntent(R.id.notificationRepeat,
+                PendingIntent.getBroadcast(this, NOTIFICATION_ID, new Intent(ACTION_REPEAT), PendingIntent.FLAG_UPDATE_CURRENT));
+
+        switch (playerImpl.getCurrentRepeatMode()) {
+            case REPEAT_DISABLED:
+                notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, 77);
+                break;
+            case REPEAT_ONE:
+                notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, 255);
+                break;
+            case REPEAT_ALL:
+                // Waiting :)
+                break;
+        }
+
+        return new NotificationCompat.Builder(this)
+                .setOngoing(true)
+                .setSmallIcon(R.drawable.ic_play_arrow_white)
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setContent(notRemoteView);
+    }
+
+    /**
+     * Updates the notification, and the play/pause button in it.
+     * Used for changes on the remoteView
+     *
+     * @param drawableId if != -1, sets the drawable with that id on the play/pause button
+     */
+    private void updateNotification(int drawableId) {
+        if (DEBUG) Log.d(TAG, "updateNotification() called with: drawableId = [" + drawableId + "]");
+        if (notBuilder == null || notRemoteView == null) return;
+        if (drawableId != -1) notRemoteView.setImageViewResource(R.id.notificationPlayPause, drawableId);
+        notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
+    }
+
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Misc
+    //////////////////////////////////////////////////////////////////////////*/
+
+    public void onVideoClose() {
+        if (DEBUG) Log.d(TAG, "onVideoClose() called");
+        stopSelf();
+    }
+
+    public void onOpenDetail(Context context, String videoUrl) {
+        if (DEBUG) Log.d(TAG, "onOpenDetail() called with: context = [" + context + "], videoUrl = [" + videoUrl + "]");
+        Intent i = new Intent(context, VideoItemDetailActivity.class);
+        i.putExtra(NavStack.SERVICE_ID, 0)
+                .putExtra(NavStack.URL, videoUrl)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(i);
+        context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private float getMinimumVideoWidth(float height) {
+        float width = height * (16.0f / 9.0f); // Respect the 16:9 ratio that most videos have
+        if (DEBUG) Log.d(TAG, "getMinimumVideoWidth() called with: height = [" + height + "], returned: " + width);
+        return width;
+    }
+
+    private void updateScreenSize() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        windowManager.getDefaultDisplay().getMetrics(metrics);
+
+        screenWidth = metrics.widthPixels;
+        screenHeight = metrics.heightPixels;
+        if (DEBUG) Log.d(TAG, "updateScreenSize() called > screenWidth = " + screenWidth + ", screenHeight = " + screenHeight);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    private class AbstractPlayerImpl extends AbstractPlayer {
+        AbstractPlayerImpl() {
+            super("AbstractPlayerImpl" + PopupVideoPlayer.TAG, PopupVideoPlayer.this);
+        }
+
+        @Override
+        public void playVideo(Uri videoURI, boolean autoPlay) {
+            super.playVideo(videoURI, autoPlay);
+
+            windowLayoutParams.width = (int) getMinimumVideoWidth(currentPopupHeight);
+            windowManager.updateViewLayout(getRootView(), windowLayoutParams);
+
+            notBuilder = createNotification();
+            startForeground(NOTIFICATION_ID, notBuilder.build());
+            notificationManager.notify(NOTIFICATION_ID, notBuilder.build());
+        }
+
+        @Override
+        public void onFullScreenButtonClicked() {
+            if (DEBUG) Log.d(TAG, "onFullScreenButtonClicked() called");
+            Intent intent;
+            //if (getSharedPreferences().getBoolean(getResources().getString(R.string.use_exoplayer_key), false)) {
+            // TODO: Remove this check when ExoPlayer is the default
+            // For now just disable the non-exoplayer player
+            //noinspection ConstantConditions,ConstantIfStatement
+            if (true) {
+                intent = new Intent(PopupVideoPlayer.this, ExoPlayerActivity.class)
+                        .putExtra(AbstractPlayer.VIDEO_TITLE, getVideoTitle())
+                        .putExtra(AbstractPlayer.VIDEO_URL, getVideoUrl())
+                        .putExtra(AbstractPlayer.CHANNEL_NAME, getChannelName())
+                        .putExtra(AbstractPlayer.INDEX_SEL_VIDEO_STREAM, getSelectedIndexStream())
+                        .putExtra(AbstractPlayer.VIDEO_STREAMS_LIST, getVideoStreamsList())
+                        .putExtra(AbstractPlayer.START_POSITION, ((int) getPlayer().getCurrentPosition()));
+                if (!playerImpl.isStartedFromNewPipe()) intent.putExtra(AbstractPlayer.STARTED_FROM_NEWPIPE, false);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            } else {
+                intent = new Intent(PopupVideoPlayer.this, PlayVideoActivity.class)
+                        .putExtra(PlayVideoActivity.VIDEO_TITLE, getVideoTitle())
+                        .putExtra(PlayVideoActivity.STREAM_URL, getSelectedStreamUri().toString())
+                        .putExtra(PlayVideoActivity.VIDEO_URL, getVideoUrl())
+                        .putExtra(PlayVideoActivity.START_POSITION, Math.round(getPlayer().getCurrentPosition() / 1000f));
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
+            context.startActivity(intent);
+            stopSelf();
+        }
+
+        @Override
+        public void onRepeatClicked() {
+            super.onRepeatClicked();
+            switch (getCurrentRepeatMode()) {
+                case REPEAT_DISABLED:
+                    // Drawable didn't work on low API :/
+                    //notRemoteView.setImageViewResource(R.id.notificationRepeat, R.drawable.ic_repeat_disabled_white);
+                    // Set the icon to 30% opacity - 255 (max) * .3
+                    notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, 77);
+                    break;
+                case REPEAT_ONE:
+                    notRemoteView.setInt(R.id.notificationRepeat, setAlphaMethodName, 255);
+                    break;
+                case REPEAT_ALL:
+                    // Waiting :)
+                    break;
+            }
+            updateNotification(-1);
+        }
+
+        @Override
+        public void onUpdateThumbnail(Intent intent) {
+            super.onUpdateThumbnail(intent);
+            if (getVideoThumbnail() != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, getVideoThumbnail());
+            updateNotification(-1);
+        }
+
+        @Override
+        public void onDismiss(PopupMenu menu) {
+            super.onDismiss(menu);
+            if (isPlaying()) animateView(getControlsRoot(), false, 500, 0);
+        }
+
+        @Override
+        public void onError() {
+            Toast.makeText(context, "Failed to play this video", Toast.LENGTH_SHORT).show();
+            stopSelf();
+        }
+
+        /*//////////////////////////////////////////////////////////////////////////
+        // States
+        //////////////////////////////////////////////////////////////////////////*/
+
+        @Override
+        public void onLoading() {
+            super.onLoading();
+            updateNotification(R.drawable.ic_play_arrow_white);
+        }
+
+        @Override
+        public void onPlaying() {
+            super.onPlaying();
+            updateNotification(R.drawable.ic_pause_white);
+        }
+
+        @Override
+        public void onBuffering() {
+            super.onBuffering();
+            updateNotification(R.drawable.ic_play_arrow_white);
+        }
+
+        @Override
+        public void onPaused() {
+            super.onPaused();
+            updateNotification(R.drawable.ic_play_arrow_white);
+            showAndAnimateControl(R.drawable.ic_play_arrow_white, false);
+        }
+
+        @Override
+        public void onPausedSeek() {
+            super.onPausedSeek();
+            updateNotification(R.drawable.ic_play_arrow_white);
+        }
+
+        @Override
+        public void onCompleted() {
+            super.onCompleted();
+            updateNotification(R.drawable.ic_replay_white);
+            showAndAnimateControl(R.drawable.ic_replay_white, false);
+        }
+
+    }
+
+    private class MySimpleOnGestureListener extends GestureDetector.SimpleOnGestureListener implements View.OnTouchListener {
+        private int initialPopupX, initialPopupY;
+        private boolean isMoving;
+
+        @Override
+        public boolean onDoubleTap(MotionEvent e) {
+            if (DEBUG) Log.d(TAG, "onDoubleTap() called with: e = [" + e + "]" + "rawXy = " + e.getRawX() + ", " + e.getRawY() + ", xy = " + e.getX() + ", " + e.getY());
+            if (!playerImpl.isPlaying()) return false;
+            if (e.getX() > popupWidth / 2) playerImpl.onFastForward();
+            else playerImpl.onFastRewind();
+            return true;
+        }
+
+        @Override
+        public boolean onSingleTapConfirmed(MotionEvent e) {
+            if (DEBUG) Log.d(TAG, "onSingleTapConfirmed() called with: e = [" + e + "]");
+            if (playerImpl.getPlayer() == null) return false;
+            playerImpl.onVideoPlayPause();
+            return true;
+        }
+
+        @Override
+        public boolean onDown(MotionEvent e) {
+            if (DEBUG) Log.d(TAG, "onDown() called with: e = [" + e + "]");
+            initialPopupX = windowLayoutParams.x;
+            initialPopupY = windowLayoutParams.y;
+            popupWidth = playerImpl.getRootView().getWidth();
+            popupHeight = playerImpl.getRootView().getHeight();
+            return false;
+        }
+
+        @Override
+        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+            if (!isMoving || playerImpl.getControlsRoot().getAlpha() != 1f) playerImpl.animateView(playerImpl.getControlsRoot(), true, 30, 0);
+            isMoving = true;
+            float diffX = (int) (e2.getRawX() - e1.getRawX()), posX = (int) (initialPopupX + diffX);
+            float diffY = (int) (e2.getRawY() - e1.getRawY()), posY = (int) (initialPopupY + diffY);
+
+            if (posX > (screenWidth - popupWidth)) posX = (int) (screenWidth - popupWidth);
+            else if (posX < 0) posX = 0;
+
+            if (posY > (screenHeight - popupHeight)) posY = (int) (screenHeight - popupHeight);
+            else if (posY < 0) posY = 0;
+
+            windowLayoutParams.x = (int) posX;
+            windowLayoutParams.y = (int) posY;
+
+            //noinspection PointlessBooleanExpression
+            if (DEBUG && false) Log.d(TAG, "PopupVideoPlayer.onScroll = " +
+                    ", e1.getRaw = [" + e1.getRawX() + ", " + e1.getRawY() + "]" +
+                    ", e2.getRaw = [" + e2.getRawX() + ", " + e2.getRawY() + "]" +
+                    ", distanceXy = [" + distanceX + ", " + distanceY + "]" +
+                    ", posXy = [" + posX + ", " + posY + "]" +
+                    ", popupWh rootView.get wh = [" + popupWidth + " x " + popupHeight + "]");
+            windowManager.updateViewLayout(playerImpl.getRootView(), windowLayoutParams);
+            return true;
+        }
+
+        private void onScrollEnd() {
+            if (DEBUG) Log.d(TAG, "onScrollEnd() called");
+            if (playerImpl.isControlsVisible() && playerImpl.getCurrentState() == StateInterface.STATE_PLAYING) {
+                playerImpl.animateView(playerImpl.getControlsRoot(), false, 300, AbstractPlayer.DEFAULT_CONTROLS_HIDE_TIME);
+            }
+        }
+
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            gestureDetector.onTouchEvent(event);
+            if (event.getAction() == MotionEvent.ACTION_UP && isMoving) {
+                isMoving = false;
+                onScrollEnd();
+            }
+            return true;
+        }
+
+    }
+
+    /**
+     * Fetcher used if open by a link out of NewPipe
+     */
+    private class FetcherRunnable implements Runnable {
+        private final Intent intent;
+        private final Handler mainHandler;
+        private final boolean printStreams = true;
+
+
+        FetcherRunnable(Intent intent) {
+            this.intent = intent;
+            this.mainHandler = new Handler(PopupVideoPlayer.this.getMainLooper());
+        }
+
+        @Override
+        public void run() {
+            StreamExtractor streamExtractor;
+            try {
+                StreamingService service = NewPipe.getService(0);
+                if (service == null) return;
+                streamExtractor = service.getExtractorInstance(intent.getStringExtra(NavStack.URL));
+                StreamInfo info = StreamInfo.getVideoInfo(streamExtractor);
+                String defaultResolution = playerImpl.getSharedPreferences().getString(
+                        getResources().getString(R.string.default_resolution_key),
+                        getResources().getString(R.string.default_resolution_value));
+
+                VideoStream chosen = null, secondary = null, fallback = null;
+                playerImpl.setVideoStreamsList(info.video_streams instanceof ArrayList
+                        ? (ArrayList<VideoStream>) info.video_streams
+                        : new ArrayList<>(info.video_streams));
+
+                for (VideoStream item : info.video_streams) {
+                    if (DEBUG && printStreams) {
+                        Log.d(TAG, "FetcherRunnable.StreamExtractor: current Item"
+                                + ", item.resolution = " + item.resolution
+                                + ", item.format = " + item.format
+                                + ", item.url = " + item.url);
+                    }
+                    if (defaultResolution.equals(item.resolution)) {
+                        if (item.format == MediaFormat.MPEG_4.id) {
+                            chosen = item;
+                            if (DEBUG) Log.d(TAG, "FetcherRunnable.StreamExtractor: CHOSEN item, item.resolution = " + item.resolution + ", item.format = " + item.format + ", item.url = " + item.url);
+                        } else if (item.format == 2) secondary = item;
+                        else fallback = item;
+                    }
+                }
+
+                int selectedIndexStream;
+
+                if (chosen != null) selectedIndexStream = info.video_streams.indexOf(chosen);
+                else if (secondary != null) selectedIndexStream = info.video_streams.indexOf(secondary);
+                else if (fallback != null) selectedIndexStream = info.video_streams.indexOf(fallback);
+                else selectedIndexStream = 0;
+
+                playerImpl.setSelectedIndexStream(selectedIndexStream);
+
+                if (DEBUG && printStreams) Log.d(TAG, "FetcherRunnable.StreamExtractor: chosen = " + chosen
+                        + "\n, secondary = " + secondary
+                        + "\n, fallback = " + fallback
+                        + "\n, info.video_streams.get(0).url = " + info.video_streams.get(0).url);
+
+
+                playerImpl.setVideoUrl(info.webpage_url);
+                playerImpl.setVideoTitle(info.title);
+                playerImpl.setChannelName(info.uploader);
+                if (info.start_position > 0) playerImpl.setVideoStartPos(info.start_position * 1000);
+                else playerImpl.setVideoStartPos(-1);
+
+                mainHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        playerImpl.playVideo(playerImpl.getSelectedStreamUri(), true);
+                    }
+                });
+                imageLoader.loadImage(info.thumbnail_url, displayImageOptions, new SimpleImageLoadingListener() {
+                    @Override
+                    public void onLoadingComplete(String imageUri, View view, final Bitmap loadedImage) {
+                        mainHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                playerImpl.setVideoThumbnail(loadedImage);
+                                if (loadedImage != null) notRemoteView.setImageViewBitmap(R.id.notificationCover, loadedImage);
+                                updateNotification(-1);
+                                ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail = loadedImage;
+                            }
+                        });
+                    }
+                });
+            } catch (IOException ie) {
+                if (DEBUG) ie.printStackTrace();
+                mainHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(PopupVideoPlayer.this, R.string.network_error, Toast.LENGTH_SHORT).show();
+                    }
+                });
+                stopSelf();
+            } catch (Exception e) {
+                if (DEBUG) e.printStackTrace();
+                mainHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        Toast.makeText(PopupVideoPlayer.this, R.string.content_not_available, Toast.LENGTH_SHORT).show();
+                    }
+                });
+                stopSelf();
+            }
+        }
+    }
+
+}

app/src/main/java/org/schabi/newpipe/player/StateInterface.java

@@ -0,0 +1,19 @@
+package org.schabi.newpipe.player;
+
+public interface StateInterface {
+    int STATE_LOADING = 123;
+    int STATE_PLAYING = 124;
+    int STATE_BUFFERING = 125;
+    int STATE_PAUSED = 126;
+    int STATE_PAUSED_SEEK = 127;
+    int STATE_COMPLETED = 128;
+
+    void changeState(int state);
+
+    void onLoading();
+    void onPlaying();
+    void onBuffering();
+    void onPaused();
+    void onPausedSeek();
+    void onCompleted();
+}

app/src/main/java/org/schabi/newpipe/player/exoplayer/DashRendererBuilder.java

@@ -1,268 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
-
-import com.google.android.exoplayer.DefaultLoadControl;
-import com.google.android.exoplayer.LoadControl;
-import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
-import com.google.android.exoplayer.MediaCodecSelector;
-import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.audio.AudioCapabilities;
-import com.google.android.exoplayer.chunk.ChunkSampleSource;
-import com.google.android.exoplayer.chunk.ChunkSource;
-import com.google.android.exoplayer.chunk.FormatEvaluator.AdaptiveEvaluator;
-import com.google.android.exoplayer.dash.DashChunkSource;
-import com.google.android.exoplayer.dash.DefaultDashTrackSelector;
-import com.google.android.exoplayer.dash.mpd.AdaptationSet;
-import com.google.android.exoplayer.dash.mpd.MediaPresentationDescription;
-import com.google.android.exoplayer.dash.mpd.MediaPresentationDescriptionParser;
-import com.google.android.exoplayer.dash.mpd.Period;
-import com.google.android.exoplayer.dash.mpd.UtcTimingElement;
-import com.google.android.exoplayer.dash.mpd.UtcTimingElementResolver;
-import com.google.android.exoplayer.dash.mpd.UtcTimingElementResolver.UtcTimingCallback;
-import com.google.android.exoplayer.drm.MediaDrmCallback;
-import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
-import com.google.android.exoplayer.drm.UnsupportedDrmException;
-import com.google.android.exoplayer.text.TextTrackRenderer;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DefaultAllocator;
-import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer.upstream.DefaultUriDataSource;
-import com.google.android.exoplayer.upstream.UriDataSource;
-import com.google.android.exoplayer.util.ManifestFetcher;
-import com.google.android.exoplayer.util.Util;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.os.Handler;
-import android.util.Log;
-
-import java.io.IOException;
-
-/**
- * A {@link RendererBuilder} for DASH.
- */
-public class DashRendererBuilder implements RendererBuilder {
-
-  private static final String TAG = "DashRendererBuilder";
-
-  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
-  private static final int VIDEO_BUFFER_SEGMENTS = 200;
-  private static final int AUDIO_BUFFER_SEGMENTS = 54;
-  private static final int TEXT_BUFFER_SEGMENTS = 2;
-  private static final int LIVE_EDGE_LATENCY_MS = 30000;
-
-  private static final int SECURITY_LEVEL_UNKNOWN = -1;
-  private static final int SECURITY_LEVEL_1 = 1;
-  private static final int SECURITY_LEVEL_3 = 3;
-
-  private final Context context;
-  private final String userAgent;
-  private final String url;
-  private final MediaDrmCallback drmCallback;
-
-  private AsyncRendererBuilder currentAsyncBuilder;
-
-  public DashRendererBuilder(Context context, String userAgent, String url,
-      MediaDrmCallback drmCallback) {
-    this.context = context;
-    this.userAgent = userAgent;
-    this.url = url;
-    this.drmCallback = drmCallback;
-  }
-
-  @Override
-  public void buildRenderers(NPExoPlayer player) {
-    currentAsyncBuilder = new AsyncRendererBuilder(context, userAgent, url, drmCallback, player);
-    currentAsyncBuilder.init();
-  }
-
-  @Override
-  public void cancel() {
-    if (currentAsyncBuilder != null) {
-      currentAsyncBuilder.cancel();
-      currentAsyncBuilder = null;
-    }
-  }
-
-  private static final class AsyncRendererBuilder
-      implements ManifestFetcher.ManifestCallback<MediaPresentationDescription>, UtcTimingCallback {
-
-    private final Context context;
-    private final String userAgent;
-    private final MediaDrmCallback drmCallback;
-    private final NPExoPlayer player;
-    private final ManifestFetcher<MediaPresentationDescription> manifestFetcher;
-    private final UriDataSource manifestDataSource;
-
-    private boolean canceled;
-    private MediaPresentationDescription manifest;
-    private long elapsedRealtimeOffset;
-
-    public AsyncRendererBuilder(Context context, String userAgent, String url,
-        MediaDrmCallback drmCallback, NPExoPlayer player) {
-      this.context = context;
-      this.userAgent = userAgent;
-      this.drmCallback = drmCallback;
-      this.player = player;
-      MediaPresentationDescriptionParser parser = new MediaPresentationDescriptionParser();
-      manifestDataSource = new DefaultUriDataSource(context, userAgent);
-      manifestFetcher = new ManifestFetcher<>(url, manifestDataSource, parser);
-    }
-
-    public void init() {
-      manifestFetcher.singleLoad(player.getMainHandler().getLooper(), this);
-    }
-
-    public void cancel() {
-      canceled = true;
-    }
-
-    @Override
-    public void onSingleManifest(MediaPresentationDescription manifest) {
-      if (canceled) {
-        return;
-      }
-
-      this.manifest = manifest;
-      if (manifest.dynamic && manifest.utcTiming != null) {
-        UtcTimingElementResolver.resolveTimingElement(manifestDataSource, manifest.utcTiming,
-            manifestFetcher.getManifestLoadCompleteTimestamp(), this);
-      } else {
-        buildRenderers();
-      }
-    }
-
-    @Override
-    public void onSingleManifestError(IOException e) {
-      if (canceled) {
-        return;
-      }
-
-      player.onRenderersError(e);
-    }
-
-    @Override
-    public void onTimestampResolved(UtcTimingElement utcTiming, long elapsedRealtimeOffset) {
-      if (canceled) {
-        return;
-      }
-
-      this.elapsedRealtimeOffset = elapsedRealtimeOffset;
-      buildRenderers();
-    }
-
-    @Override
-    public void onTimestampError(UtcTimingElement utcTiming, IOException e) {
-      if (canceled) {
-        return;
-      }
-
-      Log.e(TAG, "Failed to resolve UtcTiming element [" + utcTiming + "]", e);
-      // Be optimistic and continue in the hope that the device clock is correct.
-      buildRenderers();
-    }
-
-    private void buildRenderers() {
-      Period period = manifest.getPeriod(0);
-      Handler mainHandler = player.getMainHandler();
-      LoadControl loadControl = new DefaultLoadControl(new DefaultAllocator(BUFFER_SEGMENT_SIZE));
-      DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(mainHandler, player);
-
-      boolean hasContentProtection = false;
-      for (int i = 0; i < period.adaptationSets.size(); i++) {
-        AdaptationSet adaptationSet = period.adaptationSets.get(i);
-        if (adaptationSet.type != AdaptationSet.TYPE_UNKNOWN) {
-          hasContentProtection |= adaptationSet.hasContentProtection();
-        }
-      }
-
-      // Check drm support if necessary.
-      boolean filterHdContent = false;
-      StreamingDrmSessionManager drmSessionManager = null;
-      if (hasContentProtection) {
-        if (Util.SDK_INT < 18) {
-          player.onRenderersError(
-              new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME));
-          return;
-        }
-        try {
-          drmSessionManager = StreamingDrmSessionManager.newWidevineInstance(
-              player.getPlaybackLooper(), drmCallback, null, player.getMainHandler(), player);
-          filterHdContent = getWidevineSecurityLevel(drmSessionManager) != SECURITY_LEVEL_1;
-        } catch (UnsupportedDrmException e) {
-          player.onRenderersError(e);
-          return;
-        }
-      }
-
-      // Build the video renderer.
-      DataSource videoDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      ChunkSource videoChunkSource = new DashChunkSource(manifestFetcher,
-          DefaultDashTrackSelector.newVideoInstance(context, true, filterHdContent),
-          videoDataSource, new AdaptiveEvaluator(bandwidthMeter), LIVE_EDGE_LATENCY_MS,
-          elapsedRealtimeOffset, mainHandler, player, NPExoPlayer.TYPE_VIDEO);
-      ChunkSampleSource videoSampleSource = new ChunkSampleSource(videoChunkSource, loadControl,
-          VIDEO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
-          NPExoPlayer.TYPE_VIDEO);
-      TrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context, videoSampleSource,
-          MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000,
-          drmSessionManager, true, mainHandler, player, 50);
-
-      // Build the audio renderer.
-      DataSource audioDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      ChunkSource audioChunkSource = new DashChunkSource(manifestFetcher,
-          DefaultDashTrackSelector.newAudioInstance(), audioDataSource, null, LIVE_EDGE_LATENCY_MS,
-          elapsedRealtimeOffset, mainHandler, player, NPExoPlayer.TYPE_AUDIO);
-      ChunkSampleSource audioSampleSource = new ChunkSampleSource(audioChunkSource, loadControl,
-          AUDIO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
-          NPExoPlayer.TYPE_AUDIO);
-      TrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(audioSampleSource,
-          MediaCodecSelector.DEFAULT, drmSessionManager, true, mainHandler, player,
-          AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
-
-      // Build the text renderer.
-      DataSource textDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      ChunkSource textChunkSource = new DashChunkSource(manifestFetcher,
-          DefaultDashTrackSelector.newTextInstance(), textDataSource, null, LIVE_EDGE_LATENCY_MS,
-          elapsedRealtimeOffset, mainHandler, player, NPExoPlayer.TYPE_TEXT);
-      ChunkSampleSource textSampleSource = new ChunkSampleSource(textChunkSource, loadControl,
-          TEXT_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
-          NPExoPlayer.TYPE_TEXT);
-      TrackRenderer textRenderer = new TextTrackRenderer(textSampleSource, player,
-          mainHandler.getLooper());
-
-      // Invoke the callback.
-      TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
-      renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
-      renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
-      renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
-      player.onRenderers(renderers, bandwidthMeter);
-    }
-
-    private static int getWidevineSecurityLevel(StreamingDrmSessionManager sessionManager) {
-      String securityLevelProperty = sessionManager.getPropertyString("securityLevel");
-      return securityLevelProperty.equals("L1") ? SECURITY_LEVEL_1 : securityLevelProperty
-          .equals("L3") ? SECURITY_LEVEL_3 : SECURITY_LEVEL_UNKNOWN;
-    }
-
-  }
-
-}

app/src/main/java/org/schabi/newpipe/player/exoplayer/EventLogger.java

@@ -1,214 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-import com.google.android.exoplayer.ExoPlayer;
-import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException;
-import com.google.android.exoplayer.TimeRange;
-import com.google.android.exoplayer.audio.AudioTrack;
-import com.google.android.exoplayer.chunk.Format;
-import com.google.android.exoplayer.util.VerboseLogUtil;
-
-import android.media.MediaCodec.CryptoException;
-import android.os.SystemClock;
-import android.util.Log;
-
-import java.io.IOException;
-import java.text.NumberFormat;
-import java.util.Locale;
-
-/**
- * Logs player events using {@link Log}.
- */
-public class EventLogger implements NPExoPlayer.Listener, NPExoPlayer.InfoListener,
-    NPExoPlayer.InternalErrorListener {
-
-  private static final String TAG = "EventLogger";
-  private static final NumberFormat TIME_FORMAT;
-  static {
-    TIME_FORMAT = NumberFormat.getInstance(Locale.US);
-    TIME_FORMAT.setMinimumFractionDigits(2);
-    TIME_FORMAT.setMaximumFractionDigits(2);
-  }
-
-  private long sessionStartTimeMs;
-  private long[] loadStartTimeMs;
-  private long[] availableRangeValuesUs;
-
-  public EventLogger() {
-    loadStartTimeMs = new long[NPExoPlayer.RENDERER_COUNT];
-  }
-
-  public void startSession() {
-    sessionStartTimeMs = SystemClock.elapsedRealtime();
-    Log.d(TAG, "start [0]");
-  }
-
-  public void endSession() {
-    Log.d(TAG, "end [" + getSessionTimeString() + "]");
-  }
-
-  // NPExoPlayer.Listener
-
-  @Override
-  public void onStateChanged(boolean playWhenReady, int state) {
-    Log.d(TAG, "state [" + getSessionTimeString() + ", " + playWhenReady + ", "
-        + getStateString(state) + "]");
-  }
-
-  @Override
-  public void onError(Exception e) {
-    Log.e(TAG, "playerFailed [" + getSessionTimeString() + "]", e);
-  }
-
-  @Override
-  public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
-      float pixelWidthHeightRatio) {
-    Log.d(TAG, "videoSizeChanged [" + width + ", " + height + ", " + unappliedRotationDegrees
-        + ", " + pixelWidthHeightRatio + "]");
-  }
-
-  // NPExoPlayer.InfoListener
-
-  @Override
-  public void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate) {
-    Log.d(TAG, "bandwidth [" + getSessionTimeString() + ", " + bytes + ", "
-        + getTimeString(elapsedMs) + ", " + bitrateEstimate + "]");
-  }
-
-  @Override
-  public void onDroppedFrames(int count, long elapsed) {
-    Log.d(TAG, "droppedFrames [" + getSessionTimeString() + ", " + count + "]");
-  }
-
-  @Override
-  public void onLoadStarted(int sourceId, long length, int type, int trigger, Format format,
-      long mediaStartTimeMs, long mediaEndTimeMs) {
-    loadStartTimeMs[sourceId] = SystemClock.elapsedRealtime();
-    if (VerboseLogUtil.isTagEnabled(TAG)) {
-      Log.v(TAG, "loadStart [" + getSessionTimeString() + ", " + sourceId + ", " + type
-          + ", " + mediaStartTimeMs + ", " + mediaEndTimeMs + "]");
-    }
-  }
-
-  @Override
-  public void onLoadCompleted(int sourceId, long bytesLoaded, int type, int trigger, Format format,
-       long mediaStartTimeMs, long mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs) {
-    if (VerboseLogUtil.isTagEnabled(TAG)) {
-      long downloadTime = SystemClock.elapsedRealtime() - loadStartTimeMs[sourceId];
-      Log.v(TAG, "loadEnd [" + getSessionTimeString() + ", " + sourceId + ", " + downloadTime
-          + "]");
-    }
-  }
-
-  @Override
-  public void onVideoFormatEnabled(Format format, int trigger, long mediaTimeMs) {
-    Log.d(TAG, "videoFormat [" + getSessionTimeString() + ", " + format.id + ", "
-        + Integer.toString(trigger) + "]");
-  }
-
-  @Override
-  public void onAudioFormatEnabled(Format format, int trigger, long mediaTimeMs) {
-    Log.d(TAG, "audioFormat [" + getSessionTimeString() + ", " + format.id + ", "
-        + Integer.toString(trigger) + "]");
-  }
-
-  // NPExoPlayer.InternalErrorListener
-
-  @Override
-  public void onLoadError(int sourceId, IOException e) {
-    printInternalError("loadError", e);
-  }
-
-  @Override
-  public void onRendererInitializationError(Exception e) {
-    printInternalError("rendererInitError", e);
-  }
-
-  @Override
-  public void onDrmSessionManagerError(Exception e) {
-    printInternalError("drmSessionManagerError", e);
-  }
-
-  @Override
-  public void onDecoderInitializationError(DecoderInitializationException e) {
-    printInternalError("decoderInitializationError", e);
-  }
-
-  @Override
-  public void onAudioTrackInitializationError(AudioTrack.InitializationException e) {
-    printInternalError("audioTrackInitializationError", e);
-  }
-
-  @Override
-  public void onAudioTrackWriteError(AudioTrack.WriteException e) {
-    printInternalError("audioTrackWriteError", e);
-  }
-
-  @Override
-  public void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
-    printInternalError("audioTrackUnderrun [" + bufferSize + ", " + bufferSizeMs + ", "
-        + elapsedSinceLastFeedMs + "]", null);
-  }
-
-  @Override
-  public void onCryptoError(CryptoException e) {
-    printInternalError("cryptoError", e);
-  }
-
-  @Override
-  public void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
-      long initializationDurationMs) {
-    Log.d(TAG, "decoderInitialized [" + getSessionTimeString() + ", " + decoderName + "]");
-  }
-
-  @Override
-  public void onAvailableRangeChanged(int sourceId, TimeRange availableRange) {
-    availableRangeValuesUs = availableRange.getCurrentBoundsUs(availableRangeValuesUs);
-    Log.d(TAG, "availableRange [" + availableRange.isStatic() + ", " + availableRangeValuesUs[0]
-        + ", " + availableRangeValuesUs[1] + "]");
-  }
-
-  private void printInternalError(String type, Exception e) {
-    Log.e(TAG, "internalError [" + getSessionTimeString() + ", " + type + "]", e);
-  }
-
-  private String getStateString(int state) {
-    switch (state) {
-      case ExoPlayer.STATE_BUFFERING:
-        return "B";
-      case ExoPlayer.STATE_ENDED:
-        return "E";
-      case ExoPlayer.STATE_IDLE:
-        return "I";
-      case ExoPlayer.STATE_PREPARING:
-        return "P";
-      case ExoPlayer.STATE_READY:
-        return "R";
-      default:
-        return "?";
-    }
-  }
-
-  private String getSessionTimeString() {
-    return getTimeString(SystemClock.elapsedRealtime() - sessionStartTimeMs);
-  }
-
-  private String getTimeString(long timeMs) {
-    return TIME_FORMAT.format((timeMs) / 1000f);
-  }
-
-}

app/src/main/java/org/schabi/newpipe/player/exoplayer/ExtractorRendererBuilder.java

@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
-
-import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
-import com.google.android.exoplayer.MediaCodecSelector;
-import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.audio.AudioCapabilities;
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.extractor.ExtractorSampleSource;
-import com.google.android.exoplayer.text.TextTrackRenderer;
-import com.google.android.exoplayer.upstream.Allocator;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DefaultAllocator;
-import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer.upstream.DefaultUriDataSource;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.net.Uri;
-
-/**
- * A {@link RendererBuilder} for streams that can be read using an {@link Extractor}.
- */
-public class ExtractorRendererBuilder implements RendererBuilder {
-
-  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
-  private static final int BUFFER_SEGMENT_COUNT = 256;
-
-  private final Context context;
-  private final String userAgent;
-  private final Uri uri;
-
-  public ExtractorRendererBuilder(Context context, String userAgent, Uri uri) {
-    this.context = context;
-    this.userAgent = userAgent;
-    this.uri = uri;
-  }
-
-  @Override
-  public void buildRenderers(NPExoPlayer player) {
-    Allocator allocator = new DefaultAllocator(BUFFER_SEGMENT_SIZE);
-
-    // Build the video and audio renderers.
-    DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(player.getMainHandler(),
-        null);
-    DataSource dataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-    ExtractorSampleSource sampleSource = new ExtractorSampleSource(uri, dataSource, allocator,
-        BUFFER_SEGMENT_COUNT * BUFFER_SEGMENT_SIZE);
-    MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context,
-        sampleSource, MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000,
-        player.getMainHandler(), player, 50);
-    MediaCodecAudioTrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(sampleSource,
-        MediaCodecSelector.DEFAULT, null, true, player.getMainHandler(), player,
-        AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
-    TrackRenderer textRenderer = new TextTrackRenderer(sampleSource, player,
-        player.getMainHandler().getLooper());
-
-    // Invoke the callback.
-    TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
-    renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
-    renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
-    renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
-    player.onRenderers(renderers, bandwidthMeter);
-  }
-
-  @Override
-  public void cancel() {
-    // Do nothing.
-  }
-
-}

app/src/main/java/org/schabi/newpipe/player/exoplayer/HlsRendererBuilder.java

@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
-
-import com.google.android.exoplayer.DefaultLoadControl;
-import com.google.android.exoplayer.LoadControl;
-import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
-import com.google.android.exoplayer.MediaCodecSelector;
-import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.audio.AudioCapabilities;
-import com.google.android.exoplayer.hls.DefaultHlsTrackSelector;
-import com.google.android.exoplayer.hls.HlsChunkSource;
-import com.google.android.exoplayer.hls.HlsMasterPlaylist;
-import com.google.android.exoplayer.hls.HlsPlaylist;
-import com.google.android.exoplayer.hls.HlsPlaylistParser;
-import com.google.android.exoplayer.hls.HlsSampleSource;
-import com.google.android.exoplayer.hls.PtsTimestampAdjusterProvider;
-import com.google.android.exoplayer.metadata.Id3Parser;
-import com.google.android.exoplayer.metadata.MetadataTrackRenderer;
-import com.google.android.exoplayer.text.TextTrackRenderer;
-import com.google.android.exoplayer.text.eia608.Eia608TrackRenderer;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DefaultAllocator;
-import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer.upstream.DefaultUriDataSource;
-import com.google.android.exoplayer.util.ManifestFetcher;
-import com.google.android.exoplayer.util.ManifestFetcher.ManifestCallback;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.os.Handler;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * A {@link RendererBuilder} for HLS.
- */
-public class HlsRendererBuilder implements RendererBuilder {
-
-  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
-  private static final int MAIN_BUFFER_SEGMENTS = 256;
-  private static final int TEXT_BUFFER_SEGMENTS = 2;
-
-  private final Context context;
-  private final String userAgent;
-  private final String url;
-
-  private AsyncRendererBuilder currentAsyncBuilder;
-
-  public HlsRendererBuilder(Context context, String userAgent, String url) {
-    this.context = context;
-    this.userAgent = userAgent;
-    this.url = url;
-  }
-
-  @Override
-  public void buildRenderers(NPExoPlayer player) {
-    currentAsyncBuilder = new AsyncRendererBuilder(context, userAgent, url, player);
-    currentAsyncBuilder.init();
-  }
-
-  @Override
-  public void cancel() {
-    if (currentAsyncBuilder != null) {
-      currentAsyncBuilder.cancel();
-      currentAsyncBuilder = null;
-    }
-  }
-
-  private static final class AsyncRendererBuilder implements ManifestCallback<HlsPlaylist> {
-
-    private final Context context;
-    private final String userAgent;
-    private final String url;
-    private final NPExoPlayer player;
-    private final ManifestFetcher<HlsPlaylist> playlistFetcher;
-
-    private boolean canceled;
-
-    public AsyncRendererBuilder(Context context, String userAgent, String url, NPExoPlayer player) {
-      this.context = context;
-      this.userAgent = userAgent;
-      this.url = url;
-      this.player = player;
-      HlsPlaylistParser parser = new HlsPlaylistParser();
-      playlistFetcher = new ManifestFetcher<>(url, new DefaultUriDataSource(context, userAgent),
-          parser);
-    }
-
-    public void init() {
-      playlistFetcher.singleLoad(player.getMainHandler().getLooper(), this);
-    }
-
-    public void cancel() {
-      canceled = true;
-    }
-
-    @Override
-    public void onSingleManifestError(IOException e) {
-      if (canceled) {
-        return;
-      }
-
-      player.onRenderersError(e);
-    }
-
-    @Override
-    public void onSingleManifest(HlsPlaylist manifest) {
-      if (canceled) {
-        return;
-      }
-
-      Handler mainHandler = player.getMainHandler();
-      LoadControl loadControl = new DefaultLoadControl(new DefaultAllocator(BUFFER_SEGMENT_SIZE));
-      DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
-      PtsTimestampAdjusterProvider timestampAdjusterProvider = new PtsTimestampAdjusterProvider();
-
-      // Build the video/audio/metadata renderers.
-      DataSource dataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      HlsChunkSource chunkSource = new HlsChunkSource(true /* isMaster */, dataSource, url,
-          manifest, DefaultHlsTrackSelector.newDefaultInstance(context), bandwidthMeter,
-          timestampAdjusterProvider, HlsChunkSource.ADAPTIVE_MODE_SPLICE);
-      HlsSampleSource sampleSource = new HlsSampleSource(chunkSource, loadControl,
-          MAIN_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player, NPExoPlayer.TYPE_VIDEO);
-      MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context,
-          sampleSource, MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT,
-          5000, mainHandler, player, 50);
-      MediaCodecAudioTrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(sampleSource,
-          MediaCodecSelector.DEFAULT, null, true, player.getMainHandler(), player,
-          AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
-      MetadataTrackRenderer<Map<String, Object>> id3Renderer = new MetadataTrackRenderer<>(
-          sampleSource, new Id3Parser(), player, mainHandler.getLooper());
-
-      // Build the text renderer, preferring Webvtt where available.
-      boolean preferWebvtt = false;
-      if (manifest instanceof HlsMasterPlaylist) {
-        preferWebvtt = !((HlsMasterPlaylist) manifest).subtitles.isEmpty();
-      }
-      TrackRenderer textRenderer;
-      if (preferWebvtt) {
-        DataSource textDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-        HlsChunkSource textChunkSource = new HlsChunkSource(false /* isMaster */, textDataSource,
-            url, manifest, DefaultHlsTrackSelector.newVttInstance(), bandwidthMeter,
-            timestampAdjusterProvider, HlsChunkSource.ADAPTIVE_MODE_SPLICE);
-        HlsSampleSource textSampleSource = new HlsSampleSource(textChunkSource, loadControl,
-            TEXT_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player, NPExoPlayer.TYPE_TEXT);
-        textRenderer = new TextTrackRenderer(textSampleSource, player, mainHandler.getLooper());
-      } else {
-        textRenderer = new Eia608TrackRenderer(sampleSource, player, mainHandler.getLooper());
-      }
-
-      TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
-      renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
-      renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
-      renderers[NPExoPlayer.TYPE_METADATA] = id3Renderer;
-      renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
-      player.onRenderers(renderers, bandwidthMeter);
-    }
-
-  }
-
-}

app/src/main/java/org/schabi/newpipe/player/exoplayer/NPExoPlayer.java

@@ -1,599 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-import com.google.android.exoplayer.CodecCounters;
-import com.google.android.exoplayer.DummyTrackRenderer;
-import com.google.android.exoplayer.ExoPlaybackException;
-import com.google.android.exoplayer.ExoPlayer;
-import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
-import com.google.android.exoplayer.MediaCodecTrackRenderer;
-import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException;
-import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
-import com.google.android.exoplayer.MediaFormat;
-import com.google.android.exoplayer.TimeRange;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.audio.AudioTrack;
-import com.google.android.exoplayer.chunk.ChunkSampleSource;
-import com.google.android.exoplayer.chunk.Format;
-import com.google.android.exoplayer.dash.DashChunkSource;
-import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
-import com.google.android.exoplayer.hls.HlsSampleSource;
-import com.google.android.exoplayer.metadata.MetadataTrackRenderer.MetadataRenderer;
-import com.google.android.exoplayer.text.Cue;
-import com.google.android.exoplayer.text.TextRenderer;
-import com.google.android.exoplayer.upstream.BandwidthMeter;
-import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer.util.DebugTextViewHelper;
-import com.google.android.exoplayer.util.PlayerControl;
-
-import android.media.MediaCodec.CryptoException;
-import android.os.Handler;
-import android.os.Looper;
-import android.view.Surface;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * A wrapper around {@link ExoPlayer} that provides a higher level interface. It can be prepared
- * with one of a number of {@link RendererBuilder} classes to suit different use cases (e.g. DASH,
- * SmoothStreaming and so on).
- */
-public class NPExoPlayer implements ExoPlayer.Listener, ChunkSampleSource.EventListener,
-    HlsSampleSource.EventListener, DefaultBandwidthMeter.EventListener,
-    MediaCodecVideoTrackRenderer.EventListener, MediaCodecAudioTrackRenderer.EventListener,
-    StreamingDrmSessionManager.EventListener, DashChunkSource.EventListener, TextRenderer,
-    MetadataRenderer<Map<String, Object>>, DebugTextViewHelper.Provider {
-
-  /**
-   * Builds renderers for the player.
-   */
-  public interface RendererBuilder {
-    /**
-     * Builds renderers for playback.
-     *
-     * @param player The player for which renderers are being built. {@link NPExoPlayer#onRenderers}
-     *     should be invoked once the renderers have been built. If building fails,
-     *     {@link NPExoPlayer#onRenderersError} should be invoked.
-     */
-    void buildRenderers(NPExoPlayer player);
-    /**
-     * Cancels the current build operation, if there is one. Else does nothing.
-     * <p>
-     * A canceled build operation must not invoke {@link NPExoPlayer#onRenderers} or
-     * {@link NPExoPlayer#onRenderersError} on the player, which may have been released.
-     */
-    void cancel();
-  }
-
-  /**
-   * A listener for core events.
-   */
-  public interface Listener {
-    void onStateChanged(boolean playWhenReady, int playbackState);
-    void onError(Exception e);
-    void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
-        float pixelWidthHeightRatio);
-  }
-
-  /**
-   * A listener for internal errors.
-   * <p>
-   * These errors are not visible to the user, and hence this listener is provided for
-   * informational purposes only. Note however that an internal error may cause a fatal
-   * error if the player fails to recover. If this happens, {@link Listener#onError(Exception)}
-   * will be invoked.
-   */
-  public interface InternalErrorListener {
-    void onRendererInitializationError(Exception e);
-    void onAudioTrackInitializationError(AudioTrack.InitializationException e);
-    void onAudioTrackWriteError(AudioTrack.WriteException e);
-    void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs);
-    void onDecoderInitializationError(DecoderInitializationException e);
-    void onCryptoError(CryptoException e);
-    void onLoadError(int sourceId, IOException e);
-    void onDrmSessionManagerError(Exception e);
-  }
-
-  /**
-   * A listener for debugging information.
-   */
-  public interface InfoListener {
-    void onVideoFormatEnabled(Format format, int trigger, long mediaTimeMs);
-    void onAudioFormatEnabled(Format format, int trigger, long mediaTimeMs);
-    void onDroppedFrames(int count, long elapsed);
-    void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate);
-    void onLoadStarted(int sourceId, long length, int type, int trigger, Format format,
-        long mediaStartTimeMs, long mediaEndTimeMs);
-    void onLoadCompleted(int sourceId, long bytesLoaded, int type, int trigger, Format format,
-        long mediaStartTimeMs, long mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs);
-    void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
-        long initializationDurationMs);
-    void onAvailableRangeChanged(int sourceId, TimeRange availableRange);
-  }
-
-  /**
-   * A listener for receiving notifications of timed text.
-   */
-  public interface CaptionListener {
-    void onCues(List<Cue> cues);
-  }
-
-  /**
-   * A listener for receiving ID3 metadata parsed from the media stream.
-   */
-  public interface Id3MetadataListener {
-    void onId3Metadata(Map<String, Object> metadata);
-  }
-
-  // Constants pulled into this class for convenience.
-  public static final int STATE_IDLE = ExoPlayer.STATE_IDLE;
-  public static final int STATE_PREPARING = ExoPlayer.STATE_PREPARING;
-  public static final int STATE_BUFFERING = ExoPlayer.STATE_BUFFERING;
-  public static final int STATE_READY = ExoPlayer.STATE_READY;
-  public static final int STATE_ENDED = ExoPlayer.STATE_ENDED;
-  public static final int TRACK_DISABLED = ExoPlayer.TRACK_DISABLED;
-  public static final int TRACK_DEFAULT = ExoPlayer.TRACK_DEFAULT;
-
-  public static final int RENDERER_COUNT = 4;
-  public static final int TYPE_VIDEO = 0;
-  public static final int TYPE_AUDIO = 1;
-  public static final int TYPE_TEXT = 2;
-  public static final int TYPE_METADATA = 3;
-
-  private static final int RENDERER_BUILDING_STATE_IDLE = 1;
-  private static final int RENDERER_BUILDING_STATE_BUILDING = 2;
-  private static final int RENDERER_BUILDING_STATE_BUILT = 3;
-
-  private final RendererBuilder rendererBuilder;
-  private final ExoPlayer player;
-  private final PlayerControl playerControl;
-  private final Handler mainHandler;
-  private final CopyOnWriteArrayList<Listener> listeners;
-
-  private int rendererBuildingState;
-  private int lastReportedPlaybackState;
-  private boolean lastReportedPlayWhenReady;
-
-  private Surface surface;
-  private TrackRenderer videoRenderer;
-  private CodecCounters codecCounters;
-  private Format videoFormat;
-  private int videoTrackToRestore;
-
-  private BandwidthMeter bandwidthMeter;
-  private boolean backgrounded;
-
-  private CaptionListener captionListener;
-  private Id3MetadataListener id3MetadataListener;
-  private InternalErrorListener internalErrorListener;
-  private InfoListener infoListener;
-
-  public NPExoPlayer(RendererBuilder rendererBuilder) {
-    this.rendererBuilder = rendererBuilder;
-    player = ExoPlayer.Factory.newInstance(RENDERER_COUNT, 1000, 5000);
-    player.addListener(this);
-    playerControl = new PlayerControl(player);
-    mainHandler = new Handler();
-    listeners = new CopyOnWriteArrayList<>();
-    lastReportedPlaybackState = STATE_IDLE;
-    rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
-    // Disable text initially.
-    player.setSelectedTrack(TYPE_TEXT, TRACK_DISABLED);
-  }
-
-  public PlayerControl getPlayerControl() {
-    return playerControl;
-  }
-
-  public void addListener(Listener listener) {
-    listeners.add(listener);
-  }
-
-  public void removeListener(Listener listener) {
-    listeners.remove(listener);
-  }
-
-  public void setInternalErrorListener(InternalErrorListener listener) {
-    internalErrorListener = listener;
-  }
-
-  public void setInfoListener(InfoListener listener) {
-    infoListener = listener;
-  }
-
-  public void setCaptionListener(CaptionListener listener) {
-    captionListener = listener;
-  }
-
-  public void setMetadataListener(Id3MetadataListener listener) {
-    id3MetadataListener = listener;
-  }
-
-  public void setSurface(Surface surface) {
-    this.surface = surface;
-    pushSurface(false);
-  }
-
-  public Surface getSurface() {
-    return surface;
-  }
-
-  public void blockingClearSurface() {
-    surface = null;
-    pushSurface(true);
-  }
-
-  public int getTrackCount(int type) {
-    return player.getTrackCount(type);
-  }
-
-  public MediaFormat getTrackFormat(int type, int index) {
-    return player.getTrackFormat(type, index);
-  }
-
-  public int getSelectedTrack(int type) {
-    return player.getSelectedTrack(type);
-  }
-
-  public void setSelectedTrack(int type, int index) {
-    player.setSelectedTrack(type, index);
-    if (type == TYPE_TEXT && index < 0 && captionListener != null) {
-      captionListener.onCues(Collections.<Cue>emptyList());
-    }
-  }
-
-  public boolean getBackgrounded() {
-    return backgrounded;
-  }
-
-  public void setBackgrounded(boolean backgrounded) {
-    if (this.backgrounded == backgrounded) {
-      return;
-    }
-    this.backgrounded = backgrounded;
-    if (backgrounded) {
-      videoTrackToRestore = getSelectedTrack(TYPE_VIDEO);
-      setSelectedTrack(TYPE_VIDEO, TRACK_DISABLED);
-      blockingClearSurface();
-    } else {
-      setSelectedTrack(TYPE_VIDEO, videoTrackToRestore);
-    }
-  }
-
-  public void prepare() {
-    if (rendererBuildingState == RENDERER_BUILDING_STATE_BUILT) {
-      player.stop();
-    }
-    rendererBuilder.cancel();
-    videoFormat = null;
-    videoRenderer = null;
-    rendererBuildingState = RENDERER_BUILDING_STATE_BUILDING;
-    maybeReportPlayerState();
-    rendererBuilder.buildRenderers(this);
-  }
-
-  /**
-   * Invoked with the results from a {@link RendererBuilder}.
-   *
-   * @param renderers Renderers indexed by {@link NPExoPlayer} TYPE_* constants. An individual
-   *     element may be null if there do not exist tracks of the corresponding type.
-   * @param bandwidthMeter Provides an estimate of the currently available bandwidth. May be null.
-   */
-  /* package */ void onRenderers(TrackRenderer[] renderers, BandwidthMeter bandwidthMeter) {
-    for (int i = 0; i < RENDERER_COUNT; i++) {
-      if (renderers[i] == null) {
-        // Convert a null renderer to a dummy renderer.
-        renderers[i] = new DummyTrackRenderer();
-      }
-    }
-    // Complete preparation.
-    this.videoRenderer = renderers[TYPE_VIDEO];
-    this.codecCounters = videoRenderer instanceof MediaCodecTrackRenderer
-        ? ((MediaCodecTrackRenderer) videoRenderer).codecCounters
-        : renderers[TYPE_AUDIO] instanceof MediaCodecTrackRenderer
-        ? ((MediaCodecTrackRenderer) renderers[TYPE_AUDIO]).codecCounters : null;
-    this.bandwidthMeter = bandwidthMeter;
-    pushSurface(false);
-    player.prepare(renderers);
-    rendererBuildingState = RENDERER_BUILDING_STATE_BUILT;
-  }
-
-  /**
-   * Invoked if a {@link RendererBuilder} encounters an error.
-   *
-   * @param e Describes the error.
-   */
-  /* package */ void onRenderersError(Exception e) {
-    if (internalErrorListener != null) {
-      internalErrorListener.onRendererInitializationError(e);
-    }
-    for (Listener listener : listeners) {
-      listener.onError(e);
-    }
-    rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
-    maybeReportPlayerState();
-  }
-
-  public void setPlayWhenReady(boolean playWhenReady) {
-    player.setPlayWhenReady(playWhenReady);
-  }
-
-  public void seekTo(long positionMs) {
-    player.seekTo(positionMs);
-  }
-
-  public void release() {
-    rendererBuilder.cancel();
-    rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
-    surface = null;
-    player.release();
-  }
-
-  public int getPlaybackState() {
-    if (rendererBuildingState == RENDERER_BUILDING_STATE_BUILDING) {
-      return STATE_PREPARING;
-    }
-    int playerState = player.getPlaybackState();
-    if (rendererBuildingState == RENDERER_BUILDING_STATE_BUILT && playerState == STATE_IDLE) {
-      // This is an edge case where the renderers are built, but are still being passed to the
-      // player's playback thread.
-      return STATE_PREPARING;
-    }
-    return playerState;
-  }
-
-  @Override
-  public Format getFormat() {
-    return videoFormat;
-  }
-
-  @Override
-  public BandwidthMeter getBandwidthMeter() {
-    return bandwidthMeter;
-  }
-
-  @Override
-  public CodecCounters getCodecCounters() {
-    return codecCounters;
-  }
-
-  @Override
-  public long getCurrentPosition() {
-    return player.getCurrentPosition();
-  }
-
-  public long getDuration() {
-    return player.getDuration();
-  }
-
-  public int getBufferedPercentage() {
-    return player.getBufferedPercentage();
-  }
-
-  public boolean getPlayWhenReady() {
-    return player.getPlayWhenReady();
-  }
-
-  /* package */ Looper getPlaybackLooper() {
-    return player.getPlaybackLooper();
-  }
-
-  /* package */ Handler getMainHandler() {
-    return mainHandler;
-  }
-
-  @Override
-  public void onPlayerStateChanged(boolean playWhenReady, int state) {
-    maybeReportPlayerState();
-  }
-
-  @Override
-  public void onPlayerError(ExoPlaybackException exception) {
-    rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
-    for (Listener listener : listeners) {
-      listener.onError(exception);
-    }
-  }
-
-  @Override
-  public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
-      float pixelWidthHeightRatio) {
-    for (Listener listener : listeners) {
-      listener.onVideoSizeChanged(width, height, unappliedRotationDegrees, pixelWidthHeightRatio);
-    }
-  }
-
-  @Override
-  public void onDroppedFrames(int count, long elapsed) {
-    if (infoListener != null) {
-      infoListener.onDroppedFrames(count, elapsed);
-    }
-  }
-
-  @Override
-  public void onBandwidthSample(int elapsedMs, long bytes, long bitrateEstimate) {
-    if (infoListener != null) {
-      infoListener.onBandwidthSample(elapsedMs, bytes, bitrateEstimate);
-    }
-  }
-
-  @Override
-  public void onDownstreamFormatChanged(int sourceId, Format format, int trigger,
-      long mediaTimeMs) {
-    if (infoListener == null) {
-      return;
-    }
-    if (sourceId == TYPE_VIDEO) {
-      videoFormat = format;
-      infoListener.onVideoFormatEnabled(format, trigger, mediaTimeMs);
-    } else if (sourceId == TYPE_AUDIO) {
-      infoListener.onAudioFormatEnabled(format, trigger, mediaTimeMs);
-    }
-  }
-
-  @Override
-  public void onDrmKeysLoaded() {
-    // Do nothing.
-  }
-
-  @Override
-  public void onDrmSessionManagerError(Exception e) {
-    if (internalErrorListener != null) {
-      internalErrorListener.onDrmSessionManagerError(e);
-    }
-  }
-
-  @Override
-  public void onDecoderInitializationError(DecoderInitializationException e) {
-    if (internalErrorListener != null) {
-      internalErrorListener.onDecoderInitializationError(e);
-    }
-  }
-
-  @Override
-  public void onAudioTrackInitializationError(AudioTrack.InitializationException e) {
-    if (internalErrorListener != null) {
-      internalErrorListener.onAudioTrackInitializationError(e);
-    }
-  }
-
-  @Override
-  public void onAudioTrackWriteError(AudioTrack.WriteException e) {
-    if (internalErrorListener != null) {
-      internalErrorListener.onAudioTrackWriteError(e);
-    }
-  }
-
-  @Override
-  public void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
-    if (internalErrorListener != null) {
-      internalErrorListener.onAudioTrackUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs);
-    }
-  }
-
-  @Override
-  public void onCryptoError(CryptoException e) {
-    if (internalErrorListener != null) {
-      internalErrorListener.onCryptoError(e);
-    }
-  }
-
-  @Override
-  public void onDecoderInitialized(String decoderName, long elapsedRealtimeMs,
-      long initializationDurationMs) {
-    if (infoListener != null) {
-      infoListener.onDecoderInitialized(decoderName, elapsedRealtimeMs, initializationDurationMs);
-    }
-  }
-
-  @Override
-  public void onLoadError(int sourceId, IOException e) {
-    if (internalErrorListener != null) {
-      internalErrorListener.onLoadError(sourceId, e);
-    }
-  }
-
-  @Override
-  public void onCues(List<Cue> cues) {
-    if (captionListener != null && getSelectedTrack(TYPE_TEXT) != TRACK_DISABLED) {
-      captionListener.onCues(cues);
-    }
-  }
-
-  @Override
-  public void onMetadata(Map<String, Object> metadata) {
-    if (id3MetadataListener != null && getSelectedTrack(TYPE_METADATA) != TRACK_DISABLED) {
-      id3MetadataListener.onId3Metadata(metadata);
-    }
-  }
-
-  @Override
-  public void onAvailableRangeChanged(int sourceId, TimeRange availableRange) {
-    if (infoListener != null) {
-      infoListener.onAvailableRangeChanged(sourceId, availableRange);
-    }
-  }
-
-  @Override
-  public void onPlayWhenReadyCommitted() {
-    // Do nothing.
-  }
-
-  @Override
-  public void onDrawnToSurface(Surface surface) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onLoadStarted(int sourceId, long length, int type, int trigger, Format format,
-      long mediaStartTimeMs, long mediaEndTimeMs) {
-    if (infoListener != null) {
-      infoListener.onLoadStarted(sourceId, length, type, trigger, format, mediaStartTimeMs,
-          mediaEndTimeMs);
-    }
-  }
-
-  @Override
-  public void onLoadCompleted(int sourceId, long bytesLoaded, int type, int trigger, Format format,
-      long mediaStartTimeMs, long mediaEndTimeMs, long elapsedRealtimeMs, long loadDurationMs) {
-    if (infoListener != null) {
-      infoListener.onLoadCompleted(sourceId, bytesLoaded, type, trigger, format, mediaStartTimeMs,
-          mediaEndTimeMs, elapsedRealtimeMs, loadDurationMs);
-    }
-  }
-
-  @Override
-  public void onLoadCanceled(int sourceId, long bytesLoaded) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onUpstreamDiscarded(int sourceId, long mediaStartTimeMs, long mediaEndTimeMs) {
-    // Do nothing.
-  }
-
-  private void maybeReportPlayerState() {
-    boolean playWhenReady = player.getPlayWhenReady();
-    int playbackState = getPlaybackState();
-    if (lastReportedPlayWhenReady != playWhenReady || lastReportedPlaybackState != playbackState) {
-      for (Listener listener : listeners) {
-        listener.onStateChanged(playWhenReady, playbackState);
-      }
-      lastReportedPlayWhenReady = playWhenReady;
-      lastReportedPlaybackState = playbackState;
-    }
-  }
-
-  private void pushSurface(boolean blockForSurfacePush) {
-    if (videoRenderer == null) {
-      return;
-    }
-
-    if (blockForSurfacePush) {
-      player.blockingSendMessage(
-          videoRenderer, MediaCodecVideoTrackRenderer.MSG_SET_SURFACE, surface);
-    } else {
-      player.sendMessage(
-          videoRenderer, MediaCodecVideoTrackRenderer.MSG_SET_SURFACE, surface);
-    }
-  }
-
-}

app/src/main/java/org/schabi/newpipe/player/exoplayer/SmoothStreamingRendererBuilder.java

@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.schabi.newpipe.player.exoplayer;
-
-
-import org.schabi.newpipe.player.exoplayer.NPExoPlayer.RendererBuilder;
-
-import com.google.android.exoplayer.DefaultLoadControl;
-import com.google.android.exoplayer.LoadControl;
-import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
-import com.google.android.exoplayer.MediaCodecSelector;
-import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.audio.AudioCapabilities;
-import com.google.android.exoplayer.chunk.ChunkSampleSource;
-import com.google.android.exoplayer.chunk.ChunkSource;
-import com.google.android.exoplayer.chunk.FormatEvaluator.AdaptiveEvaluator;
-import com.google.android.exoplayer.drm.DrmSessionManager;
-import com.google.android.exoplayer.drm.MediaDrmCallback;
-import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
-import com.google.android.exoplayer.drm.UnsupportedDrmException;
-import com.google.android.exoplayer.smoothstreaming.DefaultSmoothStreamingTrackSelector;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingChunkSource;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifest;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifestParser;
-import com.google.android.exoplayer.text.TextTrackRenderer;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DefaultAllocator;
-import com.google.android.exoplayer.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer.upstream.DefaultHttpDataSource;
-import com.google.android.exoplayer.upstream.DefaultUriDataSource;
-import com.google.android.exoplayer.util.ManifestFetcher;
-import com.google.android.exoplayer.util.Util;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.os.Handler;
-
-import java.io.IOException;
-
-/**
- * A {@link RendererBuilder} for SmoothStreaming.
- */
-public class SmoothStreamingRendererBuilder implements RendererBuilder {
-
-  private static final int BUFFER_SEGMENT_SIZE = 64 * 1024;
-  private static final int VIDEO_BUFFER_SEGMENTS = 200;
-  private static final int AUDIO_BUFFER_SEGMENTS = 54;
-  private static final int TEXT_BUFFER_SEGMENTS = 2;
-  private static final int LIVE_EDGE_LATENCY_MS = 30000;
-
-  private final Context context;
-  private final String userAgent;
-  private final String url;
-  private final MediaDrmCallback drmCallback;
-
-  private AsyncRendererBuilder currentAsyncBuilder;
-
-  public SmoothStreamingRendererBuilder(Context context, String userAgent, String url,
-      MediaDrmCallback drmCallback) {
-    this.context = context;
-    this.userAgent = userAgent;
-    this.url = Util.toLowerInvariant(url).endsWith("/manifest") ? url : url + "/Manifest";
-    this.drmCallback = drmCallback;
-  }
-
-  @Override
-  public void buildRenderers(NPExoPlayer player) {
-    currentAsyncBuilder = new AsyncRendererBuilder(context, userAgent, url, drmCallback, player);
-    currentAsyncBuilder.init();
-  }
-
-  @Override
-  public void cancel() {
-    if (currentAsyncBuilder != null) {
-      currentAsyncBuilder.cancel();
-      currentAsyncBuilder = null;
-    }
-  }
-
-  private static final class AsyncRendererBuilder
-      implements ManifestFetcher.ManifestCallback<SmoothStreamingManifest> {
-
-    private final Context context;
-    private final String userAgent;
-    private final MediaDrmCallback drmCallback;
-    private final NPExoPlayer player;
-    private final ManifestFetcher<SmoothStreamingManifest> manifestFetcher;
-
-    private boolean canceled;
-
-    public AsyncRendererBuilder(Context context, String userAgent, String url,
-        MediaDrmCallback drmCallback, NPExoPlayer player) {
-      this.context = context;
-      this.userAgent = userAgent;
-      this.drmCallback = drmCallback;
-      this.player = player;
-      SmoothStreamingManifestParser parser = new SmoothStreamingManifestParser();
-      manifestFetcher = new ManifestFetcher<>(url, new DefaultHttpDataSource(userAgent, null),
-          parser);
-    }
-
-    public void init() {
-      manifestFetcher.singleLoad(player.getMainHandler().getLooper(), this);
-    }
-
-    public void cancel() {
-      canceled = true;
-    }
-
-    @Override
-    public void onSingleManifestError(IOException exception) {
-      if (canceled) {
-        return;
-      }
-
-      player.onRenderersError(exception);
-    }
-
-    @Override
-    public void onSingleManifest(SmoothStreamingManifest manifest) {
-      if (canceled) {
-        return;
-      }
-
-      Handler mainHandler = player.getMainHandler();
-      LoadControl loadControl = new DefaultLoadControl(new DefaultAllocator(BUFFER_SEGMENT_SIZE));
-      DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(mainHandler, player);
-
-      // Check drm support if necessary.
-      DrmSessionManager drmSessionManager = null;
-      if (manifest.protectionElement != null) {
-        if (Util.SDK_INT < 18) {
-          player.onRenderersError(
-              new UnsupportedDrmException(UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME));
-          return;
-        }
-        try {
-          drmSessionManager = new StreamingDrmSessionManager(manifest.protectionElement.uuid,
-              player.getPlaybackLooper(), drmCallback, null, player.getMainHandler(), player);
-        } catch (UnsupportedDrmException e) {
-          player.onRenderersError(e);
-          return;
-        }
-      }
-
-      // Build the video renderer.
-      DataSource videoDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      ChunkSource videoChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
-          DefaultSmoothStreamingTrackSelector.newVideoInstance(context, true, false),
-          videoDataSource, new AdaptiveEvaluator(bandwidthMeter), LIVE_EDGE_LATENCY_MS);
-      ChunkSampleSource videoSampleSource = new ChunkSampleSource(videoChunkSource, loadControl,
-          VIDEO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
-          NPExoPlayer.TYPE_VIDEO);
-      TrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(context, videoSampleSource,
-          MediaCodecSelector.DEFAULT, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000,
-          drmSessionManager, true, mainHandler, player, 50);
-
-      // Build the audio renderer.
-      DataSource audioDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      ChunkSource audioChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
-          DefaultSmoothStreamingTrackSelector.newAudioInstance(),
-          audioDataSource, null, LIVE_EDGE_LATENCY_MS);
-      ChunkSampleSource audioSampleSource = new ChunkSampleSource(audioChunkSource, loadControl,
-          AUDIO_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
-          NPExoPlayer.TYPE_AUDIO);
-      TrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(audioSampleSource,
-          MediaCodecSelector.DEFAULT, drmSessionManager, true, mainHandler, player,
-          AudioCapabilities.getCapabilities(context), AudioManager.STREAM_MUSIC);
-
-      // Build the text renderer.
-      DataSource textDataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
-      ChunkSource textChunkSource = new SmoothStreamingChunkSource(manifestFetcher,
-          DefaultSmoothStreamingTrackSelector.newTextInstance(),
-          textDataSource, null, LIVE_EDGE_LATENCY_MS);
-      ChunkSampleSource textSampleSource = new ChunkSampleSource(textChunkSource, loadControl,
-          TEXT_BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, mainHandler, player,
-          NPExoPlayer.TYPE_TEXT);
-      TrackRenderer textRenderer = new TextTrackRenderer(textSampleSource, player,
-          mainHandler.getLooper());
-
-      // Invoke the callback.
-      TrackRenderer[] renderers = new TrackRenderer[NPExoPlayer.RENDERER_COUNT];
-      renderers[NPExoPlayer.TYPE_VIDEO] = videoRenderer;
-      renderers[NPExoPlayer.TYPE_AUDIO] = audioRenderer;
-      renderers[NPExoPlayer.TYPE_TEXT] = textRenderer;
-      player.onRenderers(renderers, bandwidthMeter);
-    }
-
-  }
-
-}

app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java

@@ -19,17 +19,14 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
-import org.schabi.newpipe.ChannelActivity;
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.ReCaptchaActivity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchResult;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
-import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.util.NavStack;
 
 import java.util.EnumSet;

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

@@ -5,13 +5,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 
 import org.schabi.newpipe.ChannelActivity;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.detail.VideoItemDetailActivity;
-import org.schabi.newpipe.detail.VideoItemDetailFragment;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 
@@ -73,10 +70,6 @@ public class NavStack {
         return instance;
     }
 
-    private void addEntry(String url, Class ac, int serviceId) {
-        stack.push(new NavEntry(url, serviceId));
-    }
-
     public void navBack(Activity activity) throws Exception {
         if(stack.size() == 0) { // if stack is already empty here, activity was probably called
             // from another app
@@ -120,7 +113,10 @@ public class NavStack {
     }
 
     private void openActivity(Context context, String url, int serviceId, Class acitivtyClass) {
-        stack.push(new NavEntry(url, serviceId));
+        //if last element has the same url do not push to stack again
+        if(stack.isEmpty() || !stack.peek().url.equals(url)) {
+            stack.push(new NavEntry(url, serviceId));
+        }
         Intent i = new Intent(context, acitivtyClass);
         i.putExtra(SERVICE_ID, serviceId);
         i.putExtra(URL, url);
@@ -144,6 +140,7 @@ public class NavStack {
 
     public void restoreSavedInstanceState(Bundle state) {
         ArrayList<String> sa = state.getStringArrayList(NAV_STACK);
+        stack.clear();
         for(String url : sa) {
             stack.push(new NavEntry(url, NewPipe.getServiceByUrl(url).getServiceId()));
         }

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

@@ -2,8 +2,12 @@ package org.schabi.newpipe.util;
 
 import android.Manifest;
 import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
+import android.provider.Settings;
 import android.support.annotation.RequiresApi;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -11,7 +15,7 @@ import android.support.v4.content.ContextCompat;
 public class PermissionHelper {
     public static final int PERMISSION_WRITE_STORAGE = 778;
     public static final int PERMISSION_READ_STORAGE = 777;
-
+    public static final int PERMISSION_SYSTEM_ALERT_WINDOW = 779;
 
 
     public static boolean checkStoragePermissions(Activity activity) {
@@ -65,4 +69,27 @@ public class PermissionHelper {
         }
         return true;
     }
+
+
+    /**
+     * In order to be able to draw over other apps, the permission android.permission.SYSTEM_ALERT_WINDOW have to be granted.
+     * <p>
+     * On < API 23 (MarshMallow) the permission was granted when the user installed the application (via AndroidManifest),
+     * on > 23, however, it have to start a activity asking the user if he agree.
+     * <p>
+     * This method just return if canDraw over other apps, if it doesn't, try to get the permission,
+     * it does not get the result of the startActivityForResult, if the user accept, the next time that he tries to open
+     * it will return true.
+     *
+     * @param activity context to startActivityForResult
+     * @return returns {@link Settings#canDrawOverlays(Context)}
+     **/
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    public static boolean checkSystemAlertWindowPermission(Activity activity) {
+        if (!Settings.canDrawOverlays(activity)) {
+            Intent i = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + activity.getPackageName()));
+            activity.startActivityForResult(i, PERMISSION_SYSTEM_ALERT_WINDOW);
+            return false;
+        }else return true;
+    }
 }

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

@@ -7,18 +7,21 @@ import org.schabi.newpipe.R;
 
 public class ThemeHelper {
 
-    public static void setTheme(Context context, boolean mode) {
-        // mode is true for normal theme, false for no action bar theme.
-
+    /**
+     * Apply the selected theme (on NewPipe settings) in the context
+     *
+     * @param context               context that the theme will be applied
+     * @param useActionbarTheme     whether to use an action bar theme or not
+     */
+    public static void setTheme(Context context, boolean useActionbarTheme) {
         String themeKey = context.getString(R.string.theme_key);
-        //String lightTheme = context.getResources().getString(R.string.light_theme_title);
         String darkTheme = context.getResources().getString(R.string.dark_theme_title);
         String blackTheme = context.getResources().getString(R.string.black_theme_title);
 
         String sp = PreferenceManager.getDefaultSharedPreferences(context)
                 .getString(themeKey, context.getResources().getString(R.string.light_theme_title));
 
-        if (mode) {
+        if (useActionbarTheme) {
             if (sp.equals(darkTheme)) context.setTheme(R.style.DarkTheme);
             else if (sp.equals(blackTheme)) context.setTheme(R.style.BlackTheme);
             else context.setTheme(R.style.AppTheme);

app/src/main/res/drawable/player_controls_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#8c000000"
+        android:endColor="#00000000"
+        android:angle="90"
+        />
+</shape>

app/src/main/res/drawable/player_top_controls_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:startColor="#8c000000"
+        android:endColor="#00000000"
+        android:angle="-90"
+        />
+</shape>

app/src/main/res/layout-v18/fragment_videoitem_detail.xml

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                tools:context=".detail.VideoItemDetailFragment"
-                android:textIsSelectable="true"
-                style="?android:attr/textAppearanceLarge"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/video_item_detail">
-
-    <ProgressBar android:id="@+id/detail_progress_bar"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_centerInParent="true"
-                 android:indeterminate="true"/>
-
-    <com.nirhart.parallaxscroll.views.ParallaxScrollView
-        android:id="@+id/detail_main_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="visible"
-        app:parallax_factor="1.9"
-        tools:ignore="UselessParent">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RelativeLayout
-                android:id="@+id/detail_stream_thumbnail_window_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground">
-
-                <ImageView android:id="@+id/detail_thumbnail_view"
-                           android:contentDescription="@string/detail_thumbnail_view_description"
-                           android:layout_width="match_parent"
-                           android:layout_height="wrap_content"
-                           android:scaleType="fitCenter"
-                           android:adjustViewBounds="true"
-                           android:layout_alignParentLeft="true"
-                           android:layout_alignParentStart="true"
-                           android:layout_alignParentTop="true"
-                           android:background="@android:color/black"
-                           android:src="@drawable/dummy_thumbnail_dark"/>
-
-                <ImageView android:id="@+id/play_arrow_view"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:background="@android:color/transparent"
-                           android:layout_centerInParent="true"
-                           android:src="@drawable/new_play_arrow"
-                           android:visibility="invisible"/>
-
-                <Button
-                    android:id="@+id/detail_stream_thumbnail_window_background_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"/>
-
-            </RelativeLayout>
-
-            <RelativeLayout android:id="@+id/detail_text_content_layout"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                            android:background="?android:windowBackground"
-                            android:visibility="gone">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/detailTopView">
-
-                    <TextView android:id="@+id/detail_video_title_view"
-                              android:layout_width="0dp"
-                              android:layout_weight=".7"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_title_text_size"
-                              android:textAppearance="?android:attr/textAppearanceLarge"
-                              android:layout_marginTop="12dp"
-                              android:layout_marginLeft="12dp"
-                              android:layout_marginStart="12dp"
-                              android:text="Title"/>
-
-                    <ImageView
-                        android:layout_width="15dp"
-                        android:layout_height="30dp"
-                        android:id="@+id/toggle_description_view"
-                        android:src="@drawable/arrow_down"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginTop="8dp"/>
-
-                </LinearLayout>
-
-                <TextView android:id="@+id/detail_view_count_view"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:textSize="@dimen/video_item_detail_views_text_size"
-                          android:textAppearance="?android:attr/textAppearanceLarge"
-                          android:layout_marginLeft="12dp"
-                          android:layout_marginStart="12dp"
-                          android:text="10,069,948 views"
-                          android:layout_below="@id/detailTopView"
-                          android:layout_alignParentLeft="true"
-                          android:layout_alignParentStart="true"
-                          android:layout_marginTop="5dp" />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detail_view_count_view"
-                    android:id="@+id/detailExtraView"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginRight="12dp"
-                    android:layout_marginEnd="12dp"
-                    android:visibility="gone">
-                    <TextView android:id="@+id/detail_upload_date_view"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:text="Upload date"
-                              android:layout_marginTop="3dp" />
-
-                    <TextView android:id="@+id/detail_description_view"
-                              android:layout_width="match_parent"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_description_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:layout_below="@id/detail_upload_date_view"
-                              android:text="Description............."
-                              android:layout_marginTop="3dp" />
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/stream_info_layout"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_below="@+id/detailExtraView"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="5dp">
-                    <ImageView android:id="@+id/detail_thumbs_up_img_view"
-                               android:contentDescription="@string/detail_likes_img_view_description"
-                               android:layout_width="@dimen/video_item_detail_like_image_width"
-                               android:layout_height="@dimen/video_item_detail_like_image_height"
-                               android:src="?attr/thumbs_up"/>
-
-                    <TextView android:id="@+id/detail_thumbs_up_count_view"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_likes_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:text="200" />
-
-                    <ImageView android:id="@+id/detail_thumbs_down_img_view"
-                               android:contentDescription="@string/detail_dislikes_img_view_description"
-                               android:layout_width="@dimen/video_item_detail_like_image_width"
-                               android:layout_height="@dimen/video_item_detail_like_image_height"
-                               android:src="?attr/thumbs_down"
-                               android:layout_marginLeft="10dp"
-                               android:layout_marginStart="10dp"/>
-
-                    <TextView android:id="@+id/detail_thumbs_down_count_view"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_likes_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:text="100" />
-                </LinearLayout>
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/detail_uploader_frame"
-                    android:layout_below="@id/stream_info_layout">
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/detail_uploader_layout"
-                        android:layout_marginTop="12dp">
-
-                        <View
-                            android:background="#000"
-                            android:layout_width="match_parent"
-                            android:layout_height="1px" />
-
-                        <de.hdodenhof.circleimageview.CircleImageView
-                            android:id="@+id/detail_uploader_thumbnail_view"
-                            android:contentDescription="@string/detail_uploader_thumbnail_view_description"
-                            android:layout_width="@dimen/video_item_detail_uploader_image_size"
-                            android:layout_height="@dimen/video_item_detail_uploader_image_size"
-                            android:src="@drawable/buddy"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginStart="10dp"
-                            android:layout_alignParentLeft="true"
-                            android:layout_alignParentStart="true"
-                            android:layout_marginTop="5dp"
-                            android:layout_marginBottom="5dp"/>
-
-                        <TextView android:id="@+id/detail_uploader_view"
-                                  android:layout_width="wrap_content"
-                                  android:layout_height="wrap_content"
-                                  android:textStyle="bold"
-                                  android:textSize="@dimen/video_item_detail_uploader_text_size"
-                                  android:textAppearance="?android:attr/textAppearanceLarge"
-                                  android:text="Uploader"
-                                  android:layout_centerVertical="true"
-                                  android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
-                                  android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
-                                  android:layout_marginLeft="15dp"
-                                  android:layout_marginStart="28dp" />
-
-                        <View
-                            android:background="#000"
-                            android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:layout_below="@id/detail_uploader_thumbnail_view"/>
-                    </RelativeLayout>
-                    <Button
-                        android:layout_marginTop="13dp"
-                        android:id="@+id/channel_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="?attr/selectableItemBackground"/>
-                </FrameLayout>
-
-                <RelativeLayout android:id="@+id/detail_next_stream_root_layout"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center_horizontal|bottom"
-                                android:layout_below="@+id/detail_uploader_frame"
-                                android:layout_centerHorizontal="true"
-                                android:layout_marginTop="10dp">
-
-                    <TextView
-                        android:id="@+id/detail_next_stream_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:textSize="@dimen/video_item_detail_next_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="@string/next_video_title"
-                        android:textAllCaps="true" />
-
-                    <android.support.v7.widget.RecyclerView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/detail_next_stream_content"/>
-                    <TextView android:id="@+id/detail_similar_title"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:layout_centerHorizontal="true"
-                              android:textSize="@dimen/video_item_detail_next_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:text="@string/similar_videos_btn_text"
-                              android:layout_below="@id/detail_next_stream_content"
-                              android:textAllCaps="true" />
-                    <LinearLayout
-                        android:id="@+id/similar_streams_view"
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_below="@id/detail_similar_title">
-                    </LinearLayout>
-                </RelativeLayout>
-            </RelativeLayout>
-        </RelativeLayout>
-    </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</RelativeLayout>

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

@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black"
+    android:gravity="center"
+    android:keepScreenOn="true">
+
+    <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
+        android:id="@+id/aspectRatioLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center">
+
+        <SurfaceView
+            android:id="@+id/surfaceView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"/>
+
+
+        <View
+            android:id="@+id/surfaceForeground"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"/>
+
+    </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
+
+
+    <ImageView
+        android:id="@+id/endScreen"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:scaleType="centerInside"
+        android:visibility="gone"
+        tools:background="@android:color/white"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible"/>
+
+    <RelativeLayout
+        android:id="@+id/playbackControlRoot"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#64000000"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true">
+
+            <RelativeLayout
+                android:id="@+id/topControls"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:background="@drawable/player_top_controls_bg"
+                android:gravity="top"
+                android:paddingBottom="70dp"
+                android:paddingLeft="2dp"
+                android:paddingRight="10dp"
+                android:paddingTop="10dp"
+                tools:ignore="RtlHardcoded">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_toLeftOf="@+id/qualityTextView"
+                    android:gravity="top"
+                    android:orientation="vertical"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    tools:ignore="RtlHardcoded">
+
+                    <TextView
+                        android:id="@+id/titleTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textColor="@android:color/white"
+                        android:textSize="15sp"
+                        android:textStyle="bold"
+                        tools:ignore="RtlHardcoded"
+                        tools:text="The Video Title LONG very LONG"/>
+
+                    <TextView
+                        android:id="@+id/channelTextView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textColor="@android:color/white"
+                        android:textSize="12sp"
+                        tools:text="The Video Artist  LONG very LONG very Long"/>
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/qualityTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/screenRotationButton"
+                    android:gravity="center"
+                    android:minWidth="50dp"
+                    android:text="720p"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    tools:ignore="HardcodedText,RtlHardcoded"/>
+
+                <ImageButton
+                    android:id="@+id/screenRotationButton"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/repeatButton"
+                    android:background="#00ffffff"
+                    android:clickable="true"
+                    android:padding="8dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_screen_rotation_white"
+                    tools:ignore="ContentDescription,RtlHardcoded"/>
+
+                <ImageButton
+                    android:id="@+id/repeatButton"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_marginLeft="2dp"
+                    android:layout_marginRight="2dp"
+                    android:layout_toLeftOf="@+id/fullScreenButton"
+                    android:background="#00ffffff"
+                    android:clickable="true"
+                    android:padding="5dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_repeat_white"
+                    tools:ignore="ContentDescription,RtlHardcoded"/>
+
+                <ImageButton
+                    android:id="@+id/fullScreenButton"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginLeft="4dp"
+                    android:background="#00ffffff"
+                    android:clickable="true"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/ic_fullscreen_exit_white"
+                    tools:ignore="ContentDescription,RtlHardcoded"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/bottomControls"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:background="@drawable/player_controls_bg"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp">
+
+                <TextView
+                    android:id="@+id/playbackCurrentTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:minHeight="40dp"
+                    android:text="-:--:--"
+                    android:textColor="@android:color/white"
+                    tools:ignore="HardcodedText"
+                    tools:text="1:06:29"/>
+
+
+                <android.support.v7.widget.AppCompatSeekBar
+                    android:id="@+id/playbackSeekBar"
+                    style="@style/Widget.AppCompat.SeekBar"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:paddingBottom="4dp"
+                    android:paddingTop="8dp"
+                    tools:progress="25"
+                    tools:secondaryProgress="50"/>
+
+                <TextView
+                    android:id="@+id/playbackEndTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="-:--:--"
+                    android:textColor="@android:color/white"
+                    tools:ignore="HardcodedText"
+                    tools:text="1:23:49"/>
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <ImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_centerInParent="true"
+            android:background="#00000000"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_pause_white"
+            tools:ignore="ContentDescription"/>
+
+    </RelativeLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/controlAnimationView"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:src="@drawable/ic_action_av_fast_rewind"
+            android:visibility="gone"
+            tools:ignore="ContentDescription"
+            tools:visibility="visible"/>
+    </LinearLayout>
+
+
+    <RelativeLayout
+        android:id="@+id/loadingPanel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"
+        tools:visibility="gone">
+
+        <ProgressBar
+            android:id="@+id/progressBarLoadingPanel"
+            style="?android:attr/progressBarStyleLargeInverse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:indeterminate="true"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        tools:ignore="RtlHardcoded">
+
+        <TextView
+            android:id="@+id/volumeTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerInParent="true"
+            android:layout_marginLeft="20dp"
+            android:background="#64000000"
+            android:paddingBottom="10dp"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"
+            android:paddingTop="10dp"
+            android:textColor="@android:color/white"
+            android:textSize="35sp"
+            android:visibility="gone"
+            tools:ignore="RtlHardcoded"
+            tools:text="Volume 0"
+            tools:visibility="visible"/>
+
+        <TextView
+            android:id="@+id/brightnessTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerInParent="true"
+            android:layout_marginRight="20dp"
+            android:background="#64000000"
+            android:paddingBottom="10dp"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"
+            android:paddingTop="10dp"
+            android:textColor="@android:color/white"
+            android:textSize="35sp"
+            android:visibility="gone"
+            tools:ignore="RtlHardcoded"
+            tools:text="Brightness  0"
+            tools:visibility="visible"/>
+
+        <TextView
+            android:id="@+id/currentDisplaySeek"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="58dp"
+            android:background="#64000000"
+            android:paddingBottom="10dp"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"
+            android:paddingTop="10dp"
+            android:textColor="@android:color/white"
+            android:textSize="26sp"
+            android:textStyle="bold"
+            android:visibility="gone"
+            tools:ignore="RtlHardcoded"
+            tools:text="1:06:29"
+            tools:visibility="visible"/>
+    </RelativeLayout>
+
+</FrameLayout>

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

@@ -1,4 +1,325 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:id="@+id/videoitem_detail_container"
-    android:layout_width="match_parent" android:layout_height="match_parent"
-    tools:context=".detail.VideoItemDetailActivity" tools:ignore="MergeRootFrame" />
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:id="@+id/video_item_detail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <com.nirhart.parallaxscroll.views.ParallaxScrollView
+        android:id="@+id/detail_main_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="visible"
+        app:parallax_factor="1.9">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:id="@+id/detail_thumbnail_root_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/black">
+
+
+                <ImageView
+                    android:id="@+id/detail_thumbnail_image_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentTop="true"
+                    android:background="@android:color/transparent"
+                    android:contentDescription="@string/detail_thumbnail_view_description"
+                    android:scaleType="centerCrop"
+                    tools:ignore="RtlHardcoded"
+                    tools:layout_height="200dp"
+                    tools:src="@drawable/dummy_thumbnail"/>
+
+                <ImageView
+                    android:id="@+id/detail_thumbnail_play_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:background="@android:color/transparent"
+                    android:src="@drawable/new_play_arrow"
+                    android:visibility="invisible"
+                    tools:ignore="ContentDescription"
+                    tools:visibility="visible"/>
+
+                <Button
+                    android:id="@+id/detail_stream_thumbnail_background_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"/>
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/detail_content_root_layout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/detail_thumbnail_root_layout"
+                android:background="?android:windowBackground"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <RelativeLayout
+                    android:id="@+id/detail_title_root_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:paddingLeft="12dp"
+                    android:paddingRight="12dp"
+                    android:paddingTop="12dp">
+
+                    <TextView
+                        android:id="@+id/detail_video_title_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_centerVertical="true"
+                        android:layout_toLeftOf="@+id/detail_toggle_description_view"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:paddingBottom="2dp"
+                        android:paddingTop="6dp"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:textSize="@dimen/video_item_detail_title_text_size"
+                        tools:ignore="RtlHardcoded"
+                        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero."/>
+
+                    <ImageView
+                        android:id="@+id/detail_toggle_description_view"
+                        android:layout_width="15dp"
+                        android:layout_height="15dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentTop="true"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginTop="6dp"
+                        android:src="@drawable/arrow_down"
+                        tools:ignore="ContentDescription,RtlHardcoded"/>
+
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/detail_view_count_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_below="@id/detail_title_root_layout"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginRight="12dp"
+                    android:layout_marginTop="5dp"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textSize="@dimen/video_item_detail_views_text_size"
+                    tools:ignore="RtlHardcoded"
+                    tools:text="10,069,948 views"/>
+
+                <RelativeLayout
+                    android:id="@+id/detail_description_root_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/detail_view_count_view"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginRight="12dp"
+                    android:layout_marginTop="5dp"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+
+                    <TextView
+                        android:id="@+id/detail_upload_date_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                        android:textStyle="bold"
+                        tools:text="Upload date"/>
+
+                    <TextView
+                        android:id="@+id/detail_description_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/detail_upload_date_view"
+                        android:layout_marginTop="3dp"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textSize="@dimen/video_item_detail_description_text_size"
+                        tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum."/>
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:id="@+id/detail_thumbs_root_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_below="@id/detail_description_root_layout"
+                    android:layout_marginLeft="12dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="5dp"
+                    android:gravity="center_vertical"
+                    android:minHeight="30dp">
+
+                    <ImageView
+                        android:id="@+id/detail_thumbs_up_img_view"
+                        android:layout_width="@dimen/video_item_detail_like_image_width"
+                        android:layout_height="@dimen/video_item_detail_like_image_height"
+                        android:contentDescription="@string/detail_likes_img_view_description"
+                        android:src="?attr/thumbs_up"/>
+
+                    <TextView
+                        android:id="@+id/detail_thumbs_up_count_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="5dp"
+                        android:gravity="left|center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textSize="@dimen/video_item_detail_likes_text_size"
+                        tools:ignore="RtlHardcoded"
+                        tools:text="200"/>
+
+                    <ImageView
+                        android:id="@+id/detail_thumbs_down_img_view"
+                        android:layout_width="@dimen/video_item_detail_like_image_width"
+                        android:layout_height="@dimen/video_item_detail_like_image_height"
+                        android:layout_marginLeft="15dp"
+                        android:contentDescription="@string/detail_dislikes_img_view_description"
+                        android:src="?attr/thumbs_down"
+                        tools:ignore="RtlHardcoded"/>
+
+                    <TextView
+                        android:id="@+id/detail_thumbs_down_count_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="5dp"
+                        android:gravity="left|center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textSize="@dimen/video_item_detail_likes_text_size"
+                        tools:ignore="RtlHardcoded"
+                        tools:text="100"/>
+
+                    <TextView
+                        android:id="@+id/detail_thumbs_disabled_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="15dp"
+                        android:gravity="left|center_vertical"
+                        android:text="@string/disabled"
+                        android:textAppearance="?android:attr/textAppearanceLarge"
+                        android:textSize="@dimen/video_item_detail_likes_text_size"
+                        android:textStyle="bold"
+                        android:visibility="gone"
+                        tools:ignore="RtlHardcoded"
+                        tools:visibility="visible"/>
+                </LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/detail_uploader_root_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/detail_thumbs_root_layout">
+
+                    <RelativeLayout
+                        android:id="@+id/detail_uploader_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginLeft="12dp"
+                        android:layout_marginRight="12dp"
+                        android:layout_marginTop="8dp">
+
+
+                        <de.hdodenhof.circleimageview.CircleImageView
+                            android:id="@+id/detail_uploader_thumbnail_view"
+                            android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                            android:layout_height="@dimen/video_item_detail_uploader_image_size"
+                            android:layout_alignParentLeft="true"
+                            android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+                            android:src="@drawable/buddy"
+                            tools:ignore="RtlHardcoded"/>
+
+                        <TextView
+                            android:id="@+id/detail_uploader_text_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="15dp"
+                            android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
+                            android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
+                            android:textAppearance="?android:attr/textAppearanceLarge"
+                            android:textSize="@dimen/video_item_detail_uploader_text_size"
+                            android:textStyle="bold"
+                            tools:ignore="RtlHardcoded"
+                            tools:text="Uploader"/>
+
+                    </RelativeLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1px"
+                        android:layout_gravity="bottom"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginRight="8dp"
+                        android:background="?attr/separatorColor"/>
+
+                    <Button
+                        android:id="@+id/detail_uploader_button"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/selectableItemBackground"
+                        tools:visibility="gone"/>
+                </FrameLayout>
+
+                <RelativeLayout
+                    android:id="@+id/detail_related_streams_root_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_below="@+id/detail_uploader_root_layout"
+                    android:layout_centerHorizontal="true"
+                    android:layout_gravity="center_horizontal|bottom"
+                    android:layout_marginTop="14dp">
+
+                    <TextView
+                        android:id="@+id/detail_next_stream_title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginLeft="12dp"
+                        android:text="@string/next_video_title"
+                        android:textAllCaps="true"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textSize="@dimen/video_item_detail_next_text_size"
+                        tools:ignore="RtlHardcoded"/>
+
+                    <LinearLayout
+                        android:id="@+id/detail_related_streams_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_below="@id/detail_next_stream_title"
+                        android:layout_marginTop="2dp"
+                        android:orientation="vertical"
+                        tools:minHeight="100dp">
+                    </LinearLayout>
+                </RelativeLayout>
+
+            </RelativeLayout>
+
+            <ProgressBar
+                android:id="@+id/detail_loading_progress_bar"
+                style="@style/Widget.AppCompat.ProgressBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/detail_thumbnail_root_layout"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="30dp"
+                android:indeterminate="true"/>
+
+        </RelativeLayout>
+    </com.nirhart.parallaxscroll.views.ParallaxScrollView>
+
+</RelativeLayout>

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

@@ -1,91 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout android:id="@+id/item_main_layout"
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout
+    android:layout_height="wrap_content">
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:orientation="vertical">
 
         <RelativeLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
+            android:id="@+id/itemThumbnailViewContainer"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="12dp">
+            android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+            tools:ignore="RtlHardcoded">
 
-            <RelativeLayout android:id="@+id/itemThumbnailViewContainer"
-                android:layout_marginRight="@dimen/video_item_search_image_right_margin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:ignore="RtlHardcoded">
-
-                <de.hdodenhof.circleimageview.CircleImageView android:id="@+id/itemThumbnailView"
-                    android:contentDescription="@string/list_thumbnail_view_description"
-                    android:layout_width="@dimen/video_item_search_thumbnail_image_width"
-                    android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:src="@drawable/buddy_channel_item"/>
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
+            <de.hdodenhof.circleimageview.CircleImageView
+                android:id="@+id/itemThumbnailView"
+                android:layout_width="@dimen/video_item_search_thumbnail_image_width"
                 android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-                android:layout_toRightOf="@id/itemThumbnailViewContainer"
-                tools:ignore="RtlHardcoded">
-
-                <TextView android:id="@+id/itemChannelTitleView"
-                    android:layout_weight="1"
-                    android:layout_width="fill_parent"
-                    android:layout_height="0dp"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textSize="@dimen/channel_item_detail_title_text_size"/>
-
-                <TextView android:id="@+id/itemChannelDescriptionView"
-                    android:layout_weight="2"
-                    android:layout_width="fill_parent"
-                    android:layout_height="0dp"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textSize="@dimen/video_item_search_uploader_text_size"/>
-
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView android:id="@+id/itemSubscriberCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textSize="@dimen/video_item_search_upload_date_text_size"
-                        android:text="1000 subs"/>
-
-                    <TextView android:id="@+id/itemVideoCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textSize="@dimen/video_item_search_upload_date_text_size"
-                        android:text="1000 vids"/>
-                </LinearLayout>
-
-
-            </LinearLayout>
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:contentDescription="@string/list_thumbnail_view_description"
+                android:src="@drawable/buddy_channel_item"/>
 
         </RelativeLayout>
-    </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+            android:layout_toRightOf="@id/itemThumbnailViewContainer"
+            android:orientation="vertical"
+            tools:ignore="RtlHardcoded">
+
+            <TextView
+                android:id="@+id/itemChannelTitleView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="@dimen/channel_item_detail_title_text_size"
+                tools:text="Channel Title, Lorem ipsum"/>
+
+            <TextView
+                android:id="@+id/itemChannelDescriptionView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_above="@+id/itemSubscriberCountView"
+                android:layout_below="@+id/itemChannelTitleView"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="@dimen/video_item_search_uploader_text_size"
+                tools:text="Channel description, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blandit"/>
+
+            <TextView
+                android:id="@+id/itemSubscriberCountView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:maxLines="1"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="@dimen/video_item_search_upload_date_text_size"
+                tools:text="10M subscribers • "/>
+
+            <TextView
+                android:id="@+id/itemVideoCountView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_toRightOf="@+id/itemSubscriberCountView"
+                android:maxLines="1"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="@dimen/video_item_search_upload_date_text_size"
+                tools:text="1000 videos"/>
+        </RelativeLayout>
+    </RelativeLayout>
 
     <Button
         android:id="@+id/item_button"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/selectableItemBackground"/>
+        android:background="?attr/selectableItemBackground"
+        tools:visibility="gone"/>
 </FrameLayout>

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

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="org.schabi.newpipe.ChannelActivity"
-    tools:showIn="@layout/activity_channel">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/text_margin"
-        android:text="@string/large_text" />
-
-</android.support.v4.widget.NestedScrollView>

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

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
-    android:focusable="true"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:keepScreenOn="true">
-
-  <com.google.android.exoplayer.AspectRatioFrameLayout android:id="@+id/video_frame"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_gravity="center">
-
-    <SurfaceView android:id="@+id/surface_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"/>
-
-    <View android:id="@+id/shutter"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/black"/>
-
-    <com.google.android.exoplayer.text.SubtitleLayout android:id="@+id/subtitles"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-  </com.google.android.exoplayer.AspectRatioFrameLayout>
-
-</FrameLayout>

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

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
-             tools:context=".detail.VideoItemDetailFragment"
-             android:textIsSelectable="true"
-             style="?android:attr/textAppearanceLarge"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:id="@+id/video_item_detail">
-
-    <com.nirhart.parallaxscroll.views.ParallaxScrollView
-        android:id="@+id/detail_main_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="visible"
-        app:parallax_factor="1.9"
-        tools:ignore="UselessParent">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RelativeLayout
-                android:id="@+id/detail_stream_thumbnail_window_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground">
-
-                <ImageView android:id="@+id/detail_thumbnail_view"
-                           android:contentDescription="@string/detail_thumbnail_view_description"
-                           android:layout_width="match_parent"
-                           android:layout_height="wrap_content"
-                           android:scaleType="fitCenter"
-                           android:adjustViewBounds="true"
-                           android:layout_alignParentLeft="true"
-                           android:layout_alignParentStart="true"
-                           android:layout_alignParentTop="true"
-                           android:background="@android:color/black"
-                           android:src="@drawable/dummy_thumbnail_dark"/>
-
-                <ProgressBar android:id="@+id/detail_progress_bar"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"
-                             android:layout_centerInParent="true"
-                             android:indeterminate="true"/>
-
-                <android.support.design.widget.FloatingActionButton
-                    android:id="@+id/play_video_button"
-                    android:visibility="invisible"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    app:backgroundTint="@color/light_youtube_primary_color"
-                    android:src="@drawable/ic_play_arrow_black"
-                    android:layout_margin="@dimen/video_item_detail_play_fab_margin"/>
-
-                <Button
-                    android:id="@+id/detail_stream_thumbnail_window_background_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackground"/>
-
-            </RelativeLayout>
-
-            <RelativeLayout android:id="@+id/detail_text_content_layout"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                            android:background="?android:windowBackground"
-                            android:visibility="visible">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/detailTopView">
-
-                    <TextView android:id="@+id/detail_video_title_view"
-                              android:layout_width="0dp"
-                              android:layout_weight=".7"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_title_text_size"
-                              android:textAppearance="?android:attr/textAppearanceLarge"
-                              android:layout_marginTop="12dp"
-                              android:layout_marginLeft="12dp"
-                              android:layout_marginStart="12dp"
-                              android:text="Title"/>
-
-                    <ImageView
-                        android:layout_width="15dp"
-                        android:layout_height="30dp"
-                        android:id="@+id/toggle_description_view"
-                        android:src="@drawable/arrow_down"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginStart="10dp"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginEnd="10dp"
-                        android:layout_marginTop="8dp"/>
-
-                </LinearLayout>
-
-                <TextView android:id="@+id/detail_view_count_view"
-                          android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:textSize="@dimen/video_item_detail_views_text_size"
-                          android:textAppearance="?android:attr/textAppearanceLarge"
-                          android:layout_marginLeft="12dp"
-                          android:layout_marginStart="12dp"
-                          android:text="10,069,948 views"
-                          android:layout_below="@id/detailTopView"
-                          android:layout_alignParentLeft="true"
-                          android:layout_alignParentStart="true"
-                          android:layout_marginTop="5dp" />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detail_view_count_view"
-                    android:id="@+id/detailExtraView"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginRight="12dp"
-                    android:layout_marginEnd="12dp"
-                    android:visibility="gone">
-                    <TextView android:id="@+id/detail_upload_date_view"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:text="Upload date"
-                              android:layout_marginTop="3dp" />
-
-                    <TextView android:id="@+id/detail_description_view"
-                              android:layout_width="match_parent"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_description_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:layout_below="@id/detail_upload_date_view"
-                              android:text="Description............."
-                              android:layout_marginTop="3dp" />
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/stream_info_layout"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_below="@+id/detailExtraView"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="5dp">
-                    <ImageView android:id="@+id/detail_thumbs_up_img_view"
-                               android:contentDescription="@string/detail_likes_img_view_description"
-                               android:layout_width="@dimen/video_item_detail_like_image_width"
-                               android:layout_height="@dimen/video_item_detail_like_image_height"
-                               android:src="?attr/thumbs_up" />
-
-                    <TextView android:id="@+id/detail_thumbs_up_count_view"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_likes_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:text="200" />
-
-                    <ImageView android:id="@+id/detail_thumbs_down_img_view"
-                               android:contentDescription="@string/detail_dislikes_img_view_description"
-                               android:layout_width="@dimen/video_item_detail_like_image_width"
-                               android:layout_height="@dimen/video_item_detail_like_image_height"
-                               android:src="?attr/thumbs_down"
-                               android:layout_marginLeft="10dp"
-                               android:layout_marginStart="10dp"/>
-
-                    <TextView android:id="@+id/detail_thumbs_down_count_view"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:textSize="@dimen/video_item_detail_likes_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:text="100" />
-                </LinearLayout>
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/detail_uploader_frame"
-                    android:layout_below="@id/stream_info_layout">
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/detail_uploader_layout"
-                        android:layout_marginTop="12dp">
-
-                        <View
-                            android:background="#000"
-                            android:layout_width="match_parent"
-                            android:layout_height="1px" />
-
-                        <de.hdodenhof.circleimageview.CircleImageView
-                            android:id="@+id/detail_uploader_thumbnail_view"
-                            android:contentDescription="@string/detail_uploader_thumbnail_view_description"
-                            android:layout_width="@dimen/video_item_detail_uploader_image_size"
-                            android:layout_height="@dimen/video_item_detail_uploader_image_size"
-                            android:src="@drawable/buddy"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginStart="10dp"
-                            android:layout_alignParentLeft="true"
-                            android:layout_alignParentStart="true"
-                            android:layout_marginTop="5dp"
-                            android:layout_marginBottom="5dp"/>
-
-                        <TextView android:id="@+id/detail_uploader_view"
-                                  android:layout_width="wrap_content"
-                                  android:layout_height="wrap_content"
-                                  android:textStyle="bold"
-                                  android:textSize="@dimen/video_item_detail_uploader_text_size"
-                                  android:textAppearance="?android:attr/textAppearanceLarge"
-                                  android:text="Uploader"
-                                  android:layout_centerVertical="true"
-                                  android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
-                                  android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
-                                  android:layout_marginLeft="15dp"
-                                  android:layout_marginStart="28dp" />
-
-                        <View
-                            android:background="#000"
-                            android:layout_width="match_parent"
-                            android:layout_height="1px"
-
-                            android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_below="@id/detail_uploader_thumbnail_view"/>
-                    </RelativeLayout>
-                    <Button
-                        android:layout_marginTop="13dp"
-                        android:id="@+id/channel_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="?attr/selectableItemBackground"/>
-                </FrameLayout>
-
-                <RelativeLayout android:id="@+id/detail_next_stream_root_layout"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="center_horizontal|bottom"
-                                android:layout_below="@+id/detail_uploader_frame"
-                                android:layout_centerHorizontal="true"
-                                android:layout_marginTop="10dp">
-
-                    <TextView
-                        android:id="@+id/detail_next_stream_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:textSize="@dimen/video_item_detail_next_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="@string/next_video_title"
-                        android:textAllCaps="true" />
-
-                    <android.support.v7.widget.RecyclerView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/detail_next_stream_content"/>
-                    <TextView android:id="@+id/detail_similar_title"
-                              android:layout_width="wrap_content"
-                              android:layout_height="wrap_content"
-                              android:layout_centerHorizontal="true"
-                              android:textSize="@dimen/video_item_detail_next_text_size"
-                              android:textAppearance="?android:attr/textAppearanceMedium"
-                              android:text="@string/similar_videos_btn_text"
-                              android:layout_below="@id/detail_next_stream_content"
-                              android:textAllCaps="true" />
-                    <LinearLayout
-                        android:id="@+id/similar_streams_view"
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_below="@id/detail_similar_title">
-                    </LinearLayout>
-                </RelativeLayout>
-            </RelativeLayout>
-        </RelativeLayout>
-    </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</FrameLayout>

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

@@ -65,7 +65,7 @@
             android:background="#00ffffff"
             android:clickable="true"
             android:scaleType="fitXY"
-            android:src="@drawable/ic_pause_white_24dp" />
+            android:src="@drawable/ic_pause_white" />
 
         <ImageButton
             android:id="@+id/notificationStop"
@@ -75,7 +75,7 @@
             android:background="#00ffffff"
             android:clickable="true"
             android:scaleType="fitXY"
-            android:src="@drawable/ic_close_white_24dp" />
+            android:src="@drawable/ic_close_white" />
     </LinearLayout>
 
 

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

@@ -58,7 +58,7 @@
         android:background="#00ffffff"
         android:clickable="true"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_close_white_24dp" />
+        android:src="@drawable/ic_close_white" />
 
 
     <RelativeLayout
@@ -77,7 +77,7 @@
             android:background="#00ffffff"
             android:clickable="true"
             android:scaleType="fitXY"
-            android:src="@drawable/ic_pause_white_24dp"
+            android:src="@drawable/ic_pause_white"
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true" />
 

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

@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black"
+    android:gravity="center">
+
+
+    <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
+        android:id="@+id/aspectRatioLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center">
+
+        <SurfaceView
+            android:id="@+id/surfaceView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"/>
+
+        <View
+            android:id="@+id/surfaceForeground"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"/>
+
+    </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
+
+
+    <ImageView
+        android:id="@+id/endScreen"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black"
+        android:visibility="gone"
+        tools:background="@android:color/white"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible"/>
+
+    <RelativeLayout
+        android:id="@+id/playbackControlRoot"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#32000000"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <RelativeLayout
+            android:id="@+id/topControls"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:background="@drawable/player_top_controls_bg"
+            android:paddingBottom="20dp"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:paddingTop="4dp">
+
+            <TextView
+                android:id="@+id/qualityTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:layout_alignParentLeft="true"
+                android:padding="5dp"
+                android:gravity="center"
+                android:text="720p"
+                android:textColor="@android:color/white"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry"/>
+
+            <ImageButton
+                android:id="@+id/fullScreenButton"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_alignParentRight="true"
+                android:background="#00ffffff"
+                android:clickable="true"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_fullscreen_white"
+                tools:ignore="ContentDescription,RtlHardcoded"/>
+
+        </RelativeLayout>
+
+        <!--Shadow Bottom Control-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/player_controls_bg"
+            android:orientation="horizontal"
+            android:paddingTop="50dp"/>
+
+        <LinearLayout
+            android:id="@+id/bottomControls"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingBottom="2dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp">
+
+            <TextView
+                android:id="@+id/playbackCurrentTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text="-:--:--"
+                android:textColor="@android:color/white"
+                tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry"
+                tools:text="1:06:29"/>
+
+            <android.support.v7.widget.AppCompatSeekBar
+                android:id="@+id/playbackSeekBar"
+                style="@style/Widget.AppCompat.SeekBar"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                tools:progress="25"
+                tools:secondaryProgress="50"/>
+
+            <TextView
+                android:id="@+id/playbackEndTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text="-:--:--"
+                android:textColor="@android:color/white"
+                tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry"
+                tools:text="1:23:49"/>
+        </LinearLayout>
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:weightSum="5">
+        <!--tools:visibility="gone">-->
+
+        <ImageView
+            android:id="@+id/controlAnimationView"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:src="@drawable/ic_action_av_fast_rewind"
+            android:visibility="gone"
+            tools:ignore="ContentDescription"
+            tools:visibility="visible"/>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/currentDisplaySeek"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="#64000000"
+        android:paddingBottom="5dp"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="5dp"
+        android:textColor="@android:color/white"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:visibility="gone"
+        tools:ignore="RtlHardcoded"
+        tools:text="1:06:29"
+        tools:visibility="visible"/>
+
+    <RelativeLayout
+        android:id="@+id/loadingPanel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:background="@color/black"
+        android:gravity="center"
+        android:padding="20dp"
+        tools:visibility="gone">
+
+        <ProgressBar
+            android:id="@+id/progressBarLoadingPanel"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"/>
+    </RelativeLayout>
+</FrameLayout>

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

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/notificationContent"
+    android:layout_width="match_parent"
+    android:layout_height="64dp"
+    android:background="@color/background_notification_color"
+    android:clickable="true"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/notificationCover"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/dummy_thumbnail"
+        tools:ignore="ContentDescription"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        tools:ignore="RtlHardcoded">
+
+        <TextView
+            android:id="@+id/notificationSongName"
+            style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:maxLines="1"
+            tools:text="a long, long, long, long, long title"/>
+
+        <TextView
+            android:id="@+id/notificationArtist"
+            style="@android:style/TextAppearance.StatusBar.EventContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:maxLines="1"
+            tools:text="a long, long artist"/>
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/notificationRepeat"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:background="#00000000"
+        android:clickable="true"
+        android:padding="5dp"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_repeat_white"
+        tools:ignore="ContentDescription"/>
+
+    <ImageButton
+        android:id="@+id/notificationPlayPause"
+        android:layout_width="45dp"
+        android:layout_height="match_parent"
+        android:background="#00000000"
+        android:clickable="true"
+        android:src="@drawable/ic_pause_white"
+        tools:ignore="ContentDescription"/>
+
+    <ImageButton
+        android:id="@+id/notificationStop"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginLeft="5dp"
+        android:background="#00000000"
+        android:clickable="true"
+        android:padding="5dp"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_close_white"
+        tools:ignore="ContentDescription,RtlHardcoded"/>
+</LinearLayout>

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

@@ -1,108 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <FrameLayout
-    android:id="@+id/item_main_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_main_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-    <LinearLayout
+
+    <RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:orientation="vertical">
 
         <RelativeLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:orientation="vertical"
-            android:layout_width="match_parent"
+            android:id="@+id/itemThumbnailViewContainer"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="12dp">
+            android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+            tools:ignore="RtlHardcoded">
 
-            <RelativeLayout android:id="@+id/itemThumbnailViewContainer"
-                android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+            <ImageView
+                android:id="@+id/itemThumbnailView"
+                android:layout_width="@dimen/video_item_search_thumbnail_image_width"
+                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:contentDescription="@string/list_thumbnail_view_description"
+                android:scaleType="centerCrop"
+                android:src="@drawable/dummy_thumbnail"/>
+
+            <TextView
+                android:id="@+id/itemDurationView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                tools:ignore="RtlHardcoded">
-
-                <ImageView android:id="@+id/itemThumbnailView"
-                    android:contentDescription="@string/list_thumbnail_view_description"
-                    android:layout_width="@dimen/video_item_search_thumbnail_image_width"
-                    android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-                    android:scaleType="centerCrop"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:src="@drawable/dummy_thumbnail"/>
-
-                <TextView android:id="@+id/itemDurationView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignBottom="@id/itemThumbnailView"
-                    android:layout_alignRight="@id/itemThumbnailView"
-                    android:layout_alignEnd="@id/itemThumbnailView"
-                    android:layout_marginRight="@dimen/video_item_search_duration_margin"
-                    android:layout_marginEnd="@dimen/video_item_search_duration_margin"
-                    android:layout_marginBottom="@dimen/video_item_search_duration_margin"
-                    android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
-                    android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
-                    android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
-                    android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textSize="@dimen/video_item_search_duration_text_size"
-                    android:background="@color/duration_background_color"
-                    android:textColor="@color/duration_text_color"/>
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
-                android:layout_toRightOf="@id/itemThumbnailViewContainer"
-                tools:ignore="RtlHardcoded">
-
-                <TextView android:id="@+id/itemVideoTitleView"
-                    android:layout_weight="1"
-                    android:layout_width="fill_parent"
-                    android:layout_height="0dp"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textSize="@dimen/video_item_search_title_text_size"/>
-
-                <TextView android:id="@+id/itemUploaderView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textSize="@dimen/video_item_search_uploader_text_size"/>
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView android:id="@+id/itemUploadDateView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textSize="@dimen/video_item_search_upload_date_text_size"/>
-
-                    <TextView android:id="@+id/itemViewCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:singleLine="true"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textSize="@dimen/video_item_search_upload_date_text_size"/>
-
-                </LinearLayout>
-
-
-            </LinearLayout>
+                android:layout_alignBottom="@id/itemThumbnailView"
+                android:layout_alignRight="@id/itemThumbnailView"
+                android:layout_marginBottom="@dimen/video_item_search_duration_margin"
+                android:layout_marginRight="@dimen/video_item_search_duration_margin"
+                android:background="@color/duration_background_color"
+                android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
+                android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
+                android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
+                android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/duration_text_color"
+                android:textSize="@dimen/video_item_search_duration_text_size"
+                tools:text="1:09:10"/>
 
         </RelativeLayout>
-    </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+            android:layout_toRightOf="@id/itemThumbnailViewContainer"
+            android:orientation="vertical"
+            tools:ignore="RtlHardcoded">
+
+            <TextView
+                android:id="@+id/itemVideoTitleView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_above="@+id/itemUploaderView"
+                android:layout_alignParentTop="true"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="@dimen/video_item_search_title_text_size"
+                tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"/>
+
+            <TextView
+                android:id="@+id/itemUploaderView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_above="@+id/itemUploadDateView"
+                android:maxLines="1"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="@dimen/video_item_search_uploader_text_size"
+                tools:text="Uploader"/>
+
+
+            <TextView
+                android:id="@+id/itemUploadDateView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:maxLines="1"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="@dimen/video_item_search_upload_date_text_size"
+                tools:text="2 years ago • "/>
+
+            <TextView
+                android:id="@+id/itemViewCountView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_toRightOf="@+id/itemUploadDateView"
+                android:maxLines="1"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="@dimen/video_item_search_upload_date_text_size"
+                tools:text="10M views"/>
+
+
+        </RelativeLayout>
+
+    </RelativeLayout>
 
     <Button
         android:id="@+id/item_button"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/selectableItemBackground"/>
+        android:background="?attr/selectableItemBackground"
+        tools:visibility="gone"/>
 </FrameLayout>

app/src/main/res/menu/video_player.xml

@@ -5,5 +5,5 @@
     <item android:id="@+id/menu_item_screen_rotation"
         android:title="@string/screen_rotation"
         app:showAsAction="always"
-        android:icon="@drawable/ic_screen_rotation_white_24dp"/>
+        android:icon="@drawable/ic_screen_rotation_white"/>
 </menu>