Fixed serveral things:

* ugly workaround for the details_view_layout problem on older devices * removed "display button on the left side" option since it's not nececeay anymore.
Translated using Weblate (French)
2025-09-19 12:00:52 +02:00 · 2015-12-15 22:53:29 +01:00 · 2015-12-15 14:28:58 +01:00 · 2015-12-15 14:25:10 +01:00 · 2015-12-15 11:57:58 +01:00 · 2015-12-15 11:57:58 +01:00
113 changed files with 3824 additions and 2503 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
+.gitignore
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
 /captures
+/app/app.iml
+/.idea
+/*.iml
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +0,0 @@
-NewPipe
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
--- a/.idea/dictionaries/the_scrabi.xml
+++ b/.idea/dictionaries/the_scrabi.xml
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="the-scrabi" />
-</component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.8" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/NewPipe.iml" filepath="$PROJECT_DIR$/NewPipe.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,29 @@
+language: android
+android:
+  components:
+    # The BuildTools version used by NewPipe
+    - build-tools-23.0.2
+
+    # The SDK version used to compile NewPipe
+    - android-23
+
+    # Additional components
+    - extra-android-support
+    - extra-android-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)
+  matrix:
+    - ANDROID_TARGET=android-19  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 &
--- a/NewPipe.iml
+++ b/NewPipe.iml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="NewPipe" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/README.md
+++ b/README.md
@@ -1,7 +1,69 @@
-NewPipe
-------
+# NewPipe
+NewPipe: A free lightweight Youtube frontend for Android.  

+[![NewPipe](app/src/main/res/mipmap-xhdpi/ic_launcher.png)](http://dasochan.nl/newpipe/)

-NewPipe is a lightweight youtube frontend for android. It's supposed to be used without the youtube-api and without any google play services. NewPipe only parses the youtube website in order to gain the information it needs.
+Project status:
+[![Translation Status](https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg)](https://hosted.weblate.org/engage/NewPipe/)
+[![Build Status](https://travis-ci.org/theScrabi/NewPipe.svg)](https://travis-ci.org/theScrabi/NewPipe)

-This a very early version of the app, so not all functionality is implemented, and there may still be a lot of bugs. But all in all it's doing what it is supposed to do. It makes it possible to watch youtube videos. So don't be cruel to this app. It will improve...
+## Get NewPipe
+
+[![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
+
+## Screenshots
+
+[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
+[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
+[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
+[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
+[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
+[<img src="screenshots/screenshot_6.png" width=250>](screenshots/screenshot_6.png)
+
+## Description
+
+NewPipe does not use any Google framework libraries, or the YouTube API. It only parses the website in order to gain the information it needs. Therefore this app can be used on devices without Google Services installed. Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.
+
+### Features
+
+* Search videos
+* Display general information about a video
+* Watch YouTube videos
+* Listen to YouTube videos (audio only streaming)
+* Select the streaming player to watch the video with
+* Download videos (working, but it could be better)
+* Download audio only (working, but it could be better)
+* Open a video in Kodi
+* Show Next/Related videos
+* Search YouTube in a specific language
+
+### Coming Features
+
+* Improved Downloading
+* Bookmarks
+* View history
+* Search history
+* Search channels
+* Display general information about channels
+* Subscribe to channels
+* Watch videos from a channel
+* Search/Watch Playlists
+* ... and many more
+
+### Multiservice support
+Although NewPipe only supports YouTube at the moment, it's designed to support many more streaming services. The plan is, that NewPipe will get such support by the version 2.0.
+
+## Contribution
+Whether you have ideas, translation, design changes, code cleaning, or real heavy code changes, help is always welcome.
+The more is done the better it gets!
+
+Join our [Slack group](http://invite.chschtsch.ml/) if you like to get involved.
+
+## License
+[![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  
+
+NewPipe is Free Software: You can use, study share and improve it at your
+will. Specifically you can redistribute and/or modify it under the terms of the
+[GNU General Public License](https://www.gnu.org/licenses/gpl.html) as
+published by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.  
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,3 @@
+.gitignore
 /build
+app.iml
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="NewPipe" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
-    <orderEntry type="library" exported="" name="design-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
-  </component>
-</module>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'

 android {
    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"

    defaultConfig {
        applicationId "org.schabi.newpipe"
        minSdkVersion 15
        targetSdkVersion 23
-        versionCode 4
-        versionName "0.4.1"
+        versionCode 8
+        versionName "0.6.2"
    }
    buildTypes {
        release {
@@ -17,13 +17,22 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
+    
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
 }

 dependencies {
    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:cardview-v7:23.1.1'
+    compile 'com.android.support:recyclerview-v7:23.1.1'
    compile 'org.jsoup:jsoup:1.8.3'
    compile 'org.mozilla:rhino:1.7.7'
-    compile 'com.android.support:design:23.0.1'
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    package="org.schabi.newpipe" >

-    <uses-permission android:name= "android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <application
@@ -10,10 +11,11 @@
        android:icon="@mipmap/ic_launcher"
        android:logo="@mipmap/ic_launcher"
        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        tools:ignore="AllowBackup">
        <activity
            android:name=".VideoItemListActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@@ -22,7 +24,8 @@
        </activity>
        <activity
            android:name=".VideoItemDetailActivity"
-            android:label="@string/title_videoitem_detail" >
+            android:label="@string/title_videoitem_detail"
+            android:theme="@style/AppTheme">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value=".VideoItemListActivity" />
@@ -34,27 +37,27 @@
                <data
                    android:host="youtube.com"
                    android:scheme="http"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="youtube.com"
                    android:scheme="https"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="www.youtube.com"
                    android:scheme="http"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="www.youtube.com"
                    android:scheme="https"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="m.youtube.com"
                    android:scheme="http"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="m.youtube.com"
                    android:scheme="https"
-                    android:pathPrefix="/watch"/>
+                    android:pathPattern="/?*#*/*watch"/>
                <data
                    android:host="youtu.be"
                    android:scheme="https"
@@ -67,8 +70,9 @@
        </activity>
        <activity android:name=".PlayVideoActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/FullscreenTheme"
-            >
+            android:theme="@style/VideoPlayerTheme"
+            android:parentActivityName=".VideoItemDetailActivity"
+            tools:ignore="UnusedAttribute">
        </activity>
        <activity
            android:name=".SettingsActivity"
--- a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
--- a/app/src/main/java/org/schabi/newpipe/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/DownloadDialog.java
@@ -8,6 +8,7 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.util.Log;
@@ -42,8 +43,9 @@ public class DownloadDialog extends DialogFragment {
    public static final String FILE_SUFFIX_VIDEO = "file_suffix_video";
    public static final String AUDIO_URL = "audio_url";
    public static final String VIDEO_URL = "video_url";
-    Bundle arguments;
+    private Bundle arguments;

+    @NonNull
    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        arguments = getArguments();
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -1,9 +1,11 @@
 package org.schabi.newpipe;

 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.UnknownHostException;

 /**
 * Created by Christian Schabesberger on 14.08.15.
@@ -28,12 +30,30 @@ import java.net.URL;
 public class Downloader {

    private static final String USER_AGENT = "Mozilla/5.0";
-    public static String download(String siteUrl) {

-        StringBuffer response = new StringBuffer();
+    /**Download the text file at the supplied URL as in download(String),
+     * but set the HTTP header field "Accept-Language" to the supplied string.
+     * @param siteUrl the URL of the text file to return the contents of
+     * @param language the language (usually a 2-character code) to set as the preferred language
+     * @return the contents of the specified text file*/
+    public static String download(String siteUrl, String language) {
+        String ret = "";
        try {
            URL url = new URL(siteUrl);
            HttpURLConnection con = (HttpURLConnection) url.openConnection();
+            con.setRequestProperty("Accept-Language", language);
+            ret = dl(con);
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+        }
+        return ret;
+    }
+    /**Common functionality between download(String url) and download(String url, String language)*/
+    private static String dl(HttpURLConnection con) throws IOException {
+        StringBuilder response = new StringBuilder();
+
+        try {
            con.setRequestMethod("GET");
            con.setRequestProperty("User-Agent", USER_AGENT);

@@ -45,9 +65,32 @@ public class Downloader {
                response.append(inputLine);
            }
            in.close();
-        } catch (Exception e) {
-            e.printStackTrace();
+
        }
+        catch(UnknownHostException uhe) {//thrown when there's no internet connection
+            uhe.printStackTrace();
+            //Toast.makeText(getActivity(), uhe.getMessage(), Toast.LENGTH_LONG).show();
+        }
+
        return response.toString();
    }
+
+/**Download (via HTTP) the text file located at the supplied URL, and return its contents.
+ * Primarily intended for downloading web pages.
+ * @param siteUrl the URL of the text file to download
+ * @return the contents of the specified text file*/
+    public static String download(String siteUrl) {
+        String ret = "";
+
+        try {
+            URL url = new URL(siteUrl);
+            HttpURLConnection con = (HttpURLConnection) url.openConnection();
+            ret = dl(con);
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+        }
+
+        return ret;
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/Extractor.java
+++ b/app/src/main/java/org/schabi/newpipe/Extractor.java
@@ -1,30 +0,0 @@
-package org.schabi.newpipe;
-
-import android.graphics.Bitmap;
-
-/**
- * Created by Christian Schabesberger on 10.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * Extractor.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 interface Extractor {
-    VideoInfo getVideoInfo(String siteUrl);
-    String getVideoUrl(String videoId);
-    String getVideoId(String videoUrl);
-}
--- a/app/src/main/java/org/schabi/newpipe/MediaFormat.java
+++ b/app/src/main/java/org/schabi/newpipe/MediaFormat.java
@@ -0,0 +1,81 @@
+package org.schabi.newpipe;
+
+/**
+ * Created by Adam Howard on 08/11/15.
+ *
+ * Copyright (c) Christian Schabesberger <chris.schabesberger@mailbox.org>
+ *     and Adam Howard <achdisposable1@gmail.com> 2015
+ *
+ * VideoListAdapter.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/>.
+ */
+
+/**Static data about various media formats support by Newpipe, eg mime type, extension*/
+
+public enum MediaFormat {
+    //           id      name    suffix  mime type
+    MPEG_4      (0x0,   "MPEG-4", "mp4", "video/mp4"),
+    v3GPP       (0x1,   "3GPP",   "3gp", "video/3gpp"),
+    WEBM        (0x2,   "WebM",  "webm", "video/webm"),
+    M4A         (0x3,   "m4a",   "m4a",  "audio/mp4"),
+    WEBMA       (0x4,   "WebM",  "webm", "audio/webm");
+
+    public final int id;
+    @SuppressWarnings("WeakerAccess")
+    public final String name;
+    @SuppressWarnings("WeakerAccess")
+    public final String suffix;
+    public final String mimeType;
+
+    MediaFormat(int id, String name, String suffix, String mimeType) {
+        this.id = id;
+        this.name = name;
+        this.suffix = suffix;
+        this.mimeType = mimeType;
+    }
+
+    /**Return the friendly name of the media format with the supplied id
+     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
+     * @return the friendly name of the MediaFormat associated with this ids,
+     * or an empty String if none match it.*/
+    public static String getNameById(int ident) {
+        for (MediaFormat vf : MediaFormat.values()) {
+            if(vf.id == ident) return vf.name;
+        }
+        return "";
+    }
+
+    /**Return the file extension of the media format with the supplied id
+     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
+     * @return the file extension of the MediaFormat associated with this ids,
+     * or an empty String if none match it.*/
+    public static String getSuffixById(int ident) {
+        for (MediaFormat vf : MediaFormat.values()) {
+            if(vf.id == ident) return vf.suffix;
+        }
+        return "";
+    }
+
+    /**Return the MIME type of the media format with the supplied id
+     * @param ident the id of the media format. Currently an arbitrary, NewPipe-specific number.
+     * @return the MIME type of the MediaFormat associated with this ids,
+     * or an empty String if none match it.*/
+    public static String getMimeById(int ident) {
+        for (MediaFormat vf : MediaFormat.values()) {
+            if(vf.id == ident) return vf.mimeType;
+        }
+        return "";
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
@@ -16,18 +15,15 @@ import android.support.v7.app.AppCompatActivity;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.Surface;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
 import android.widget.MediaController;
 import android.widget.ProgressBar;
-import android.widget.SeekBar;
 import android.widget.VideoView;

 /**
@@ -57,9 +53,9 @@ public class PlayVideoActivity extends AppCompatActivity {
    public static final String STREAM_URL = "stream_url";
    public static final String VIDEO_TITLE = "video_title";
    private static final String POSITION = "position";
+    public static final String START_POSITION = "start_position";

    private static final long HIDING_DELAY = 3000;
-    private static final long TAB_HIDING_DELAY = 100;

    private String videoUrl = "";

@@ -84,15 +80,41 @@ public class PlayVideoActivity extends AppCompatActivity {
        setContentView(R.layout.activity_play_video);

        isLandscape = checkIfLandscape();
-        hasSoftKeys = checkIfhasSoftKeys();
+        hasSoftKeys = checkIfHasSoftKeys();

        actionBar = getSupportActionBar();
+        assert actionBar != null;
        actionBar.setDisplayHomeAsUpEnabled(true);
        Intent intent = getIntent();
        if(mediaController == null) {
-            mediaController = new MediaController(this);
+            //prevents back button hiding media controller controls (after showing them)
+            //instead of exiting video
+            //see http://stackoverflow.com/questions/6051825
+            //also solves https://github.com/theScrabi/NewPipe/issues/99
+            mediaController = new MediaController(this) {
+                @Override
+                public boolean dispatchKeyEvent(KeyEvent event) {
+                    int keyCode = event.getKeyCode();
+                    final boolean uniqueDown = event.getRepeatCount() == 0
+                            && event.getAction() == KeyEvent.ACTION_DOWN;
+                    if (keyCode == KeyEvent.KEYCODE_BACK) {
+                        if (uniqueDown)
+                        {
+                            if (isShowing()) {
+                                finish();
+                            } else {
+                                hide();
+                            }
+                        }
+                        return true;
+                    }
+                    return super.dispatchKeyEvent(event);
+                }
+            };
        }

+        position = intent.getIntExtra(START_POSITION, 0)*1000;//convert from seconds to milliseconds
+
        videoView = (VideoView) findViewById(R.id.video_view);
        progressBar = (ProgressBar) findViewById(R.id.play_video_progress_bar);
        try {
@@ -138,9 +160,11 @@ public class PlayVideoActivity extends AppCompatActivity {
            }
        });

-        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        if (android.os.Build.VERSION.SDK_INT >= 17) {
+            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        }

        prefs = getPreferences(Context.MODE_PRIVATE);
        if(prefs.getBoolean(PREF_IS_LANDSCAPE, false) && !isLandscape) {
@@ -148,11 +172,6 @@ public class PlayVideoActivity extends AppCompatActivity {
        }
    }

-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-    }
-
    @Override
    public boolean onCreatePanelMenu(int featured, Menu menu) {
        super.onCreatePanelMenu(featured, menu);
@@ -162,11 +181,6 @@ public class PlayVideoActivity extends AppCompatActivity {
        return true;
    }

-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
    @Override
    public void onPause() {
        super.onPause();
@@ -203,10 +217,10 @@ public class PlayVideoActivity extends AppCompatActivity {

        if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
            isLandscape = true;
-            adjustMediaControllMetrics();
+            adjustMediaControlMetrics();
        } else if (config.orientation == Configuration.ORIENTATION_PORTRAIT){
            isLandscape = false;
-            adjustMediaControllMetrics();
+            adjustMediaControlMetrics();
        }
    }

@@ -229,7 +243,7 @@ public class PlayVideoActivity extends AppCompatActivity {
            uiIsHidden = false;
            mediaController.show(100000);
            actionBar.show();
-            adjustMediaControllMetrics();
+            adjustMediaControlMetrics();
            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
            Handler handler = new Handler();
            handler.postDelayed(new Runnable() {
@@ -250,16 +264,18 @@ public class PlayVideoActivity extends AppCompatActivity {
        uiIsHidden = true;
        actionBar.hide();
        mediaController.hide();
-        decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_FULLSCREEN
-                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        if (android.os.Build.VERSION.SDK_INT >= 17) {
+            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        }
        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                WindowManager.LayoutParams.FLAG_FULLSCREEN);
    }

-    private void adjustMediaControllMetrics() {
+    private void adjustMediaControlMetrics() {
        MediaController.LayoutParams mediaControllerLayout
                = new MediaController.LayoutParams(MediaController.LayoutParams.MATCH_PARENT,
                MediaController.LayoutParams.WRAP_CONTENT);
@@ -274,12 +290,10 @@ public class PlayVideoActivity extends AppCompatActivity {
        mediaController.setLayoutParams(mediaControllerLayout);
    }

-    private boolean checkIfhasSoftKeys(){
-        if(Build.VERSION.SDK_INT >= 17) {
-            return getNavigationBarHeight() != 0 || getNavigationBarWidth() != 0;
-        } else {
-            return true;
-        }
+    private boolean checkIfHasSoftKeys(){
+        return Build.VERSION.SDK_INT >= 17 ||
+                getNavigationBarHeight() != 0 ||
+                getNavigationBarWidth() != 0;
    }

    private int getNavigationBarHeight() {
@@ -316,7 +330,7 @@ public class PlayVideoActivity extends AppCompatActivity {
        }
    }

-    public boolean checkIfLandscape() {
+    private boolean checkIfLandscape() {
        DisplayMetrics displayMetrics = new DisplayMetrics();
        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
        return displayMetrics.heightPixels < displayMetrics.widthPixels;
@@ -332,6 +346,6 @@ public class PlayVideoActivity extends AppCompatActivity {
        }
        SharedPreferences.Editor editor = prefs.edit();
        editor.putBoolean(PREF_IS_LANDSCAPE, isLandscape);
-        editor.commit();
+        editor.apply();
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
@@ -9,10 +9,9 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
+import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -70,14 +69,11 @@ public class SettingsActivity extends PreferenceActivity {
        getDelegate().onPostCreate(savedInstanceState);
    }

-    public ActionBar getSupportActionBar() {
+    private ActionBar getSupportActionBar() {
        return getDelegate().getSupportActionBar();
    }

-    public void setSupportActionBar(@Nullable Toolbar toolbar) {
-        getDelegate().setSupportActionBar(toolbar);
-    }
-
+    @NonNull
    @Override
    public MenuInflater getMenuInflater() {
        return getDelegate().getMenuInflater();
@@ -162,7 +158,7 @@ public class SettingsActivity extends PreferenceActivity {
                    Environment.getExternalStorageDirectory().getAbsolutePath() + "/NewPipe";
            spEditor.putString(context.getString(R.string.downloadPathPreference)
                    , newPipeDownloadStorage);
-            spEditor.commit();
+            spEditor.apply();
        }
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
@@ -1,5 +1,9 @@
 package org.schabi.newpipe;

+import org.schabi.newpipe.services.AbstractVideoInfo;
+
+import java.util.List;
+
 /**
 * Created by Christian Schabesberger on 26.08.15.
 *
@@ -20,126 +24,78 @@ package org.schabi.newpipe;
 * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
 */

-import android.graphics.Bitmap;
-import android.util.Log;
+/**Info object for opened videos, ie the video ready to play.*/
+@SuppressWarnings("ALL")
+public class VideoInfo extends AbstractVideoInfo {

-import java.util.Vector;
+    public String uploader_thumbnail_url = "";
+    public String description = "";
+    public VideoStream[] videoStreams = null;
+    public AudioStream[] audioStreams = null;
+    public int videoAvailableStatus = VIDEO_AVAILABLE;
+    public int duration = -1;

-public class VideoInfo {
-
-    private static final String TAG = VideoInfo.class.toString();
-
-    // format identifier
-    public static final int I_MPEG_4 = 0x0;
-    public static final int I_3GPP = 0x1;
-    public static final int I_WEBM = 0x2;
-    public static final int I_M4A = 0x3;
-    public static final int I_WEBMA = 0x4;
-
-    // format name
-    public static final String F_MPEG_4 = "MPEG-4";
-    public static final String F_3GPP = "3GPP";
-    public static final String F_WEBM = "WebM";
-    public static final String F_M4A = "m4a";
-    public static final String F_WEBMA = "WebM";
-
-    // file suffix
-    public static final String C_MPEG_4 = "mp4";
-    public static final String C_3GPP = "3gp";
-    public static final String C_WEBM = "webm";
-    public static final String C_M4A = "m4a";
-    public static final String C_WEBMA = "webm";
-
-    // mimeType
-    public static final String M_MPEG_4 = "video/mp4";
-    public static final String M_3GPP = "video/3gpp";
-    public static final String M_WEBM = "video/webm";
-    public static final String M_M4A = "audio/mp4";
-    public static final String M_WEBMA = "audio/webm";
+    /*YouTube-specific fields
+    todo: move these to a subclass*/
+    public int age_limit = 0;
+    public int like_count = -1;
+    public int dislike_count = -1;
+    public String average_rating = "";
+    public VideoPreviewInfo nextVideo = null;
+    public List<VideoPreviewInfo> relatedVideos = null;
+    public int startPosition = -1;//in seconds. some metadata is not passed using a VideoInfo object!

    public static final int VIDEO_AVAILABLE = 0x00;
    public static final int VIDEO_UNAVAILABLE = 0x01;
-    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;
+    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;//German DRM organisation

-    public static String getNameById(int id) {
-        switch(id) {
-            case I_MPEG_4: return F_MPEG_4;
-            case I_3GPP: return F_3GPP;
-            case I_WEBM: return F_WEBM;
-            case I_M4A: return F_M4A;
-            case I_WEBMA: return F_WEBMA;
-            default: Log.e(TAG, "format not known: " +
-                    Integer.toString(id) + "call the programmer he messed it up.");
-        }
-        return "";
-    }

-    public static String getSuffixById(int id) {
-        switch(id) {
-            case I_MPEG_4: return C_MPEG_4;
-            case I_3GPP: return C_3GPP;
-            case I_WEBM: return C_WEBM;
-            case I_M4A: return C_M4A;
-            case I_WEBMA: return C_WEBMA;
-            default: Log.e(TAG, "format not known: " +
-                    Integer.toString(id) + "call the programmer he messed it up.");
-        }
-        return "";
-    }
+    public VideoInfo() {}

-    public static String getMimeById(int id) {
-        switch(id) {
-            case I_MPEG_4: return M_MPEG_4;
-            case I_3GPP: return M_3GPP;
-            case I_WEBM: return M_WEBM;
-            case I_M4A: return M_M4A;
-            case I_WEBMA: return M_WEBMA;
-            default: Log.e(TAG, "format not known: " +
-                    Integer.toString(id) + "call the programmer he messed it up.");
+
+    /**Creates a new VideoInfo object from an existing AbstractVideoInfo.
+     * All the shared properties are copied to the new VideoInfo.*/
+    @SuppressWarnings("WeakerAccess")
+    public VideoInfo(AbstractVideoInfo avi) {
+        this.id = avi.id;
+        this.title = avi.title;
+        this.uploader = avi.uploader;
+        this.thumbnail_url = avi.thumbnail_url;
+        this.thumbnail = avi.thumbnail;
+        this.webpage_url = avi.webpage_url;
+        this.upload_date = avi.upload_date;
+        this.upload_date = avi.upload_date;
+        this.view_count = avi.view_count;
+
+        //todo: better than this
+        if(avi instanceof VideoPreviewInfo) {//shitty String to convert code
+            String dur = ((VideoPreviewInfo)avi).duration;
+            int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
+            int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
+            this.duration = (minutes*60)+seconds;
        }
-        return "";
    }

    public static class VideoStream {
-        public VideoStream(String url, int format, String res) {
-            this.url = url; this.format = format; resolution = res;
-        }
        public String url = "";     //url of the stream
        public int format = -1;
        public String resolution = "";
+
+        public VideoStream(String url, int format, String res) {
+            this.url = url; this.format = format; resolution = res;
+        }
    }

+    @SuppressWarnings("unused")
    public static class AudioStream {
-        public AudioStream(String url, int format, int bandWidth, int samplingRate) {
-            this.url = url; this.format = format;
-            this.bandWidth = bandWidth; this.samplingRate = samplingRate;
-        }
        public String url = "";
        public int format = -1;
-        public int bandWidth = -1;
+        public int bandwidth = -1;
        public int samplingRate = -1;

+        public AudioStream(String url, int format, int bandwidth, int samplingRate) {
+            this.url = url; this.format = format;
+            this.bandwidth = bandwidth; this.samplingRate = samplingRate;
+        }
    }
-
-    public String id = "";
-    public String uploader = "";
-    public String upload_date = "";
-    public String uploader_thumbnail_url = "";
-    public Bitmap uploader_thumbnail = null;
-    public String title = "";
-    public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
-    public String description = "";
-    public int duration = -1;
-    public int age_limit = 0;
-    public String webpage_url = "";
-    public String view_count = "";
-    public String like_count = "";
-    public String dislike_count = "";
-    public String average_rating = "";
-    public VideoStream[] videoStreams = null;
-    public AudioStream[] audioStreams = null;
-    public VideoInfoItem nextVideo = null;
-    public Vector<VideoInfoItem> relatedVideos = null;
-    public int videoAvailableStatus = VIDEO_AVAILABLE;
 }
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItem.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItem.java
@@ -1,34 +0,0 @@
-package org.schabi.newpipe;
-
-import android.graphics.Bitmap;
-
-/**
- * Created by Christian Schabesberger on 26.08.15.
- *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoInfoItem.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 VideoInfoItem {
-    public String id = "";
-    public String title = "";
-    public String uploader = "";
-    public String duration = "";
-    public String thumbnail_url = "";
-    public Bitmap thumbnail = null;
-    public String webpage_url = "";
-    public String upload_date = "";
-}
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
@@ -0,0 +1,74 @@
+package org.schabi.newpipe;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+/**
+ * Created by Christian Schabesberger on 24.10.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * VideoInfoItemViewCreator.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/>.
+ */
+
+class VideoInfoItemViewCreator {
+    private final LayoutInflater inflater;
+
+    public VideoInfoItemViewCreator(LayoutInflater inflater) {
+        this.inflater = inflater;
+    }
+
+    public View getViewByVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info) {
+        ViewHolder holder;
+        if(convertView == null) {
+            convertView = inflater.inflate(R.layout.video_item, parent, false);
+            holder = new ViewHolder();
+            holder.itemThumbnailView = (ImageView) convertView.findViewById(R.id.itemThumbnailView);
+            holder.itemVideoTitleView = (TextView) convertView.findViewById(R.id.itemVideoTitleView);
+            holder.itemUploaderView = (TextView) convertView.findViewById(R.id.itemUploaderView);
+            holder.itemDurationView = (TextView) convertView.findViewById(R.id.itemDurationView);
+            holder.itemUploadDateView = (TextView) convertView.findViewById(R.id.itemUploadDateView);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+
+        if(info.thumbnail == null) {
+            holder.itemThumbnailView.setImageResource(R.drawable.dummy_thumbnail);
+        } else {
+            holder.itemThumbnailView.setImageBitmap(info.thumbnail);
+        }
+        holder.itemVideoTitleView.setText(info.title);
+        holder.itemUploaderView.setText(info.uploader);
+        holder.itemDurationView.setText(info.duration);
+        if(!info.upload_date.isEmpty()) {
+            holder.itemUploadDateView.setText(info.upload_date);
+        } else {
+            //tweak if necessary: This is a hack to prevent having white space in the layout :P
+            holder.itemUploadDateView.setText(String.format("%d", info.view_count));
+        }
+
+        return convertView;
+    }
+
+    private class ViewHolder {
+        public ImageView itemThumbnailView;
+        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView;
+    }
+
+}
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
@@ -1,22 +1,17 @@
 package org.schabi.newpipe;

-import android.content.ContentProviderOperation;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
-import android.util.DisplayMetrics;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.WindowManager;
+import android.widget.Toast;

-import org.schabi.newpipe.youtube.YoutubeExtractor;
+import org.schabi.newpipe.services.ServiceList;
+import org.schabi.newpipe.services.StreamingService;


 /**
@@ -41,17 +36,23 @@ public class VideoItemDetailActivity extends AppCompatActivity {

    private static final String TAG = VideoItemDetailActivity.class.toString();

+    private VideoItemDetailFragment fragment;
+
    private String videoUrl;
    private int currentStreamingService = -1;
-    private boolean isLandscape;

    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_videoitem_detail);

        // Show the Up button in the action bar.
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        ActionBarHandler.getHandler().setupNavMenu(this);
+        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
@@ -69,22 +70,23 @@ public class VideoItemDetailActivity extends AppCompatActivity {
            if (getIntent().getData() != null) {
                videoUrl = getIntent().getData().toString();
                StreamingService[] serviceList = ServiceList.getServices();
-                Extractor extractor = null;
+                //VideoExtractor videoExtractor = null;
                for (int i = 0; i < serviceList.length; i++) {
                    if (serviceList[i].acceptUrl(videoUrl)) {
                        arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, i);
-                        try {
-                            currentStreamingService = i;
-                            extractor = (Extractor) ServiceList.getService(i)
-                                    .getExtractorClass().newInstance();
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+                        currentStreamingService = i;
+                        //videoExtractor = ServiceList.getService(i).getExtractorInstance();
                        break;
                    }
                }
-                arguments.putString(VideoItemDetailFragment.VIDEO_URL,
-                        extractor.getVideoUrl(extractor.getVideoId(videoUrl)));
+                if(currentStreamingService == -1) {
+                    Toast.makeText(this, R.string.urlNotSupportedText, Toast.LENGTH_LONG)
+                            .show();
+                }
+                //arguments.putString(VideoItemDetailFragment.VIDEO_URL,
+                //        videoExtractor.getVideoUrl(videoExtractor.getVideoId(videoUrl)));//cleans URL
+                arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
+
                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
                        PreferenceManager.getDefaultSharedPreferences(this)
                                .getBoolean(getString(R.string.autoPlayThroughIntent), false));
@@ -95,14 +97,27 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
            }
-            // Create the detail fragment and add it to the activity
-            // using a fragment transaction.
-            VideoItemDetailFragment fragment = new VideoItemDetailFragment();
-            fragment.setArguments(arguments);
-            getSupportFragmentManager().beginTransaction()
-                    .add(R.id.videoitem_detail_container, fragment)
-                    .commit();
+
+        } else {
+            videoUrl = savedInstanceState.getString(VideoItemDetailFragment.VIDEO_URL);
+            currentStreamingService = savedInstanceState.getInt(VideoItemDetailFragment.STREAMING_SERVICE);
+            arguments = savedInstanceState;
        }
+
+        // Create the detail fragment and add it to the activity
+        // using a fragment transaction.
+        fragment = new VideoItemDetailFragment();
+        fragment.setArguments(arguments);
+        getSupportFragmentManager().beginTransaction()
+                .add(R.id.videoitem_detail_container, fragment)
+                .commit();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
+        outState.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingService);
+        outState.putBoolean(VideoItemDetailFragment.AUTO_PLAY, false);
    }

    @Override
@@ -113,25 +128,23 @@ public class VideoItemDetailActivity extends AppCompatActivity {
            // 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
-            //
+
            Intent intent = new Intent(this, VideoItemListActivity.class);
            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
            NavUtils.navigateUpTo(this, intent);
            return true;
        } else {
-            ActionBarHandler.getHandler().onItemSelected(item, this);
+            return fragment.onOptionsItemSelected(item) ||
+                    super.onOptionsItemSelected(item);
        }
-        return super.onOptionsItemSelected(item);
    }

    @Override
-    public boolean onCreatePanelMenu(int featured, Menu menu) {
-        super.onCreatePanelMenu(featured, menu);
-        MenuInflater inflater = getMenuInflater();
-        ActionBarHandler.getHandler().setupMenu(menu, inflater, this);
-
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        fragment.onCreateOptionsMenu(menu, getMenuInflater());
        return true;
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -2,22 +2,20 @@ package org.schabi.newpipe;

 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
-import android.preference.PreferenceManager;
+import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
-import android.util.DisplayMetrics;
+import android.support.v7.widget.SearchView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
-import android.support.v7.widget.SearchView;
-import android.widget.ImageView;
+
+import java.util.ArrayList;
+
+import org.schabi.newpipe.services.ServiceList;

 /**
 * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@@ -41,15 +39,27 @@ public class VideoItemListActivity extends AppCompatActivity
        implements VideoItemListFragment.Callbacks {

    private static final String TAG = VideoItemListFragment.class.toString();
+
+    // arguments to give to this activity
+    public static final String VIDEO_INFO_ITEMS = "video_info_items";
+
+    // savedInstanceBundle arguments
    private static final String QUERY = "query";
    private static final String STREAMING_SERVICE = "streaming_service";

+    // activity modes
+    private static final int SEARCH_MODE = 0;
+    private static final int PRESENT_VIDEOS_MODE = 1;
+
+    private int mode = SEARCH_MODE;
    private int currentStreamingServiceId = -1;
    private String searchQuery = "";

    private VideoItemListFragment listFragment;
+    private VideoItemDetailFragment videoFragment = null;
+    private Menu menu = null;

-    public class SearchVideoQueryListener implements SearchView.OnQueryTextListener {
+    private class SearchVideoQueryListener implements SearchView.OnQueryTextListener {

        @Override
        public boolean onQueryTextSubmit(String query) {
@@ -60,15 +70,20 @@ public class VideoItemListActivity extends AppCompatActivity
                // hide virtual keyboard
                InputMethodManager inputManager =
                        (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                inputManager.hideSoftInputFromWindow(
-                        getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+                try {
+                    //noinspection ConstantConditions
+                    inputManager.hideSoftInputFromWindow(
+                            getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+                } catch(NullPointerException e) {
+                    Log.e(TAG, "Could not get widget with focus");
+                    e.printStackTrace();
+                }
                // clear focus
                // 1. to not open up the keyboard after switching back to this
                // 2. It's a workaround to a seeming bug by the Android OS it self, causing
                //    onQueryTextSubmit to trigger twice when focus is not cleared.
                // See: http://stackoverflow.com/questions/17874951/searchview-onquerytextsubmit-runs-twice-while-i-pressed-once
                getCurrentFocus().clearFocus();
-                hideWatermark();
            } catch(Exception e) {
                e.printStackTrace();
            }
@@ -82,13 +97,6 @@ public class VideoItemListActivity extends AppCompatActivity

    }

-    private void hideWatermark() {
-        ImageView waterMark = (ImageView) findViewById(R.id.list_view_watermark);
-        if(waterMark != null) {
-            waterMark.setVisibility(View.GONE);
-        }
-    }
-
    /**
     * Whether or not the activity is in two-pane mode, i.e. running on a tablet
     * device.
@@ -100,21 +108,39 @@ public class VideoItemListActivity extends AppCompatActivity
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_videoitem_list);

-        listFragment = (VideoItemListFragment)
-                getSupportFragmentManager().findFragmentById(R.id.videoitem_list);
-
-        //-------- remove this line when multiservice support is implemented ----------
+        //------ todo: remove this line when multiservice support is implemented ------
        currentStreamingServiceId = ServiceList.getIdOfService("Youtube");
        //-----------------------------------------------------------------------------
-        VideoItemListFragment listFragment = (VideoItemListFragment) getSupportFragmentManager()
+
+        listFragment = (VideoItemListFragment) getSupportFragmentManager()
                .findFragmentById(R.id.videoitem_list);
        listFragment.setStreamingService(ServiceList.getService(currentStreamingServiceId));

-        if(savedInstanceState != null) {
+        Bundle arguments = getIntent().getExtras();
+
+        if(arguments != null) {
+            //Parcelable[] p = arguments.getParcelableArray(VIDEO_INFO_ITEMS);
+            ArrayList<VideoPreviewInfo> p = arguments.getParcelableArrayList(VIDEO_INFO_ITEMS);
+            if(p != null) {
+                mode = PRESENT_VIDEOS_MODE;
+                try {
+                    //noinspection ConstantConditions
+                    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+                } catch (NullPointerException e) {
+                    Log.e(TAG, "Could not get SupportActionBar");
+                    e.printStackTrace();
+                }
+
+                listFragment.present(p);
+            }
+        }
+
+
+        if(savedInstanceState != null
+                && mode != PRESENT_VIDEOS_MODE) {
            searchQuery = savedInstanceState.getString(QUERY);
            currentStreamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
            if(!searchQuery.isEmpty()) {
-                hideWatermark();
                listFragment.search(searchQuery);
            }
        }
@@ -134,18 +160,18 @@ public class VideoItemListActivity extends AppCompatActivity
                    .setActivateOnItemClick(true);

            SearchView searchView = (SearchView)findViewById(R.id.searchViewTablet);
-            // Somehow the seticonifiedbydefault property set by the layout xml is not working on
-            // the support version on SearchView, so it needs to be set programmatically.
-            searchView.setIconifiedByDefault(false);
-            searchView.setIconified(false);
-            searchView.setOnQueryTextListener(new SearchVideoQueryListener());
-
-            ActionBarHandler.getHandler().setupNavMenu(this);
-
+            if(mode != PRESENT_VIDEOS_MODE) {
+                // Somehow the seticonifiedbydefault property set by the layout xml is not working on
+                // the support version on SearchView, so it needs to be set programmatically.
+                searchView.setIconifiedByDefault(false);
+                searchView.setIconified(false);
+                searchView.setOnQueryTextListener(new SearchVideoQueryListener());
+            } else {
+                searchView.setVisibility(View.GONE);
+            }
        }

        SettingsActivity.initSettings(this);
-
    }

    /**
@@ -167,10 +193,17 @@ public class VideoItemListActivity extends AppCompatActivity
            arguments.putString(VideoItemDetailFragment.ARG_ITEM_ID, id);
            arguments.putString(VideoItemDetailFragment.VIDEO_URL, webpage_url);
            arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingServiceId);
-            VideoItemDetailFragment fragment = new VideoItemDetailFragment();
-            fragment.setArguments(arguments);
+            videoFragment = new VideoItemDetailFragment();
+            videoFragment.setArguments(arguments);
+            videoFragment.setOnInvokeCreateOptionsMenuListener(new VideoItemDetailFragment.OnInvokeCreateOptionsMenuListener() {
+                @Override
+                public void createOptionsMenu() {
+                    menu.clear();
+                    onCreateOptionsMenu(menu);
+                }
+            });
            getSupportFragmentManager().beginTransaction()
-                    .replace(R.id.videoitem_detail_container, fragment)
+                    .replace(R.id.videoitem_detail_container, videoFragment)
                    .commit();
        } else {
            // In single-pane mode, simply start the detail activity
@@ -184,10 +217,12 @@ public class VideoItemListActivity extends AppCompatActivity
    }


-    public boolean onCreatePanelMenu(int featured, Menu menu) {
-        super.onCreatePanelMenu(featured, menu);
-        if(findViewById(R.id.videoitem_detail_container) == null) {
-            MenuInflater inflater = getMenuInflater();
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        this.menu = menu;
+        MenuInflater inflater = getMenuInflater();
+        if(mode != PRESENT_VIDEOS_MODE &&
+                findViewById(R.id.videoitem_detail_container) == null) {
            inflater.inflate(R.menu.videoitem_list, menu);
            MenuItem searchItem = menu.findItem(R.id.action_search);
            SearchView searchView = (SearchView) searchItem.getActionView();
@@ -195,9 +230,10 @@ public class VideoItemListActivity extends AppCompatActivity
            searchView.setOnQueryTextListener(
                    new SearchVideoQueryListener());

+        } else if (videoFragment != null){
+            videoFragment.onCreateOptionsMenu(menu, inflater);
        } else {
-            MenuInflater inflater = getMenuInflater();
-            ActionBarHandler.getHandler().setupMenu(menu, inflater, this);
+            inflater.inflate(R.menu.videoitem_two_pannel, menu);
        }

        return true;
@@ -206,14 +242,23 @@ public class VideoItemListActivity extends AppCompatActivity
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        int id = item.getItemId();
-        if(id == R.id.action_settings) {
-            Intent intent = new Intent(this, SettingsActivity.class);
-            startActivity(intent);
-        } else {
-            ActionBarHandler.getHandler().onItemSelected(item, this);
-            return super.onOptionsItemSelected(item);
+
+        switch(id) {
+            case android.R.id.home: {
+                Intent intent = new Intent(this, VideoItemListActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                NavUtils.navigateUpTo(this, intent);
+                return true;
+            }
+            case R.id.action_settings: {
+                Intent intent = new Intent(this, SettingsActivity.class);
+                startActivity(intent);
+                return true;
+            }
+            default:
+                return videoFragment.onOptionsItemSelected(item) ||
+                    super.onOptionsItemSelected(item);
        }
-        return true;
    }

    @Override
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -2,18 +2,18 @@ package org.schabi.newpipe;

 import android.content.Context;
 import android.graphics.Bitmap;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.ImageView;
 import android.widget.ListView;
-import android.widget.TextView;

+import java.util.List;
 import java.util.Vector;

 /**
- * Created by the-scrabi on 11.08.15.
+ * Created by Christian Schabesberger on 11.08.15.
 *
 * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
 * VideoListAdapter.java is part of NewPipe.
@@ -32,22 +32,22 @@ import java.util.Vector;
 * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
 */

-public class VideoListAdapter extends BaseAdapter {
-
-    private static final String TAG = VideoListAdapter.class.toString();
-    private LayoutInflater inflater;
-    private Vector<VideoInfoItem> videoList = new Vector<>();
+class VideoListAdapter extends BaseAdapter {
+    private final Context context;
+    private final VideoInfoItemViewCreator viewCreator;
+    private Vector<VideoPreviewInfo> videoList = new Vector<>();
    private Vector<Boolean> downloadedThumbnailList = new Vector<>();
-    VideoItemListFragment videoListFragment;
-    ListView listView;
+    private final ListView listView;

    public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) {
-        inflater = LayoutInflater.from(context);
-        this.videoListFragment = videoListFragment;
+        viewCreator = new VideoInfoItemViewCreator(LayoutInflater.from(context));
        this.listView = videoListFragment.getListView();
+        this.listView.setDivider(null);
+        this.listView.setDividerHeight(0);
+        this.context = context;
    }

-    public void addVideoList(Vector<VideoInfoItem> videos) {
+    public void addVideoList(List<VideoPreviewInfo> videos) {
        videoList.addAll(videos);
        for(int i = 0; i < videos.size(); i++) {
            downloadedThumbnailList.add(false);
@@ -61,12 +61,12 @@ public class VideoListAdapter extends BaseAdapter {
        notifyDataSetChanged();
    }

-    public Vector<VideoInfoItem> getVideoList() {
+    public Vector<VideoPreviewInfo> getVideoList() {
        return videoList;
    }

-    public void updateDownloadedThumbnailList(int index, boolean val) {
-        downloadedThumbnailList.set(index, val);
+    public void updateDownloadedThumbnailList(int index) {
+        downloadedThumbnailList.set(index, true);
    }

    public Vector<Boolean> getDownloadedThumbnailList() {
@@ -96,42 +96,14 @@ public class VideoListAdapter extends BaseAdapter {

    @Override
    public View getView(int position, View convertView, ViewGroup parent) {
-        ViewHolder holder;
-        if(convertView == null) {
-            convertView = inflater.inflate(R.layout.video_item, parent, false);
-            holder = new ViewHolder();
-            holder.itemThumbnailView = (ImageView) convertView.findViewById(R.id.itemThumbnailView);
-            holder.itemVideoTitleView = (TextView) convertView.findViewById(R.id.itemVideoTitleView);
-            holder.itemUploaderView = (TextView) convertView.findViewById(R.id.itemUploaderView);
-            holder.itemDurationView = (TextView) convertView.findViewById(R.id.itemDurationView);
-            holder.itemUploadDateView = (TextView) convertView.findViewById(R.id.itemUploadDateView);
-            convertView.setTag(holder);
-        } else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-
-        final Context context = parent.getContext();
-        if(videoList.get(position).thumbnail == null) {
-            holder.itemThumbnailView.setImageResource(R.drawable.dummi_thumbnail);
-        } else {
-            holder.itemThumbnailView.setImageBitmap(videoList.get(position).thumbnail);
-        }
-        holder.itemVideoTitleView.setText(videoList.get(position).title);
-        holder.itemUploaderView.setText(videoList.get(position).uploader);
-        holder.itemDurationView.setText(videoList.get(position).duration);
-        holder.itemUploadDateView.setText(videoList.get(position).upload_date);
+        convertView = viewCreator.getViewByVideoInfoItem(convertView, parent, videoList.get(position));

        if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(context.getResources().getColor(R.color.primaryColorYoutube));
+            convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.primaryColorYoutube));
        } else {
            convertView.setBackgroundColor(0);
        }

        return convertView;
    }
-
-    private class ViewHolder {
-        public ImageView itemThumbnailView;
-        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView;
-    }
 }
--- a/Show More
+++ b/Show More