Merge pull request #45 from ata2001/master

Update hungarian translation
2026-01-13 18:22:41 +00:00 · 2015-09-25 23:33:01 +02:00 · 2015-09-26 00:05:54 +02:00 · 2015-09-25 14:17:43 +02:00 · 2015-09-25 07:43:46 +02:00 · 2015-09-25 07:42:41 +02:00
51 changed files with 1589 additions and 426 deletions
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 NewPipe
 -------

-version 0.3
-

 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.

--- a/app/app.iml
+++ b/app/app.iml
@@ -36,13 +36,13 @@
      <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/generated/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/generated/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" />
@@ -71,8 +71,9 @@
      <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/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
+      <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" />
@@ -88,12 +89,13 @@
      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <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-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.1" 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="appcompat-v7-22.2.1" 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
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"

    defaultConfig {
        applicationId "org.schabi.newpipe"
-        minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 1
-        versionName "0.3"
+        minSdkVersion 15
+        targetSdkVersion 23
+        versionCode 4
+        versionName "0.4.1"
    }
    buildTypes {
        release {
@@ -21,8 +21,9 @@ android {

 dependencies {
    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile 'com.android.support:support-v4:22.2.1'
+    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.android.support:support-v4:23.0.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
@@ -55,6 +55,14 @@
                    android:host="m.youtube.com"
                    android:scheme="https"
                    android:pathPrefix="/watch"/>
+                <data
+                    android:host="youtu.be"
+                    android:scheme="https"
+                    android:pathPrefix="/"/>
+                <data
+                    android:host="youtu.be"
+                    android:scheme="http"
+                    android:pathPrefix="/"/>
            </intent-filter>
        </activity>
        <activity android:name=".PlayVideoActivity"
--- a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
@@ -4,7 +4,10 @@ import android.app.DownloadManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
+import android.os.Bundle;
+import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
@@ -40,15 +43,20 @@ import java.io.File;

 public class ActionBarHandler {
    private static final String TAG = ActionBarHandler.class.toString();
+    private static final String KORE_PACKET = "org.xbmc.kore";
+
    private static ActionBarHandler handler = null;

    private Context context = null;
    private String webisteUrl = "";
    private AppCompatActivity activity;
-    private VideoInfo.Stream[] streams = null;
+    private VideoInfo.VideoStream[] videoStreams = null;
+    private VideoInfo.AudioStream audioStream = null;
    private int selectedStream = -1;
    private String videoTitle = "";

+    SharedPreferences defaultPreferences = null;
+
    public static ActionBarHandler getHandler() {
        if(handler == null) {
            handler = new ActionBarHandler();
@@ -69,19 +77,50 @@ public class ActionBarHandler {
        activity.getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
    }

-    public void setStreams(VideoInfo.Stream[] streams) {
-        this.streams = streams;
+    public void setStreams(VideoInfo.VideoStream[] videoStreams, VideoInfo.AudioStream[] audioStreams) {
+        this.videoStreams = videoStreams;
        selectedStream = 0;
-        String[] itemArray = new String[streams.length];
-        for(int i = 0; i < streams.length; i++) {
-            itemArray[i] = streams[i].format + " " + streams[i].resolution;
+        String[] itemArray = new String[videoStreams.length];
+        String defaultResolution = defaultPreferences
+                .getString(context.getString(R.string.defaultResolutionPreference),
+                        context.getString(R.string.defaultResolutionListItem));
+        int defaultResolutionPos = 0;
+
+        for(int i = 0; i < videoStreams.length; i++) {
+            itemArray[i] = VideoInfo.getNameById(videoStreams[i].format) + " " + videoStreams[i].resolution;
+            if(defaultResolution.equals(videoStreams[i].resolution)) {
+                defaultResolutionPos = i;
+            }
        }

        ArrayAdapter<String> itemAdapter = new ArrayAdapter<String>(activity.getBaseContext(),
                android.R.layout.simple_spinner_dropdown_item, itemArray);
        if(activity != null) {
-            activity.getSupportActionBar().setListNavigationCallbacks(itemAdapter
+            ActionBar ab = activity.getSupportActionBar();
+            ab.setListNavigationCallbacks(itemAdapter
                    ,new ForamatItemSelectListener());
+            ab.setSelectedNavigationItem(defaultResolutionPos);
+        }
+
+        // set audioStream
+        audioStream = null;
+        String preferedFormat = PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(context.getString(R.string.defaultAudioFormatPreference), "webm");
+        if(preferedFormat.equals("webm")) {
+            for(VideoInfo.AudioStream s : audioStreams) {
+                if(s.format == VideoInfo.I_WEBMA) {
+                    audioStream = s;
+                }
+            }
+        } else if(preferedFormat.equals("m4a")){
+            for(VideoInfo.AudioStream s : audioStreams) {
+                Log.d(TAG, VideoInfo.getMimeById(s.format) + " : " + Integer.toString(s.bandWidth));
+                if(s.format == VideoInfo.I_M4A &&
+                        (audioStream == null || audioStream.bandWidth > s.bandWidth)) {
+                    audioStream = s;
+                    Log.d(TAG, "last choosen");
+                }
+            }
        }
    }

@@ -89,20 +128,26 @@ public class ActionBarHandler {
        selectedStream = i;
    }

-    public boolean setupMenu(Menu menu, MenuInflater inflater, Context constext) {
+    public boolean setupMenu(Menu menu, MenuInflater inflater, Context context) {
        this.context = context;
        // CAUTION set item properties programmatically otherwise it would not be accepted by
        // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);

+        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+
        inflater.inflate(R.menu.videoitem_detail, menu);
        MenuItem playItem = menu.findItem(R.id.menu_item_play);
        MenuItem shareItem = menu.findItem(R.id.menu_item_share);
+        MenuItem castItem = menu.findItem(R.id.action_play_with_kodi);

        MenuItemCompat.setShowAsAction(playItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS
                | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
        MenuItemCompat.setShowAsAction(shareItem, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM
                | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);

+        castItem.setVisible(defaultPreferences
+                .getBoolean(context.getString(R.string.showPlayWidthKodiPreference), false));
+
        return true;
    }

@@ -133,6 +178,13 @@ public class ActionBarHandler {
                Intent intent = new Intent(context, SettingsActivity.class);
                context.startActivity(intent);
            }
+            break;
+            case R.id.action_play_with_kodi:
+                playWithKodi();
+                break;
+            case R.id.menu_item_play_audio:
+                playAudio();
+                break;
            default:
                Log.e(TAG, "Menu Item not known");
        }
@@ -148,12 +200,18 @@ public class ActionBarHandler {
        // ----------- THE MAGIC MOMENT ---------------
        if(!videoTitle.isEmpty()) {
            if (PreferenceManager.getDefaultSharedPreferences(context)
-                    .getBoolean("use_external_player", false)) {
+                    .getBoolean(context.getString(R.string.useExternalPlayer), false)) {
+
+                // External Player
                Intent intent = new Intent();
                try {
                    intent.setAction(Intent.ACTION_VIEW);
-                    intent.setDataAndType(Uri.parse(streams[selectedStream].url),
-                            "video/" + streams[selectedStream].format);
+
+                    intent.setDataAndType(Uri.parse(videoStreams[selectedStream].url),
+                            VideoInfo.getMimeById(videoStreams[selectedStream].format));
+                    intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
+                    intent.putExtra("title", videoTitle);
+
                    context.startActivity(intent);      // HERE !!!
                } catch (Exception e) {
                    e.printStackTrace();
@@ -177,9 +235,10 @@ public class ActionBarHandler {
                    builder.create().show();
                }
            } else {
+                // Internal Player
                Intent intent = new Intent(context, PlayVideoActivity.class);
                intent.putExtra(PlayVideoActivity.VIDEO_TITLE, videoTitle);
-                intent.putExtra(PlayVideoActivity.STREAM_URL, streams[selectedStream].url);
+                intent.putExtra(PlayVideoActivity.STREAM_URL, videoStreams[selectedStream].url);
                intent.putExtra(PlayVideoActivity.VIDEO_URL, webisteUrl);
                context.startActivity(intent);
            }
@@ -190,30 +249,17 @@ public class ActionBarHandler {
    public void downloadVideo() {
        Log.d(TAG, "bla");
        if(!videoTitle.isEmpty()) {
-            String suffix = "";
-            switch (streams[selectedStream].format) {
-                case VideoInfo.F_WEBM:
-                    suffix = ".webm";
-                    break;
-                case VideoInfo.F_MPEG_4:
-                    suffix = ".mp4";
-                    break;
-                case VideoInfo.F_3GPP:
-                    suffix = ".3gp";
-                    break;
-            }
-            DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-            DownloadManager.Request request = new DownloadManager.Request(
-                    Uri.parse(streams[selectedStream].url));
-            request.setDestinationUri(Uri.fromFile(new File(
-                            PreferenceManager.getDefaultSharedPreferences(context)
-                            .getString("download_path_preference", "/storage/emulated/0/NewPipe")
-                            + "/" + videoTitle + suffix)));
-            try {
-                dm.enqueue(request);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            String videoSuffix = "." + VideoInfo.getSuffixById(videoStreams[selectedStream].format);
+            String audioSuffix = "." + VideoInfo.getSuffixById(audioStream.format);
+            Bundle args = new Bundle();
+            args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
+            args.putString(DownloadDialog.FILE_SUFFIX_AUDIO, audioSuffix);
+            args.putString(DownloadDialog.TITLE, videoTitle);
+            args.putString(DownloadDialog.VIDEO_URL, videoStreams[selectedStream].url);
+            args.putString(DownloadDialog.AUDIO_URL, audioStream.url);
+            DownloadDialog downloadDialog = new DownloadDialog();
+            downloadDialog.setArguments(args);
+            downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
        }
    }

@@ -226,4 +272,67 @@ public class ActionBarHandler {
            context.startActivity(Intent.createChooser(intent, context.getString(R.string.chooseBrowser)));
        }
    }
+
+    public void playWithKodi() {
+        if(!videoTitle.isEmpty()) {
+            try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setPackage(KORE_PACKET);
+                intent.setData(Uri.parse(webisteUrl.replace("https", "http")));
+                context.startActivity(intent);
+            } catch (Exception e) {
+                e.printStackTrace();
+                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                builder.setMessage(R.string.koreNotFound)
+                        .setPositiveButton(R.string.installeKore, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Intent intent = new Intent();
+                                intent.setAction(Intent.ACTION_VIEW);
+                                intent.setData(Uri.parse(context.getString(R.string.fdroidKoreUrl)));
+                                context.startActivity(intent);
+                            }
+                        })
+                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+
+                            }
+                        });
+                builder.create().show();
+            }
+        }
+    }
+
+    public void playAudio() {
+        Intent intent = new Intent();
+        try {
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.setDataAndType(Uri.parse(audioStream.url),
+                    VideoInfo.getMimeById(audioStream.format));
+            intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
+            intent.putExtra("title", videoTitle);
+            context.startActivity(intent);      // HERE !!!
+        } catch (Exception e) {
+            e.printStackTrace();
+            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setMessage(R.string.noPlayerFound)
+                    .setPositiveButton(R.string.installStreamPlayer, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            Intent intent = new Intent();
+                            intent.setAction(Intent.ACTION_VIEW);
+                            intent.setData(Uri.parse(context.getString(R.string.fdroidVLCurl)));
+                            context.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();
+        }
+    }
 }
--- a/app/src/main/java/org/schabi/newpipe/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/DownloadDialog.java
@@ -0,0 +1,89 @@
+package org.schabi.newpipe;
+
+import android.app.Dialog;
+import android.app.DownloadManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
+import android.util.Log;
+
+import java.io.File;
+
+/**
+ * Created by Christian Schabesberger on 21.09.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * DownloadDialog.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 DownloadDialog extends DialogFragment {
+    private static final String TAG = DialogFragment.class.getName();
+
+    public static final String TITLE = "name";
+    public static final String FILE_SUFFIX_AUDIO = "file_suffix_audio";
+    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;
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        arguments = getArguments();
+        super.onCreateDialog(savedInstanceState);
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle(R.string.downloadDialogTitle)
+                .setItems(R.array.downloadOptions, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        Context context = getActivity();
+                        SharedPreferences defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+                        String suffix = "";
+                        String title = arguments.getString(TITLE);
+                        String url = "";
+                        switch(which) {
+                            case 0:     // Video
+                                suffix = arguments.getString(FILE_SUFFIX_VIDEO);
+                                url = arguments.getString(VIDEO_URL);
+                                break;
+                            case 1:
+                                suffix = arguments.getString(FILE_SUFFIX_AUDIO);
+                                url = arguments.getString(AUDIO_URL);
+                                break;
+                            default:
+                                Log.d(TAG, "lolz");
+                        }
+                        DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+                        DownloadManager.Request request = new DownloadManager.Request(
+                                Uri.parse(url));
+                        request.setDestinationUri(Uri.fromFile(new File(
+                                defaultPreferences.getString("download_path_preference", "/storage/emulated/0/NewPipe")
+                                        + "/" + title + suffix)));
+                        try {
+                            dm.enqueue(request);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+        return builder.create();
+    }
+
+}
--- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
@@ -1,13 +1,19 @@
 package org.schabi.newpipe;

+import android.content.Context;
 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;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
 import android.view.Menu;
@@ -17,8 +23,11 @@ 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;

 /**
@@ -41,6 +50,8 @@ import android.widget.VideoView;

 public class PlayVideoActivity extends AppCompatActivity {

+    //// TODO: 11.09.15 add "choose stream" menu 
+    
    private static final String TAG = PlayVideoActivity.class.toString();
    public static final String VIDEO_URL = "video_url";
    public static final String STREAM_URL = "stream_url";
@@ -48,6 +59,7 @@ public class PlayVideoActivity extends AppCompatActivity {
    private static final String POSITION = "position";

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

    private String videoUrl = "";

@@ -59,6 +71,11 @@ public class PlayVideoActivity extends AppCompatActivity {
    private View decorView;
    private boolean uiIsHidden = false;
    private static long lastUiShowTime = 0;
+    private boolean isLandscape = true;
+    private boolean hasSoftKeys = false;
+
+    private SharedPreferences prefs;
+    private static final String PREF_IS_LANDSCAPE = "is_landscape";

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -66,6 +83,9 @@ public class PlayVideoActivity extends AppCompatActivity {

        setContentView(R.layout.activity_play_video);

+        isLandscape = checkIfLandscape();
+        hasSoftKeys = checkIfhasSoftKeys();
+
        actionBar = getSupportActionBar();
        actionBar.setDisplayHomeAsUpEnabled(true);
        Intent intent = getIntent();
@@ -89,6 +109,7 @@ public class PlayVideoActivity extends AppCompatActivity {
                videoView.seekTo(position);
                if (position == 0) {
                    videoView.start();
+                    showUi();
                } else {
                    videoView.pause();
                }
@@ -111,16 +132,25 @@ public class PlayVideoActivity extends AppCompatActivity {
        decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
            @Override
            public void onSystemUiVisibilityChange(int visibility) {
-                if((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
-                    uiIsHidden = false;
+                if (visibility == View.VISIBLE && uiIsHidden) {
                    showUi();
-                } else {
-                    uiIsHidden = true;
-                    hideUi();
                }
            }
        });
-        hideUi();
+
+        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) {
+            toggleOrientation();
+        }
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
    }

    @Override
@@ -132,6 +162,17 @@ public class PlayVideoActivity extends AppCompatActivity {
        return true;
    }

+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        videoView.pause();
+    }
+
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        int id = item.getItemId();
@@ -147,14 +188,7 @@ public class PlayVideoActivity extends AppCompatActivity {
                startActivity(Intent.createChooser(intent, getString(R.string.shareDialogTitle)));
                break;
            case R.id.menu_item_screen_rotation:
-                Display display = ((WindowManager) getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
-                if(display.getRotation() == Surface.ROTATION_0
-                        || display.getRotation() == Surface.ROTATION_180) {
-                    setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-                } else if(display.getRotation() == Surface.ROTATION_90
-                        || display.getRotation() == Surface.ROTATION_270) {
-                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-                }
+                toggleOrientation();
                break;
            default:
                Log.e(TAG, "Error: MenuItem not known");
@@ -164,8 +198,16 @@ public class PlayVideoActivity extends AppCompatActivity {
    }

    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
+    public void onConfigurationChanged(Configuration config) {
+        super.onConfigurationChanged(config);
+
+        if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            isLandscape = true;
+            adjustMediaControllMetrics();
+        } else if (config.orientation == Configuration.ORIENTATION_PORTRAIT){
+            isLandscape = false;
+            adjustMediaControllMetrics();
+        }
    }

    @Override
@@ -185,15 +227,15 @@ public class PlayVideoActivity extends AppCompatActivity {
    private void showUi() {
        try {
            uiIsHidden = false;
-            mediaController.show();
+            mediaController.show(100000);
            actionBar.show();
-            //decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-            //| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+            adjustMediaControllMetrics();
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
            Handler handler = new Handler();
            handler.postDelayed(new Runnable() {
                @Override
                public void run() {
-                    if ((System.currentTimeMillis() - lastUiShowTime) > HIDING_DELAY) {
+                    if ((System.currentTimeMillis() - lastUiShowTime) >= HIDING_DELAY) {
                        hideUi();
                    }
                }
@@ -208,8 +250,88 @@ public class PlayVideoActivity extends AppCompatActivity {
        uiIsHidden = true;
        actionBar.hide();
        mediaController.hide();
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        //decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
-        //| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
+        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() {
+        MediaController.LayoutParams mediaControllerLayout
+                = new MediaController.LayoutParams(MediaController.LayoutParams.MATCH_PARENT,
+                MediaController.LayoutParams.WRAP_CONTENT);
+
+        if(!hasSoftKeys) {
+            mediaControllerLayout.setMargins(20, 0, 20, 20);
+        } else {
+            int width = getNavigationBarWidth();
+            int height = getNavigationBarHeight();
+            mediaControllerLayout.setMargins(width + 20, 0, width + 20, height + 20);
+        }
+        mediaController.setLayoutParams(mediaControllerLayout);
+    }
+
+    private boolean checkIfhasSoftKeys(){
+        if(Build.VERSION.SDK_INT >= 17) {
+            return getNavigationBarHeight() != 0 || getNavigationBarWidth() != 0;
+        } else {
+            return true;
+        }
+    }
+
+    private int getNavigationBarHeight() {
+        if(Build.VERSION.SDK_INT >= 17) {
+            Display d = getWindowManager().getDefaultDisplay();
+
+            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
+            d.getRealMetrics(realDisplayMetrics);
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            d.getMetrics(displayMetrics);
+
+            int realHeight = realDisplayMetrics.heightPixels;
+            int displayHeight = displayMetrics.heightPixels;
+            return (realHeight - displayHeight);
+        } else {
+            return 50;
+        }
+    }
+
+    private int getNavigationBarWidth() {
+        if(Build.VERSION.SDK_INT >= 17) {
+            Display d = getWindowManager().getDefaultDisplay();
+
+            DisplayMetrics realDisplayMetrics = new DisplayMetrics();
+            d.getRealMetrics(realDisplayMetrics);
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            d.getMetrics(displayMetrics);
+
+            int realWidth = realDisplayMetrics.widthPixels;
+            int displayWidth = displayMetrics.widthPixels;
+            return (realWidth - displayWidth);
+        } else {
+            return 50;
+        }
+    }
+
+    public boolean checkIfLandscape() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        return displayMetrics.heightPixels < displayMetrics.widthPixels;
+    }
+
+    private void toggleOrientation() {
+        if(isLandscape)  {
+            isLandscape = false;
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        } else {
+            isLandscape = true;
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        }
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean(PREF_IS_LANDSCAPE, isLandscape);
+        editor.commit();
    }
 }
--- a/app/src/main/java/org/schabi/newpipe/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
@@ -21,28 +21,106 @@ package org.schabi.newpipe;
 */

 import android.graphics.Bitmap;
+import android.util.Log;

 import java.util.Vector;

 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";

    public static final int VIDEO_AVAILABLE = 0x00;
    public static final int VIDEO_UNAVAILABLE = 0x01;
    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;

-    public static class Stream {
-        public Stream(String u, String f, String r) {
-            url = u; format = f; resolution = r;
+    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 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.");
+        }
+        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 String format = "";
+        public int format = -1;
        public String resolution = "";
    }

+    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 samplingRate = -1;
+
+    }
+
    public String id = "";
    public String uploader = "";
    public String upload_date = "";
@@ -59,7 +137,8 @@ public class VideoInfo {
    public String like_count = "";
    public String dislike_count = "";
    public String average_rating = "";
-    public Stream[] streams = null;
+    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
@@ -30,4 +30,5 @@ public class VideoInfoItem {
    public String thumbnail_url = "";
    public Bitmap thumbnail = null;
    public String webpage_url = "";
+    public String upload_date = "";
 }
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
@@ -1,22 +1,27 @@
 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.support.v4.app.NavUtils;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.WindowManager;

 import org.schabi.newpipe.youtube.YoutubeExtractor;


 /**
 * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * ActionBarHandler.java is part of NewPipe.
+ * 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
@@ -38,12 +43,12 @@ public class VideoItemDetailActivity extends AppCompatActivity {

    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);
@@ -60,8 +65,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {

        Bundle arguments = new Bundle();
        if (savedInstanceState == null) {
-            // Create the detail fragment and add it to the activity
-            // using a fragment transaction.
+            // this means the video was called though another app
            if (getIntent().getData() != null) {
                videoUrl = getIntent().getData().toString();
                StreamingService[] serviceList = ServiceList.getServices();
@@ -81,13 +85,18 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                }
                arguments.putString(VideoItemDetailFragment.VIDEO_URL,
                        extractor.getVideoUrl(extractor.getVideoId(videoUrl)));
-
+                arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
+                        PreferenceManager.getDefaultSharedPreferences(this)
+                                .getBoolean(getString(R.string.autoPlayThroughIntent), false));
            } else {
                videoUrl = getIntent().getStringExtra(VideoItemDetailFragment.VIDEO_URL);
                currentStreamingService = getIntent().getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
                arguments.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
                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()
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -6,16 +6,22 @@ import android.graphics.BitmapFactory;
 import android.media.Image;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.GridLayout;
 import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.TextView;


@@ -52,7 +58,9 @@ public class VideoItemDetailFragment extends Fragment {
    public static final String ARG_ITEM_ID = "item_id";
    public static final String VIDEO_URL = "video_url";
    public static final String STREAMING_SERVICE = "streaming_service";
+    public static final String AUTO_PLAY = "auto_play";

+    private boolean autoPlayEnabled = false;
    private Thread extractorThread = null;

    private class ExtractorRunnable implements Runnable {
@@ -154,7 +162,12 @@ public class VideoItemDetailFragment extends Fragment {
            ImageView uploaderThumbnailView = (ImageView) a.findViewById(R.id.detailUploaderThumbnailView);
            ImageView thumbsUpPic = (ImageView) a.findViewById(R.id.detailThumbsUpImgView);
            ImageView thumbsDownPic = (ImageView) a.findViewById(R.id.detailThumbsDownImgView);
+            View textSeperationLine = a.findViewById(R.id.textSeperationLine);

+
+            if(textSeperationLine != null) {
+                textSeperationLine.setVisibility(View.VISIBLE);
+            }
            progressBar.setVisibility(View.GONE);
            videoTitleView.setVisibility(View.VISIBLE);
            uploaderView.setVisibility(View.VISIBLE);
@@ -183,19 +196,19 @@ public class VideoItemDetailFragment extends Fragment {
                    ActionBarHandler.getHandler().setVideoInfo(info.webpage_url, info.title);

                    // parse streams
-                    Vector<VideoInfo.Stream> streamsToUse = new Vector<>();
-                    for (VideoInfo.Stream i : info.streams) {
+                    Vector<VideoInfo.VideoStream> streamsToUse = new Vector<>();
+                    for (VideoInfo.VideoStream i : info.videoStreams) {
                        if (useStream(i, streamsToUse)) {
                            streamsToUse.add(i);
                        }
                    }
-                    VideoInfo.Stream[] streamList = new VideoInfo.Stream[streamsToUse.size()];
+                    VideoInfo.VideoStream[] streamList = new VideoInfo.VideoStream[streamsToUse.size()];
                    for (int i = 0; i < streamList.length; i++) {
                        streamList[i] = streamsToUse.get(i);
                    }
-                    ActionBarHandler.getHandler().setStreams(streamList);
+                    ActionBarHandler.getHandler().setStreams(streamList, info.audioStreams);
                }
-                    break;
+                break;
                case VideoInfo.VIDEO_UNAVAILABLE_GEMA:
                    thumbnailView.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.drawable.gruese_die_gema_unangebracht));
                    break;
@@ -206,14 +219,17 @@ public class VideoItemDetailFragment extends Fragment {
                    Log.e(TAG, "Video Availeble Status not known.");
            }

+            if(autoPlayEnabled) {
+                ActionBarHandler.getHandler().playVideo();
+            }
        } catch (java.lang.NullPointerException e) {
            Log.w(TAG, "updateInfo(): Fragment closed before thread ended work... or else");
            e.printStackTrace();
        }
    }

-    private boolean useStream(VideoInfo.Stream stream, Vector<VideoInfo.Stream> streams) {
-        for(VideoInfo.Stream i : streams) {
+    private boolean useStream(VideoInfo.VideoStream stream, Vector<VideoInfo.VideoStream> streams) {
+        for(VideoInfo.VideoStream i : streams) {
            if(i.resolution.equals(stream.resolution)) {
                return false;
            }
@@ -236,6 +252,7 @@ public class VideoItemDetailFragment extends Fragment {
                    getArguments().getInt(STREAMING_SERVICE));
            extractorThread = new Thread(new ExtractorRunnable(
                    getArguments().getString(VIDEO_URL), streamingService.getExtractorClass(), this));
+            autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
            extractorThread.start();
        } catch (Exception e) {
            e.printStackTrace();
@@ -246,7 +263,37 @@ public class VideoItemDetailFragment extends Fragment {
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
        View rootView = inflater.inflate(R.layout.fragment_videoitem_detail, container, false);
-
        return rootView;
    }
-}
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceBundle) {
+        super.onActivityCreated(savedInstanceBundle);
+        FloatingActionButton playVideoButton = (FloatingActionButton) getActivity().findViewById(R.id.playVideoButton);
+
+        if(PreferenceManager.getDefaultSharedPreferences(getActivity())
+                .getBoolean(getString(R.string.leftHandLayout), false) && checkIfLandscape()) {
+            RelativeLayout.LayoutParams oldLayout = (RelativeLayout.LayoutParams) playVideoButton.getLayoutParams();
+            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(
+                    RelativeLayout.LayoutParams.WRAP_CONTENT,
+                    RelativeLayout.LayoutParams.WRAP_CONTENT);
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+            layoutParams.setMargins(oldLayout.leftMargin, oldLayout.topMargin, oldLayout.rightMargin, oldLayout.rightMargin);
+            playVideoButton.setLayoutParams(layoutParams);
+        }
+
+        playVideoButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ActionBarHandler.getHandler().playVideo();
+            }
+        });
+    }
+
+    public boolean checkIfLandscape() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        return displayMetrics.heightPixels < displayMetrics.widthPixels;
+    }
+}
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -2,15 +2,19 @@ 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.v7.app.AppCompatActivity;
+import android.util.DisplayMetrics;
 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;
@@ -142,7 +146,6 @@ public class VideoItemListActivity extends AppCompatActivity

        SettingsActivity.initSettings(this);

-        // TODO: If exposing deep links into your app, handle intents here.
    }

    /**
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -13,6 +13,7 @@ import android.widget.ListView;
 import android.widget.Toast;

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


--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -104,6 +104,7 @@ public class VideoListAdapter extends BaseAdapter {
            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();
@@ -118,9 +119,10 @@ public class VideoListAdapter extends BaseAdapter {
        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);

        if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(context.getResources().getColor(R.color.actionBarColorYoutube));
+            convertView.setBackgroundColor(context.getResources().getColor(R.color.primaryColorYoutube));
        } else {
            convertView.setBackgroundColor(0);
        }
@@ -130,6 +132,6 @@ public class VideoListAdapter extends BaseAdapter {

    private class ViewHolder {
        public ImageView itemThumbnailView;
-        public TextView itemVideoTitleView, itemUploaderView, itemDurationView;
+        public TextView itemVideoTitleView, itemUploaderView, itemDurationView, itemUploadDateView;
    }
-}
+}
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
@@ -5,7 +5,9 @@ import org.schabi.newpipe.Extractor;
 import org.schabi.newpipe.VideoInfo;

 import android.util.Log;
+import android.util.Xml;

+import java.io.StringReader;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
@@ -22,6 +24,7 @@ import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Function;
 import org.mozilla.javascript.ScriptableObject;
 import org.schabi.newpipe.VideoInfoItem;
+import org.xmlpull.v1.XmlPullParser;

 /**
 * Created by Christian Schabesberger on 06.08.15.
@@ -53,21 +56,22 @@ public class YoutubeExtractor implements Extractor {
    // How ever if you are heading for a list showing all itag formats lock at
    // https://github.com/rg3/youtube-dl/issues/1687

-    public static String resolveFormat(int itag) {
+    public static int resolveFormat(int itag) {
        switch(itag) {
-            case 17: return VideoInfo.F_3GPP;
-            case 18: return VideoInfo.F_MPEG_4;
-            case 22: return VideoInfo.F_MPEG_4;
-            case 36: return VideoInfo.F_3GPP;
-            case 37: return VideoInfo.F_MPEG_4;
-            case 38: return VideoInfo.F_MPEG_4;
-            case 43: return VideoInfo.F_WEBM;
-            case 44: return VideoInfo.F_WEBM;
-            case 45: return VideoInfo.F_WEBM;
-            case 46: return VideoInfo.F_WEBM;
+            // video
+            case 17: return VideoInfo.I_3GPP;
+            case 18: return VideoInfo.I_MPEG_4;
+            case 22: return VideoInfo.I_MPEG_4;
+            case 36: return VideoInfo.I_3GPP;
+            case 37: return VideoInfo.I_MPEG_4;
+            case 38: return VideoInfo.I_MPEG_4;
+            case 43: return VideoInfo.I_WEBM;
+            case 44: return VideoInfo.I_WEBM;
+            case 45: return VideoInfo.I_WEBM;
+            case 46: return VideoInfo.I_WEBM;
            default:
                //Log.i(TAG, "Itag " + Integer.toString(itag) + " not known or not supported.");
-                return null;
+                return -1;
        }
    }

@@ -95,19 +99,32 @@ public class YoutubeExtractor implements Extractor {
    @Override
    public String getVideoId(String videoUrl) {
        try {
-            String query = (new URI(videoUrl)).getQuery();
-            String queryElements[] = query.split("&");
-            Map<String, String> queryArguments = new HashMap<>();
-            for(String e : queryElements) {
-                String[] s = e.split("=");
-                queryArguments.put(s[0], s[1]);
+            URI uri = new URI(videoUrl);
+            if(uri.getHost().contains("youtube")) {
+                String query = uri.getQuery();
+                String queryElements[] = query.split("&");
+                Map<String, String> queryArguments = new HashMap<>();
+                for (String e : queryElements) {
+                    String[] s = e.split("=");
+                    queryArguments.put(s[0], s[1]);
+                }
+                return queryArguments.get("v");
+            } else if(uri.getHost().contains("youtu.be")) {
+                // uri.getRawPath() does somehow not return the last character.
+                // so we do a workaround instead.
+                //return uri.getRawPath();
+                String url[] = videoUrl.split("/");
+                return url[url.length-1];
+            } else {
+                Log.e(TAG, "Error could not parse url: " + videoUrl);
+
            }
-            return queryArguments.get("v");
-        } catch(Exception e) {
+        }  catch(Exception e) {
            Log.e(TAG, "Error could not parse url: " + videoUrl);
            e.printStackTrace();
            return "";
        }
+        return null;
    }

    @Override
@@ -139,6 +156,7 @@ public class YoutubeExtractor implements Extractor {
        //-------------------------------------
        JSONObject playerArgs = null;
        JSONObject ytAssets = null;
+        String dashManifest = "";
        {
            Pattern p = Pattern.compile("ytplayer.config\\s*=\\s*(\\{.*?\\});");
            Matcher m = p.matcher(site);
@@ -166,13 +184,23 @@ public class YoutubeExtractor implements Extractor {
            videoInfo.duration = playerArgs.getInt("length_seconds");
            videoInfo.average_rating = playerArgs.getString("avg_rating");
            // View Count will be extracted from html
-            //videoInfo.view_count = playerArgs.getString("view_count");
+            dashManifest = playerArgs.getString("dashmpd");
+            String playerUrl = ytAssets.getString("js");
+            if(playerUrl.startsWith("//")) {
+                playerUrl = "https:" + playerUrl;
+            }
+            if(decryptoinCode.isEmpty()) {
+                decryptoinCode = loadDecryptioinCode(playerUrl);
+            }
+
+            // extract audio
+            videoInfo.audioStreams = parseDashManifest(dashManifest, decryptoinCode);

            //------------------------------------
-            // extract stream url
+            // extract video stream url
            //------------------------------------
            String encoded_url_map = playerArgs.getString("url_encoded_fmt_stream_map");
-            Vector<VideoInfo.Stream> streams = new Vector<>();
+            Vector<VideoInfo.VideoStream> videoStreams = new Vector<>();
            for(String url_data_str : encoded_url_map.split(",")) {
                Map<String, String> tags = new HashMap<>();
                for(String raw_tag : Parser.unescapeEntities(url_data_str, true).split("&")) {
@@ -183,28 +211,24 @@ public class YoutubeExtractor implements Extractor {
                int itag = Integer.parseInt(tags.get("itag"));
                String streamUrl = terrible_unescape_workaround_fuck(tags.get("url"));

-                // if video has a signature decrypt it and add it to the url
+                // if video has a signature: decrypt it and add it to the url
                if(tags.get("s") != null) {
-                    String playerUrl = ytAssets.getString("js");
-                    if(playerUrl.startsWith("//")) {
-                        playerUrl = "https:" + playerUrl;
-                    }
                    if(decryptoinCode.isEmpty()) {
                        decryptoinCode = loadDecryptioinCode(playerUrl);
                    }
-                    streamUrl = streamUrl + "&signature=" + decriptSignature(tags.get("s"), decryptoinCode);
+                    streamUrl = streamUrl + "&signature=" + decryptSignature(tags.get("s"), decryptoinCode);
                }

-                if(resolveFormat(itag) != null) {
-                    streams.add(new VideoInfo.Stream(
-                            streamUrl,   //sometimes i have no idea what im programming -.-
+                if(resolveFormat(itag) != -1) {
+                    videoStreams.add(new VideoInfo.VideoStream(
+                            streamUrl,
                            resolveFormat(itag),
                            resolveResolutionString(itag)));
                }
            }
-            videoInfo.streams = new VideoInfo.Stream[streams.size()];
-            for(int i = 0; i < streams.size(); i++) {
-                videoInfo.streams[i] = streams.get(i);
+            videoInfo.videoStreams = new VideoInfo.VideoStream[videoStreams.size()];
+            for(int i = 0; i < videoStreams.size(); i++) {
+                videoInfo.videoStreams[i] = videoStreams.get(i);
            }

        } catch (Exception e) {
@@ -295,6 +319,81 @@ public class YoutubeExtractor implements Extractor {
        return videoInfo;
    }

+    private VideoInfo.AudioStream[] parseDashManifest(String dashManifest, String decryptoinCode) {
+        if(!dashManifest.contains("/signature/")) {
+            String encryptedSig = "";
+            String decryptedSig = "";
+            try {
+                Pattern p = Pattern.compile("/s/([a-fA-F0-9\\.]+)");
+                Matcher m = p.matcher(dashManifest);
+                m.find();
+                encryptedSig = m.group(1);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            decryptedSig = decryptSignature(encryptedSig, decryptoinCode);
+            dashManifest = dashManifest.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
+        }
+        String dashDoc = Downloader.download(dashManifest);
+        Vector<VideoInfo.AudioStream> audioStreams = new Vector<>();
+        try {
+            XmlPullParser parser = Xml.newPullParser();
+            parser.setInput(new StringReader(dashDoc));
+            int eventType = parser.getEventType();
+            String tagName = "";
+            String currentMimeType = "";
+            int currentBandwidth = -1;
+            int currentSamplingRate = -1;
+            boolean currentTagIsBaseUrl = false;
+            while(eventType != XmlPullParser.END_DOCUMENT) {
+                switch(eventType) {
+                    case XmlPullParser.START_TAG:
+                        tagName = parser.getName();
+                        if(tagName.equals("AdaptationSet")) {
+                            currentMimeType = parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "mimeType");
+                        } else if(tagName.equals("Representation") && currentMimeType.contains("audio")) {
+                            currentBandwidth = Integer.parseInt(
+                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "bandwidth"));
+                            currentSamplingRate = Integer.parseInt(
+                                    parser.getAttributeValue(XmlPullParser.NO_NAMESPACE, "audioSamplingRate"));
+                        } else if(tagName.equals("BaseURL")) {
+                            currentTagIsBaseUrl = true;
+                        }
+
+                        break;
+                    case XmlPullParser.TEXT:
+                        if(currentTagIsBaseUrl &&
+                                (currentMimeType.contains("audio"))) {
+                            int format = -1;
+                            if(currentMimeType.equals(VideoInfo.M_WEBMA)) {
+                                format = VideoInfo.I_WEBMA;
+                            } else if(currentMimeType.equals(VideoInfo.M_M4A)) {
+                                format = VideoInfo.I_M4A;
+                            }
+                            audioStreams.add(new VideoInfo.AudioStream(parser.getText(),
+                                     format, currentBandwidth, currentSamplingRate));
+                        }
+                    case XmlPullParser.END_TAG:
+                        if(tagName.equals("AdaptationSet")) {
+                            currentMimeType = "";
+                        } else if(tagName.equals("BaseURL")) {
+                            currentTagIsBaseUrl = false;
+                        }
+                        break;
+                    default:
+                }
+                eventType = parser.next();
+            }
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+        VideoInfo.AudioStream[] output = new VideoInfo.AudioStream[audioStreams.size()];
+        for(int i = 0; i < output.length; i++) {
+            output[i] = audioStreams.get(i);
+        }
+        return output;
+    }
+
    private VideoInfoItem extractVideoInfoItem(Element li) {
        VideoInfoItem info = new VideoInfoItem();
        info.webpage_url = li.select("a[class*=\"content-link\"]").first()
@@ -381,7 +480,7 @@ public class YoutubeExtractor implements Extractor {
        return decryptionCode;
    }

-    private String decriptSignature(String encryptedSig, String decryptoinCode) {
+    private String decryptSignature(String encryptedSig, String decryptoinCode) {
        Context context = Context.enter();
        context.setOptimizationLevel(-1);
        Object result = null;
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java
@@ -97,6 +97,9 @@ public class YoutubeSearchEngine implements SearchEngine {
                resultItem.uploader = item.select("div[class=\"yt-lockup-byline\"]").first()
                        .select("a").first()
                        .text();
+                resultItem.upload_date = item.select("div[class=\"yt-lockup-meta\"]").first()
+                        .select("li").first()
+                        .text();
                Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
                        .select("img").first();
                resultItem.thumbnail_url = te.attr("abs:src");
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java
@@ -39,10 +39,7 @@ public class YoutubeService implements StreamingService {
    }
    @Override
    public boolean acceptUrl(String videoUrl) {
-        if(videoUrl.contains("youtube")) {
-            return true;
-        } else {
-            return false;
-        }
+        return videoUrl.contains("youtube") ||
+                videoUrl.contains("youtu.be");
    }
 }
--- a/app/src/main/res/drawable/ai_play.png
+++ b/app/src/main/res/drawable/ai_play.png
--- a/app/src/main/res/drawable/ai_share.png
+++ b/app/src/main/res/drawable/ai_share.png
--- a/app/src/main/res/drawable/durationback.xml
+++ b/app/src/main/res/drawable/durationback.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+        <solid android:color="#000000" />
+        <stroke android:width="1dip" android:color="#888"/>
+    </shape>
--- a/app/src/main/res/drawable/ic_cast_black.png
+++ b/app/src/main/res/drawable/ic_cast_black.png
--- a/app/src/main/res/drawable/ic_headset_black.png
+++ b/app/src/main/res/drawable/ic_headset_black.png
--- a/app/src/main/res/drawable/ic_play_arrow_black.png
+++ b/app/src/main/res/drawable/ic_play_arrow_black.png
--- a/app/src/main/res/drawable/ic_share_black.png
+++ b/app/src/main/res/drawable/ic_share_black.png
--- a/app/src/main/res/layout-land/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
@@ -0,0 +1,159 @@
+<?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"
+    style="?android:attr/textAppearanceLarge"
+    tools:context=".VideoItemDetailFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:id="@+id/videoitem_detail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textIsSelectable="true">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="16dp">
+
+            <ProgressBar android:id="@+id/detailProgressBar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:indeterminate="true"/>
+
+            <ImageView android:id="@+id/detailThumbnailView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:adjustViewBounds="true"
+                android:src="@drawable/dummi_thumbnail"
+                android:visibility="invisible"/>
+
+            <TextView android:id="@+id/detailVideoTitleView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailThumbnailView"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="6dp"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="Bla blabla !!!"
+                android:visibility="invisible"/>
+
+            <ImageView android:id="@+id/detailUploaderThumbnailView"
+                android:layout_width="80dp"
+                android:layout_height="100dp"
+                android:paddingTop="25dp"
+                android:paddingLeft="5dp"
+                android:layout_below="@id/detailVideoTitleView"
+                android:layout_alignParentLeft="true"
+                android:visibility="invisible"
+                android:src="@drawable/budy" />
+
+            <TextView android:id="@+id/detailUploaderView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailUploaderThumbnailView"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="6dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="invisible"
+                android:text="Herr von Gurken" />
+
+            <View android:id="@+id/textSeperationLine"
+                android:layout_width="fill_parent"
+                android:layout_height="1dp"
+                android:background="@android:color/darker_gray"
+                android:layout_below="@id/detailUploaderView"
+                android:paddingTop="20dp"
+                android:visibility="invisible"
+                android:layout_alignParentLeft="true" />
+
+            <TextView android:id="@+id/detailViewCountView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailVideoTitleView"
+                android:layout_alignParentRight="true"
+                android:paddingTop="70dp"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:visibility="invisible"
+                android:text="1.000.115 views" />
+
+            <TextView android:id="@+id/detailThumbsDownCountView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailViewCountView"
+                android:layout_alignParentRight="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="invisible"
+                android:text="5.000" />
+
+            <ImageView android:id="@+id/detailThumbsDownImgView"
+                android:layout_width="40dp"
+                android:layout_height="20dp"
+                android:layout_below="@id/detailViewCountView"
+                android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                android:visibility="invisible"
+                android:src="@drawable/thumbs_down" />
+
+            <TextView android:id="@+id/detailThumbsUpCountView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailViewCountView"
+                android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="invisible"
+                android:text="111.111" />
+
+            <ImageView android:id="@+id/detailThumbsUpImgView"
+                android:layout_width="40dp"
+                android:layout_height="20dp"
+                android:layout_below="@id/detailViewCountView"
+                android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                android:visibility="invisible"
+                android:src="@drawable/thumbs_up" />
+
+            <TextView android:id="@+id/detailUploadDateView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailUploaderView"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="6dp"
+                android:paddingTop="20dp"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:visibility="invisible"
+                android:text="Uploaded at: 45.64.1285" />
+
+            <TextView android:id="@+id/detailDescriptionView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailUploadDateView"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="6dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="invisible"
+                android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
+                />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_below="@id/detailDescriptionView"/>
+
+        </RelativeLayout>
+    </ScrollView>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/playVideoButton"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:backgroundTint="@color/primaryColorYoutube"
+        android:src="@drawable/ic_play_arrow_black"
+        android:layout_margin="15pt"/>
+</RelativeLayout>
--- a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/videoitem_detail"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:textIsSelectable="true"
-    tools:context=".VideoItemDetailFragment">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="16dp">
-
-        <ProgressBar android:id="@+id/detailProgressBar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:indeterminate="true"/>
-
-        <ImageView android:id="@+id/detailThumbnailView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:adjustViewBounds="true"
-            android:src="@drawable/dummi_thumbnail"
-            android:visibility="invisible"/>
-
-        <TextView android:id="@+id/detailVideoTitleView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailThumbnailView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Bla blabla !!!"
-            android:visibility="invisible"/>
-
-        <ImageView android:id="@+id/detailUploaderThumbnailView"
-            android:layout_width="80dp"
-            android:layout_height="100dp"
-            android:paddingTop="25dp"
-            android:paddingLeft="5dp"
-            android:layout_below="@id/detailVideoTitleView"
-            android:layout_alignParentLeft="true"
-            android:visibility="invisible"
-            android:src="@drawable/budy" />
-
-        <TextView android:id="@+id/detailUploaderView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploaderThumbnailView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="Herr von Gurken" />
-
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="1dp"
-            android:background="@android:color/darker_gray"
-            android:layout_below="@id/detailUploaderView"
-            android:paddingTop="20dp"
-            android:visibility="invisible"
-            android:layout_alignParentLeft="true" />
-
-        <TextView android:id="@+id/detailViewCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailVideoTitleView"
-            android:layout_alignParentRight="true"
-            android:paddingTop="70dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="1.000.115 views" />
-
-        <TextView android:id="@+id/detailThumbsDownCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_alignParentRight="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="5.000" />
-
-        <ImageView android:id="@+id/detailThumbsDownImgView"
-            android:layout_width="40dp"
-            android:layout_height="20dp"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsDownCountView"
-            android:visibility="invisible"
-            android:src="@drawable/thumbs_down" />
-
-        <TextView android:id="@+id/detailThumbsUpCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsDownImgView"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="111.111" />
-
-        <ImageView android:id="@+id/detailThumbsUpImgView"
-            android:layout_width="40dp"
-            android:layout_height="20dp"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsUpCountView"
-            android:visibility="invisible"
-            android:src="@drawable/thumbs_up" />
-
-        <TextView android:id="@+id/detailUploadDateView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploaderView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:paddingTop="20dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="Uploaded at: 45.64.1285" />
-
-        <TextView android:id="@+id/detailDescriptionView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploadDateView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
-            />
-
-    </RelativeLayout>
-
-</ScrollView>
--- a/app/src/main/res/layout/activity_play_video.xml
+++ b/app/src/main/res/layout/activity_play_video.xml
@@ -9,17 +9,20 @@
    <VideoView android:id="@+id/video_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center"
+        android:focusable="false"/>

    <Button android:id="@+id/content_button"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:background="@null" />
+        android:background="@null"
+        android:focusable="false"/>

    <ProgressBar android:id="@+id/play_video_progress_bar"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:indeterminate="true"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center"
+        android:focusable="false"/>

 </FrameLayout>
--- a/app/src/main/res/layout/activity_videoitem_list.xml
+++ b/app/src/main/res/layout/activity_videoitem_list.xml
@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">

    <ImageView android:id="@+id/list_view_watermark"
        android:layout_width="match_parent"
@@ -16,6 +16,6 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        tools:context=".VideoItemListActivity"
-        tools:layout="@android:layout/list_content" />
+        tools:layout="@android:layout/list_content"/>

 </LinearLayout>
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -1,133 +1,151 @@
 <?xml version="1.0" encoding="utf-8"?>

-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/videoitem_detail"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".VideoItemDetailFragment"
+    android:textIsSelectable="true"
    style="?android:attr/textAppearanceLarge"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:textIsSelectable="true"
-    tools:context=".VideoItemDetailFragment">
+    android:layout_height="match_parent">

-    <RelativeLayout
+    <ScrollView
+        android:id="@+id/videoitem_detail"
        android:layout_width="match_parent"
        android:layout_height="match_parent">
-
-        <ProgressBar android:id="@+id/detailProgressBar"
+        <RelativeLayout
            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:indeterminate="true"/>
+            android:layout_height="match_parent">

-        <ImageView android:id="@+id/detailThumbnailView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scaleType="centerInside"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:adjustViewBounds="true"
-            android:visibility="invisible"
-            android:src="@drawable/dummi_thumbnail"/>
+            <ProgressBar android:id="@+id/detailProgressBar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:indeterminate="true"/>

-        <TextView android:id="@+id/detailVideoTitleView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailThumbnailView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:paddingBottom="20dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="Bla blabla !!!"/>
+            <ImageView android:id="@+id/detailThumbnailView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scaleType="centerInside"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:adjustViewBounds="true"
+                android:visibility="invisible"
+                android:src="@drawable/dummi_thumbnail"/>

-        <ImageView android:id="@+id/detailUploaderThumbnailView"
-            android:layout_width="85dp"
-            android:layout_height="100dp"
-            android:paddingTop="25dp"
-            android:paddingLeft="2dp"
-            android:layout_below="@id/detailVideoTitleView"
-            android:layout_alignParentLeft="true"
-            android:visibility="invisible"
-            android:src="@drawable/budy" />
+            <TextView android:id="@+id/detailVideoTitleView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailThumbnailView"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="6dp"
+                android:paddingBottom="20dp"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:visibility="invisible"
+                android:text="Bla blabla !!!"/>

-        <TextView android:id="@+id/detailUploaderView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploaderThumbnailView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="Herr von Gurken" />
+            <ImageView android:id="@+id/detailUploaderThumbnailView"
+                android:layout_width="85dp"
+                android:layout_height="100dp"
+                android:paddingTop="25dp"
+                android:paddingLeft="2dp"
+                android:layout_below="@id/detailVideoTitleView"
+                android:layout_alignParentLeft="true"
+                android:visibility="invisible"
+                android:src="@drawable/budy" />

-        <TextView android:id="@+id/detailViewCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="25dp"
-            android:layout_below="@id/detailVideoTitleView"
-            android:layout_alignParentRight="true"
-            android:paddingRight="16dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="drölf views" />
+            <TextView android:id="@+id/detailUploaderView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailUploaderThumbnailView"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="6dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="invisible"
+                android:text="Herr von Gurken" />

-        <TextView android:id="@+id/detailThumbsDownCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_alignParentRight="true"
-            android:paddingRight="16dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="-5.000" />
+            <TextView android:id="@+id/detailViewCountView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="25dp"
+                android:layout_below="@id/detailVideoTitleView"
+                android:layout_alignParentRight="true"
+                android:paddingRight="16dp"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:visibility="invisible"
+                android:text="drölf views" />

-        <ImageView android:id="@+id/detailThumbsDownImgView"
-            android:layout_width="40dp"
-            android:layout_height="20dp"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsDownCountView"
-            android:visibility="invisible"
-            android:src="@drawable/thumbs_down" />
+            <TextView android:id="@+id/detailThumbsDownCountView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailViewCountView"
+                android:layout_alignParentRight="true"
+                android:paddingRight="16dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="invisible"
+                android:text="-5.000" />

-        <TextView android:id="@+id/detailThumbsUpCountView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsDownImgView"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="∞" />
+            <ImageView android:id="@+id/detailThumbsDownImgView"
+                android:layout_width="40dp"
+                android:layout_height="20dp"
+                android:layout_below="@id/detailViewCountView"
+                android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                android:visibility="invisible"
+                android:src="@drawable/thumbs_down" />

-        <ImageView android:id="@+id/detailThumbsUpImgView"
-            android:layout_width="40dp"
-            android:layout_height="20dp"
-            android:layout_below="@id/detailViewCountView"
-            android:layout_toLeftOf="@id/detailThumbsUpCountView"
-            android:visibility="invisible"
-            android:src="@drawable/thumbs_up" />
+            <TextView android:id="@+id/detailThumbsUpCountView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailViewCountView"
+                android:layout_toLeftOf="@id/detailThumbsDownImgView"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="invisible"
+                android:text="∞" />

-        <TextView android:id="@+id/detailUploadDateView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploaderView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:paddingTop="20dp"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:visibility="invisible"
-            android:text="Uploaded at: 45.64.1285" />
+            <ImageView android:id="@+id/detailThumbsUpImgView"
+                android:layout_width="40dp"
+                android:layout_height="20dp"
+                android:layout_below="@id/detailViewCountView"
+                android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                android:visibility="invisible"
+                android:src="@drawable/thumbs_up" />

-        <TextView android:id="@+id/detailDescriptionView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/detailUploadDateView"
-            android:layout_alignParentLeft="true"
-            android:paddingLeft="6dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="invisible"
-            android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
-            />
+            <TextView android:id="@+id/detailUploadDateView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailUploaderView"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="6dp"
+                android:paddingTop="20dp"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:visibility="invisible"
+                android:text="Uploaded at: 45.64.1285" />

-    </RelativeLayout>
+            <TextView android:id="@+id/detailDescriptionView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/detailUploadDateView"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="6dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="invisible"
+                android:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmodtempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. "
+                />

-</ScrollView>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_below="@id/detailDescriptionView"/>
+
+        </RelativeLayout>
+    </ScrollView>
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/playVideoButton"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:backgroundTint="@color/primaryColorYoutube"
+        android:src="@drawable/ic_play_arrow_black"
+        android:layout_margin="15pt"/>
+</RelativeLayout>
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -8,18 +8,22 @@

    <ImageView android:id="@+id/itemThumbnailView"
        android:layout_width="125dp"
-        android:layout_height="70dp"
+        android:layout_height="80dp"
        android:layout_alignParentLeft="true"
        android:layout_alignParentTop="true"
        android:src="@drawable/dummi_thumbnail"/>

    <TextView android:id="@+id/itemVideoTitleView"
        android:layout_width="wrap_content"
-        android:layout_height="55dp"
+        android:layout_height="40dp"
        android:layout_toRightOf="@id/itemThumbnailView"
        android:layout_alignParentTop="true"
        android:paddingLeft="6dp"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:paddingTop="4dp"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="@dimen/text_search_title_size"
+        android:text="title"
+        />

    <TextView android:id="@+id/itemUploaderView"
        android:layout_width="wrap_content"
@@ -27,16 +31,37 @@
        android:layout_toRightOf="@id/itemThumbnailView"
        android:layout_below="@id/itemVideoTitleView"
        android:paddingLeft="6dp"
-        android:textAppearance="?android:attr/textAppearanceSmall"/>
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="@dimen/text_search_uploader_size"
+        android:text="uploader"/>

-    <TextView android:id="@+id/itemDurationView"
+    <TextView android:id="@+id/itemUploadDateView"
+        android:text="itemUploadDateView"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_toRightOf="@id/itemThumbnailView"
        android:layout_below="@id/itemUploaderView"
        android:paddingLeft="6dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="@dimen/text_search_uploadtime_size"
+        />

+    <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_marginRight="6dp"
+        android:layout_marginBottom="12dp"
+        android:paddingLeft="3dp"
+        android:paddingRight="3dp"
+        android:paddingTop="1dp"
+        android:paddingBottom="1dp"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="@dimen/text_search_duration_size"
+        android:background="@drawable/durationback"
+        android:textColor="#f7f7f7"
+        android:text="duration"
+        />

 </RelativeLayout>
--- a/app/src/main/res/menu/videoitem_detail.xml
+++ b/app/src/main/res/menu/videoitem_detail.xml
@@ -3,13 +3,23 @@
    xmlns:app="http://schemas.android.com/apk/res-auto">
    <item android:id="@+id/menu_item_play"
        android:title="@string/play"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_play_arrow_black"/>
+
+    <item android:id="@+id/menu_item_play_audio"
+        android:title="@string/playAudio"
        app:showAsAction="always"
-        android:icon="@drawable/ai_play"/>
+        android:icon="@drawable/ic_headset_black" />

    <item android:id="@+id/menu_item_share"
        android:title="@string/share"
        app:showAsAction="ifRoom"
-        android:icon="@drawable/ai_share"/>
+        android:icon="@drawable/ic_share_black"/>
+
+    <item android:id="@+id/action_play_with_kodi"
+        android:title="@string/playWithKodiTitle"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_cast_black"/>

    <item android:id="@+id/menu_item_openInBrowser"
        app:showAsAction="never"
@@ -22,4 +32,6 @@
    <item android:id="@+id/action_settings"
        app:showAsAction="never"
        android:title="@string/settings"/>
+
+
 </menu>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">NewPipe</string>
    <string name="title_videoitem_detail">NewPipe</string>
@@ -25,4 +26,23 @@
    <string name="downloadLocation">Download Verzeichnis</string>
    <string name="downloadLocationSummary">Verzeichnis in dem heruntergeladene Videos gespeichert werden.</string>
    <string name="downloadLocationDialogTitle">Download Verzeichnis eingeben</string>
+    <string name="autoPlayThroughIntentTitle">Automatisch abspielen durch Intent.</string>
+    <string name="autoPlayThroughIntentSummary">Startet ein Video automatisch wenn es von einer anderen App aufgerufen wurde.</string>
+    <string name="defaultResolutionPreferenceTitle">Standard Auflösung</string>
+    <string name="playWithKodiTitle">Mit Kodi abspielen</string>
+    <string name="koreNotFound">Kore app wurde nicht gefunden. Kore wird benötigt, um Videos mit Kodi wieder zu geben.</string>
+    <string name="installeKore">Kore installieren</string>
+    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="showPlayWithKodiTitle">Zeige \"Mit Kodi abspielen\" Option</string>
+    <string name="showPlayWithKodiSummary">Zeigt eine Option an, über die man Videos mit dem Kodi Mediacenter abspielen kann.</string>
+    <string name="leftPlayButtonTitle">Zeige play button auf der linken seite.</string>
+    <string name="playAudio">Audio</string>
+    <string name="defaultAudioFormatTitle">Bevorzugtes Audio Format</string>
+    <string name="webMAudioDescription">WebM - freies Format</string>
+    <string name="m4aAudioDescription">m4a - bessere Qualität</string>
+    <string name="downloadDialogTitle">Herunterladen</string>
+    <string-array name="downloadOptions">
+        <item>Video</item>
+        <item>Audio</item>
+    </string-array>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">NewPipe</string>
+    <string name="title_videoitem_detail">NewPipe</string>
+    <string name="nothingFound">No se ha encontrado nada</string>
+    <string name="viewSufix">visitas</string>
+    <string name="uploadDatePrefix">Subido desde: </string>
+    <string name="noPlayerFound">No se ha encontrado ningún reproductor de vídeo. Quizás quieras instalar alguno.</string>
+    <string name="installStreamPlayer">Instalar</string>
+    <string name="cancel">Cancelar</string>
+    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
+    <string name="open_in_browser">Abrir en navegador</string>
+    <string name="share">Compartir</string>
+    <string name="play">Reproducir</string>
+    <string name="download">Descargar</string>
+    <string name="search">Buscar</string>
+    <string name="settings">Ajustes</string>
+    <string name="sendWith">Enviar con</string>
+    <string name="didYouMean">Querias decir: </string>
+    <string name="searchPage">Buscar página: </string>
+    <string name="shareDialogTitle">Compartir con:</string>
+    <string name="chooseBrowser">Selecciona navegador:</string>
+    <string name="screenRotation">rotación</string>
+    <string name="title_activity_settings">Ajustes</string>
+    <string name="useExternalPlayerTitle">Usar reproductor externo</string>
+    <string name="downloadLocation">Descargar en...</string>
+    <string name="downloadLocationSummary">Donde se guardarán los vídeos descargados.</string>
+    <string name="downloadLocationDialogTitle">Localización del directorio de descargas</string>
+    <string name="autoPlayThroughIntentTitle">Reproducción automática</string>
+    <string name="autoPlayThroughIntentSummary">Reproduce los vídeos automaticamente cuando la llamada viene de otra aplicación.</string>
+    <string name="defaultResolutionPreferenceTitle">Resolución por defecto</string>
+    <string name="playWithKodiTitle">Reproducir con Kodi</string>
+    <string name="koreNotFound">Aplicación Kore no encontrada. Kore es necesario para reproducir vídeos con Kodi media center.</string>
+    <string name="installeKore">Instalar Kore</string>
+    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="showPlayWithKodiTitle">Mostrar la opción \"Reproducir con Kodi\"</string>
+    <string name="showPlayWithKodiSummary">Muestra una opción para reproducir vídeo vía Kodi media center.</string>
+</resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">NewPipe</string>
+    <string name="autoPlayThroughIntentSummary">Démarrer automatiquement la vidéo si elle a été appellée à partir d\'une autre application.</string>
+    <string name="cancel">Annuler</string>
+    <string name="chooseBrowser">Choisir un navigateur:</string>
+    <string name="defaultResolutionPreferenceTitle">Résolution par défaut:</string>
+    <string name="didYouMean">S\'agirait-il de:</string>
+    <string name="download">Télécharger</string>
+    <string name="downloadLocation">Emplacement des téléchargements</string>
+    <string name="downloadLocationDialogTitle">Entrez l\'emplacement du téléchargement</string>
+    <string name="downloadLocationSummary">Emplacement des vidéos téléchargées.</string>
+    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
+    <string name="installStreamPlayer">Installer</string>
+    <string name="installeKore">Installer Kore</string>
+    <string name="koreNotFound">L\'application Kore est introuvable. Kore est nécessaire afin de lire des vidéos dans Kodi media center.</string>
+    <string name="noPlayerFound">Aucun lecteur de streaming détecté. Vous devriez en installer un.</string>
+    <string name="nothingFound">Aucun résultat.</string>
+    <string name="open_in_browser">Ouvrir dans le navigateur</string>
+    <string name="play">Lire</string>
+    <string name="autoPlayThroughIntentTitle">Lecture automatique via Intent.</string>
+    <string name="playWithKodiTitle">Lire avec Kodi</string>
+    <string name="screenRotation">rotation</string>
+    <string name="search">Chercher</string>
+    <string name="searchPage">Chercher dans la page:</string>
+    <string name="sendWith">Envoyer avec</string>
+    <string name="settings">Paramètres</string>
+    <string name="share">Partager</string>
+    <string name="shareDialogTitle">Partager avec:</string>
+    <string name="showPlayWithKodiSummary">Afficher une option pour lire la vidéo avec Kodi media center.</string>
+    <string name="showPlayWithKodiTitle">Afficher l\'option \"Lire avec Kodi\"</string>
+    <string name="title_activity_settings">Paramètres</string>
+    <string name="title_videoitem_detail">NewPipe</string>
+    <string name="uploadDatePrefix">Envoyé le:</string>
+    <string name="useExternalPlayerTitle">Utiliser un lecteur externe</string>
+    <string name="viewSufix">vues</string>
+</resources>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">NewPipe</string>
+    <string name="title_videoitem_detail">NewPipe</string>
+    <string name="nothingFound">Nincs találat</string>
+    <string name="viewSufix">megtekintés</string>
+    <string name="uploadDatePrefix">Feltöltve: </string>
+    <string name="noPlayerFound">Nem található lejátszó. Telepítsen egyet!</string>
+    <string name="installStreamPlayer">Telepítsen egyet</string>
+    <string name="cancel">Mégse</string>
+    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
+    <string name="open_in_browser">Megnyitás böngészőben</string>
+    <string name="share">Megosztás</string>
+    <string name="play">Lejátszás</string>
+    <string name="download">Letöltés</string>
+    <string name="search">Keresés</string>
+    <string name="settings">Beállítások</string>
+    <string name="sendWith">Küldés ezzel:</string>
+    <string name="didYouMean">Erre gondolt: </string>
+    <string name="searchPage">Keresési lap: </string>
+    <string name="shareDialogTitle">Megosztás ezzel:</string>
+    <string name="chooseBrowser">Válasszon böngészőt:</string>
+    <string name="screenRotation">forgatás</string>
+    <string name="title_activity_settings">Beállítások</string>
+    <string name="useExternalPlayerTitle">Külső lejátszó használata</string>
+    <string name="downloadLocation">Letöltések helye</string>
+    <string name="downloadLocationSummary">Útvonal a letöltött videók tárolásához</string>
+    <string name="downloadLocationDialogTitle">Adja meg a letöltési útvonalat</string>
+    <string name="autoPlayThroughIntentTitle">Automatikus lejátszás Intent-en keresztül</string>
+    <string name="autoPlayThroughIntentSummary">Automatikusan elindítja a videót, ha az külső alkalmazásból volt hívva</string>
+    <string name="defaultResolutionPreferenceTitle">Alapértelmezett felbontás</string>
+    <string name="playWithKodiTitle">Lejátszás Kodi-val</string>
+    <string name="koreNotFound">A Kore alkalmazás nem található. A Kore szükséges a videók Kodi médiaközponttal való lejátszásához.</string>
+    <string name="installeKore">Kore telepítése</string>
+    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="showPlayWithKodiTitle">\"Lejátszás Kodi-val\" opció mutatása</string>
+    <string name="showPlayWithKodiSummary">Mutat egy opciót a videók Kodi médiaközponttal való lejátszására</string>
+    <string name="leftPlayButtonTitle">Lejátszás gomb bal oldalon mutatása</string>
+    <string name="playAudio">Hang</string>
+    <string name="defaultAudioFormatTitle">Alapértelmezett hang formátum</string>
+    <string name="webMAudioDescription">WebM - szabad formátum</string>
+    <string name="m4aAudioDescription">m4a - jobb minőség</string>
+    <string name="downloadDialogTitle">Letöltés</string>
+    <string-array name="downloadOptions">
+        <item>Videó</item>
+        <item>Hang</item>
+    </string-array>
+</resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <string name="app_name">NewPipe</string>
+    <string name="title_videoitem_detail">NewPipe</string>
+    <string name="nothingFound">Geen resultaten</string>
+    <string name="viewSufix">keer bekeken</string>
+    <string name="uploadDatePrefix">Geüpload op: </string>
+    <string name="noPlayerFound">Geen speler met streaming ondersteuning gevonden. Je wilt er misschien een installeren.</string>
+    <string name="installStreamPlayer">Installeer speler</string>
+    <string name="cancel">Annuleer</string>
+    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
+    <string name="open_in_browser">Open in browser</string>
+    <string name="share">Deel</string>
+    <string name="play">Speel af</string>
+    <string name="download">Download</string>
+    <string name="search">Zoek</string>
+    <string name="settings">Instellingen</string>
+    <string name="sendWith">Verstuur met</string>
+    <string name="didYouMean">Bedoelde je: </string>
+    <string name="searchPage">Zoekpagina: </string>
+    <string name="shareDialogTitle">Deel met:</string>
+    <string name="chooseBrowser">Kies browser:</string>
+    <string name="screenRotation">rotatie</string>
+    <string name="title_activity_settings">Instellingen</string>
+    <string name="useExternalPlayerTitle">Gebruik externe speler</string>
+    <string name="downloadLocation">Downloadlocatie</string>
+    <string name="downloadLocationSummary">Locatie om gedownloadde videos in op te slaan.</string>
+    <string name="downloadLocationDialogTitle">Voer downloadlocatie is</string>
+    <string name="autoPlayThroughIntentTitle">Speel automatisch via Intent</string>
+    <string name="autoPlayThroughIntentSummary">Speel een video automatisch af indien geopend vanuit een andere app.</string>
+    <string name="defaultResolutionPreferenceTitle">Standaardresolutie</string>
+    <string name="playWithKodiTitle">Speel af met Kodi</string>
+    <string name="koreNotFound">Kore app niet gevonden. Kore is nodig om videos op Kodi af te spelen.</string>
+    <string name="installeKore">Installeer Kore</string>
+    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="showPlayWithKodiTitle">Toon \"Speel af met Kodi\" optie</string>
+    <string name="showPlayWithKodiSummary">Toont een optie om een video op een Kodi media center af te spelen.</string>
+</resources>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Јутјуб цев</string>
+    <string name="title_videoitem_detail">Јутјуб цев</string>
+    <string name="nothingFound">Ништа није нађено</string>
+    <string name="viewSufix">приказа</string>
+    <string name="uploadDatePrefix">Отпремљено: </string>
+    <string name="noPlayerFound">Нема плејера токова. Можда желите да га инсталирате.</string>
+    <string name="installStreamPlayer">Инсталирај</string>
+    <string name="cancel">Одустани</string>
+    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
+    <string name="open_in_browser">Отвори у прегледачу</string>
+    <string name="share">Дели</string>
+    <string name="play">Пусти</string>
+    <string name="download">Преузми</string>
+    <string name="search">Тражи</string>
+    <string name="settings">Поставке</string>
+    <string name="sendWith">Пошаљи помоћу</string>
+    <string name="didYouMean">Да ли сте мислили: </string>
+    <string name="searchPage">Страница претраге: </string>
+    <string name="shareDialogTitle">Подели помоћу:</string>
+    <string name="chooseBrowser">Отвори помоћу:</string>
+    <string name="screenRotation">ротација</string>
+    <string name="title_activity_settings">Поставке</string>
+    <string name="useExternalPlayerTitle">Користи спољашњи плејер</string>
+    <string name="downloadLocation">Одредиште преузимања</string>
+    <string name="downloadLocationSummary">Путања за упис преузетих видеа.</string>
+    <string name="downloadLocationDialogTitle">Унесите путању за преузимања</string>
+    <string name="autoPlayThroughIntentTitle">Аутопуштање преко Интента</string>
+    <string name="autoPlayThroughIntentSummary">Аутоматски почиње пушта видео по позиву из друге апликације.</string>
+    <string name="defaultResolutionPreferenceTitle">Подразумевана резолуција</string>
+</resources>
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,35 @@
+<resources>
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="android:colorPrimary">@color/primaryColorYoutube</item>
+        <item name="android:colorPrimaryDark">@color/primaryColorDarkYoutube</item>
+        <item name="colorAccent">@color/accentColorYoutube</item>
+        <item name="android:colorAccent">@color/accentColorYoutube</item>
+    </style>
+
+    <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
+        <item name="android:displayOptions">showHome</item>
+        <item name="displayOptions">showHome</item>
+        <item name="android:background">@color/primaryColorYoutube</item>
+        <item name="background">@color/primaryColorYoutube</item>
+    </style>
+
+    <style name="FullscreenTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="android:actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
+        <item name="actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
+        <item name="colorAccent">@color/primaryColorYoutube</item>
+        <item name="android:colorAccent">@color/primaryColorYoutube</item>
+    </style>
+
+    <style name="NewPipePlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
+        <item name="android:displayOptions">showHome</item>
+        <item name="displayOptions">showHome</item>
+        <item name="android:background">@color/black_overlay</item>
+        <item name="background">@color/black_overlay</item>
+    </style>
+</resources>
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,12 +0,0 @@
-<resources>
-
-    <!-- Declare custom theme attributes that allow changing which styles are
-         used for button bars depending on the API level.
-         ?android:attr/buttonBarStyle is new as of API 11 so this is
-         necessary to support previous API levels. -->
-    <declare-styleable name="ButtonBarContainerTheme">
-        <attr name="metaButtonBarStyle" format="reference" />
-        <attr name="metaButtonBarButtonStyle" format="reference" />
-    </declare-styleable>
-
-</resources>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="actionBarColorYoutube">#dd0000</color>
+    <color name="primaryColorYoutube">#dd0000</color>
+    <color name="primaryColorDarkYoutube">#bb0000</color>
+    <color name="accentColorYoutube">#000000</color>
    <color name="black_overlay">#66000000</color>
 </resources>
--- a/app/src/main/res/values/dimentxt.xml
+++ b/app/src/main/res/values/dimentxt.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="text_search_title_size">14sp</dimen>
+    <dimen name="text_search_duration_size">11sp</dimen>
+    <dimen name="text_search_uploader_size">12sp</dimen>
+    <dimen name="text_search_uploadtime_size">12sp</dimen>
+</resources>
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -2,4 +2,25 @@
 <resources>
    <string name="downloadPathPreference">download_path_preference</string>
    <string name="useExternalPlayer">use_external_player</string>
+    <string name="autoPlayThroughIntent">autoplay_through_intent</string>
+    <string name="defaultResolutionPreference">default_resulution_preference</string>
+    <string-array name="resolutionList">
+        <item>720p</item>
+        <item>360p</item>
+        <item>240p</item>
+        <item>144p</item>
+    </string-array>
+    <string name="defaultResolutionListItem">360p</string>
+    <string name="showPlayWidthKodiPreference">show_play_with_kodi_preference</string>
+    <string name="leftHandLayout">left_hand_layout</string>
+    <string name="defaultAudioFormatPreference">default_audio_format</string>
+    <string-array name="audioFormatDescriptionList">
+        <item>@string/webMAudioDescription</item>
+        <item>@string/m4aAudioDescription</item>
+    </string-array>
+    <string-array name="audioFormatList">
+        <item>webm</item>
+        <item>m4a</item>
+    </string-array>
+    <string name="defaultAudioFormat">m4a</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name">NewPipe</string>
    <string name="title_videoitem_detail">NewPipe</string>
-    <string name="nothingFound">Noting found</string>
+    <string name="nothingFound">Nothing found</string>
    <string name="viewSufix">views</string>
    <string name="uploadDatePrefix">Uploaded at: </string>
    <string name="noPlayerFound">No StreamPlayer found. You may want to install one.</string>
@@ -25,4 +26,23 @@
    <string name="downloadLocation">Download location</string>
    <string name="downloadLocationSummary">Path to store downloaded videos in.</string>
    <string name="downloadLocationDialogTitle">Enter download path</string>
-</resources>
+    <string name="autoPlayThroughIntentTitle">Autoplay through Intent</string>
+    <string name="autoPlayThroughIntentSummary">Automatically starts a video when it was called from another app.</string>
+    <string name="defaultResolutionPreferenceTitle">Default Resolution</string>
+    <string name="playWithKodiTitle">Play with Kodi</string>
+    <string name="koreNotFound">Kore app not found. Kore is needed to play videos with Kodi media center.</string>
+    <string name="installeKore">Install Kore</string>
+    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="showPlayWithKodiTitle">Show \"Play with Kodi\" option</string>
+    <string name="showPlayWithKodiSummary">Displays an option to play a video via Kodi media center.</string>
+    <string name="leftPlayButtonTitle">Show play button on the left side.</string>
+    <string name="playAudio">Audio</string>
+    <string name="defaultAudioFormatTitle">Default audio format</string>
+    <string name="webMAudioDescription">WebM - free format</string>
+    <string name="m4aAudioDescription">m4a - better quality</string>
+    <string name="downloadDialogTitle">Download</string>
+    <string-array name="downloadOptions">
+        <item>Video</item>
+        <item>Audio</item>
+    </string-array>
+</resources>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,16 +1,18 @@
 <resources>
-
    <!-- Base application theme. -->
    <style name="AppTheme" parent="Theme.AppCompat.Light">
        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/primaryColorYoutube</item>
+        <item name="colorPrimaryDark">@color/primaryColorDarkYoutube</item>
+        <item name="colorAccent">@color/accentColorYoutube</item>
    </style>

    <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
        <item name="android:displayOptions">showHome</item>
        <item name="displayOptions">showHome</item>
-        <item name="android:background">@color/actionBarColorYoutube</item>
-        <item name="background">@color/actionBarColorYoutube</item>
+        <item name="android:background">@color/primaryColorYoutube</item>
+        <item name="background">@color/primaryColorYoutube</item>
    </style>

    <style name="FullscreenTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -19,6 +21,7 @@
        <item name="windowActionBarOverlay">true</item>
        <item name="android:actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
        <item name="actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
+        <item name="colorAccent">@color/primaryColorYoutube</item>
    </style>

    <style name="NewPipePlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
@@ -27,4 +30,4 @@
        <item name="android:background">@color/black_overlay</item>
        <item name="background">@color/black_overlay</item>
    </style>
-</resources>
+</resources>
--- a/app/src/main/res/xml/settings_screen.xml
+++ b/app/src/main/res/xml/settings_screen.xml
@@ -5,7 +5,8 @@

    <CheckBoxPreference
        android:key="@string/useExternalPlayer"
-        android:title="@string/useExternalPlayerTitle"/>
+        android:title="@string/useExternalPlayerTitle"
+        android:defaultValue="false"/>

    <EditTextPreference
        android:key="@string/downloadPathPreference"
@@ -14,4 +15,35 @@
        android:dialogTitle="@string/downloadLocationDialogTitle"
        android:defaultValue=""/>

+    <CheckBoxPreference
+        android:key="@string/autoPlayThroughIntent"
+        android:title="@string/autoPlayThroughIntentTitle"
+        android:summary="@string/autoPlayThroughIntentSummary"
+        android:defaultValue="false" />
+
+    <ListPreference
+        android:key="@string/defaultResolutionPreference"
+        android:title="@string/defaultResolutionPreferenceTitle"
+        android:entries="@array/resolutionList"
+        android:entryValues="@array/resolutionList"
+        android:defaultValue="@string/defaultResolutionListItem"/>
+
+    <CheckBoxPreference
+        android:key="@string/showPlayWidthKodiPreference"
+        android:title="@string/showPlayWithKodiTitle"
+        android:summary="@string/showPlayWithKodiSummary"
+        android:defaultValue="false" />
+
+    <CheckBoxPreference
+        android:key="@string/leftHandLayout"
+        android:title="@string/leftPlayButtonTitle"
+        android:defaultValue="false" />
+
+    <ListPreference
+        android:key="@string/defaultAudioFormatPreference"
+        android:title="@string/defaultAudioFormatTitle"
+        android:entries="@array/audioFormatDescriptionList"
+        android:entryValues="@array/audioFormatList"
+        android:defaultValue="@string/defaultAudioFormat"/>
+
 </PreferenceScreen>
--- a/assets/new_newpipe_icon.svg
+++ b/assets/new_newpipe_icon.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="500"
+   height="500"
+   viewBox="0 0 499.99998 499.99998"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="new_newpipe_icon.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4191">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.42142856"
+         offset="0"
+         id="stop4193" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4195" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4181">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.18214285"
+         offset="0"
+         id="stop4183" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4185" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4181"
+       id="linearGradient4187"
+       x1="33.701958"
+       y1="1049.5769"
+       x2="222.74532"
+       y2="802.2912"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,-1,0,1604.7196)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4191"
+       id="linearGradient4197"
+       x1="156.3342"
+       y1="806.3598"
+       x2="137.34325"
+       y2="1076.3597"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter4234">
+      <feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4236" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4238" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="10"
+         result="blur"
+         id="feGaussianBlur4240" />
+      <feOffset
+         dx="10"
+         dy="10"
+         result="offset"
+         id="feOffset4242" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite4244" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#909090"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="306.78283"
+     inkscape:cy="188.96397"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-552.36209)">
+    <g
+       id="g4228"
+       style="filter:url(#filter4234)"
+       transform="matrix(0.91500077,0,0,0.91500077,34.121548,64.699974)">
+      <path
+         transform="scale(1,-1)"
+         inkscape:transform-center-y="-0.99541504"
+         inkscape:transform-center-x="-69.868733"
+         d="m 466.34766,-802.35761 -216.69307,124.67654 -216.319598,125.32344 0.373489,-249.99997 -0.37349,-250 216.319579,125.32345 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.0471975"
+         sodipodi:arg1="-9.6439996e-10"
+         sodipodi:r2="143.96407"
+         sodipodi:r1="288.67511"
+         sodipodi:cy="-802.3576"
+         sodipodi:cx="177.67255"
+         sodipodi:sides="3"
+         id="path4177"
+         style="opacity:0.997;fill:#ff0d0d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="star" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4179"
+         d="m 466.3167,802.35759 -432.596061,0 -0.161527,-249.85824 z"
+         style="fill:url(#linearGradient4187);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4189"
+         d="M 466.3432,802.35759 33.687658,802.35807 33.334206,1052.362 Z"
+         style="fill:url(#linearGradient4197);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         transform="scale(1,-1)"
+         inkscape:transform-center-y="-0.99541504"
+         inkscape:transform-center-x="-69.868733"
+         d="M 466.01266,-802.36206 249.31959,-677.68553 33,-552.36208 33.373489,-802.36205 33,-1052.362 249.31958,-927.0386 Z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.0471975"
+         sodipodi:arg1="-9.6439996e-10"
+         sodipodi:r2="143.96407"
+         sodipodi:r1="288.67511"
+         sodipodi:cy="-802.36206"
+         sodipodi:cx="177.33755"
+         sodipodi:sides="3"
+         id="path4177-3"
+         style="opacity:0.997;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="star" />
+    </g>
+  </g>
+</svg>
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
Author	SHA1	Message	Date
Christian Schabesberger	b7c0a77edc	Merge pull request #45 from ata2001/master Update hungarian translation	2015-09-25 23:33:01 +02:00
ata2001	aab0f45890	Update hungarian translation	2015-09-26 00:05:54 +02:00
Christian Schabesberger	c62ad66f11	New: - Show video title instead of stream url in vlc/MXPlayer - remember rotation Fix: - sensore controlled landscape rotation in the player	2015-09-25 14:17:43 +02:00
Christian Schabesberger	d8bdada9db	Merge pull request #43 from epitron/master Set the title for external video players	2015-09-25 07:43:46 +02:00
Christian Schabesberger	1b9f7a7654	Merge pull request #40 from ata2001/master Update hungarian translation	2015-09-25 07:42:41 +02:00
Chris Gahan	ac710fff08	Set the title for external video players.	2015-09-23 21:58:41 -04:00
ata2001	2e09492eef	Update hungarian translation	2015-09-23 19:01:09 +02:00
Christian Schabesberger	4f24d61c4b	put the play video button into the horizontal center	2015-09-21 23:53:10 +02:00
Christian Schabesberger	d24c87c9c9	added autio streaming & jumped to version 0.4.0	2015-09-21 21:12:48 +02:00
Christian Schabesberger	1ab5872857	made player pause when screen is locked. started creating audiosupport	2015-09-21 13:32:11 +02:00
=	2489c6c329	Some smaller UI changes and else: - added play video button for better lefthand support - wrote codepart to darkon5s listitem improvements - set minimum api level to 15 (Android 4.0.3 support) - updated to sdk level 23 including the new support libs	2015-09-21 01:10:11 +02:00
Christian Schabesberger	30dcd3eef0	Merge pull request #36 from darkon5/dev 3 Line Search List	2015-09-20 22:30:41 +02:00
Christian Schabesberger	b20ae45280	Merge pull request #34 from darkon5/master Duration now shown on top of the thumbnail.	2015-09-20 19:36:40 +02:00
darkon5	049a42a72d	Changes in dummy text	2015-09-20 18:29:17 +02:00
darkon5	f8c110edb5	Different lines for author and upload date	2015-09-20 18:02:33 +02:00
darkon5	21580a07ee	Merge pull request #4 from darkon5/dev Changed duration box stroke color to grey (like in the official app)	2015-09-20 17:49:28 +02:00
darkon5	231cbacd5b	Changed duration box stroke color to grey (like in the official app)	2015-09-20 17:46:23 +02:00
darkon5	39db33d80d	Merge pull request #3 from darkon5/dev Add Spanish translation	2015-09-20 16:02:56 +02:00
darkon5	39228453a2	Add Spanish translation	2015-09-20 16:01:46 +02:00
darkon5	670a1e4f74	Merge pull request #2 from darkon5/dev Duration now with the thumbnail, more space for upload date	2015-09-20 15:03:45 +02:00
darkon5	5d77d25d34	Duration now with the thumbnail, more space for upload date	2015-09-20 14:52:11 +02:00
Christian Schabesberger	8ebdcccce1	Merge branch 'master' of github.com:theScrabi/NewPipe	2015-09-20 13:20:53 +02:00
Christian Schabesberger	1b0753a466	Merge pull request #25 from ata2001/master Add hungarian translation	2015-09-20 13:20:47 +02:00
Christian Schabesberger	25fe45ab8c	Merge pull request #26 from Soofe/master Add French translation	2015-09-20 13:20:42 +02:00
Christian Schabesberger	ff30b7dc4b	Merge pull request #30 from darkon5/master Update video search list	2015-09-20 13:20:34 +02:00
Christian Schabesberger	26211591bb	Merge branch 'master' of github.com:theScrabi/NewPipe	2015-09-20 13:19:42 +02:00
Christian Schabesberger	c59754499f	new app icon & made player fullscreen work better	2015-09-20 13:19:28 +02:00
darkon5	fc7f5c4254	Merge pull request #1 from darkon5/dev Delete encodings.xml	2015-09-19 22:33:04 +02:00
darkon5	f915291396	Delete encodings.xml	2015-09-19 22:31:43 +02:00
darkon5	41351baf27	Original .idea	2015-09-19 16:54:29 +02:00
darkon5	fd1153993b	Updated dimentxt and video_item	2015-09-19 16:22:36 +02:00
darkon5	7e5ec247de	Prueba inicial y dimentxt	2015-09-19 15:47:00 +02:00
Soofe	7c7cb2c26c	Add French translation	2015-09-18 22:26:21 +02:00
ata2001	25f44aca37	Add hungarian translation	2015-09-18 19:16:32 +02:00
Christian Schabesberger	4be3b54edb	Merge pull request #20 from TheLastProject/dutchTranslation Add Dutch translation	2015-09-16 23:37:01 +02:00
TheLastProject	bc00746047	Add Dutch translation	2015-09-16 17:01:24 +02:00
Christian Schabesberger	d3cc518529	fiexed the very mesed up version number	2015-09-15 22:48:47 +02:00
Christian Schabesberger	08648caaff	fixed landscape layout problem & added watch with kodi function	2015-09-15 20:11:42 +02:00
Christian Schabesberger	b6b0cf15eb	Merge pull request #16 from pejakm/srupd Update Serbian translation	2015-09-14 13:27:17 +02:00
Mladen Pejaković	b8acd70454	Update Serbian translation	2015-09-13 21:58:43 +02:00
Christian Schabesberger	07e7167356	added preference for default resolution	2015-09-12 22:07:02 +02:00
Christian Schabesberger	56e43f411e	Merge pull request #12 from pejakm/srtr Add Serbian translation	2015-09-12 18:20:42 +02:00
Mladen Pejaković	ef155fcfc7	Add Serbian translation	2015-09-11 17:58:10 +02:00
Christian Schabesberger	8dd05d2974	implemented autoplay feature	2015-09-11 09:50:30 +02:00
Christian Schabesberger	fde0b2ae7f	Made youtu.be links be vieweble through NewPipe, and fixed InfoBar design.	2015-09-10 20:42:39 +02:00
Christian Schabesberger	e38f90757a	Made youtu.be links be vieweble through NewPipe, and fixed InfoBar design.	2015-09-10 20:39:50 +02:00