Merge branch 'master' of github.com:theScrabi/NewPipe

Currently translated at 64.2% (36 of 56 strings)

.gitignore

@@ -7,3 +7,4 @@
 /app/app.iml
 /.idea
 /*.iml
+gradle.properties

.travis.yml

@@ -2,15 +2,16 @@ language: android
 android:
   components:
     # The BuildTools version used by NewPipe
-    - build-tools-23.0.1
+    - tools
+    - build-tools-23.0.2
 
     # The SDK version used to compile NewPipe
     - android-23
-    
+
     # Additional components
     - extra-android-support
     - extra-android-m2repository
-   
+
     # Emulators
     - sys-img-armeabi-v7a-android-21
     - sys-img-armeabi-v7a-android-19

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+#Contribution
+
+This document contains guidelines on making contributions to NewPipe.
+
+## Programming
+
+* Follow the [Google Style Guidelines](https://google.github.io/styleguide/javaguide.html)
+* Make a new feature on a separate branch, not on the master branch
+* Make a [pull request](https://github.com/theScrabi/NewPipe/pulls) if you're done with your changes
+* When submitting changes, you agree that your code will be GPLv3 licensed
+
+## Commit messages
+
+* The subject line of your commit message shouldn't be longer than 72 characters
+* Try to keep each line of your commit message 72 characters to ensure proper
+ compatibility with all git tools
+* [This guide](http://chris.beams.io/posts/git-commit/) goes more in depth on what makes a good commit message
+
+## Translation
+
+* NewPipe can be translated on [weblate](https://hosted.weblate.org/projects/newpipe/strings/)
+
+## Issue reporting
+
+* Search the [existing issues](https://github.com/theScrabi/NewPipe/issues) first to make sure your issue hasn't been reported before
+* Check if this issue is already fixed in the repository
+* When making bug reports, be sure to tell which version of NewPipe you are using and the steps to reproduce the problem
+* Please include a log if you can
+
+## Communication
+
+* For the time being, [Slack](http://invite.chschtsch.ml/) is being used for project communication
+* Feel free to post suggestions, changes, ideas etc!

README.md

@@ -13,8 +13,12 @@ Project status:
 
 ## Screenshots
 
-[<img src="assets/screenshot_1.png" width=200>](assets/screenshot_1.png)
-[<img src="assets/screenshot_2.png" width=200>](assets/screenshot_2.png)
+[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
+[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
+[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
+[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
+[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
+[<img src="screenshots/screenshot_6.png" width=250>](screenshots/screenshot_6.png)
 
 ## Description
 
@@ -25,13 +29,14 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Search videos
 * Display general information about a video
 * Watch YouTube videos
-* Listen to YouTube videos (audio only streaming)
+* Listen to YouTube videos (experimental)
 * Select the streaming player to watch the video with
-* Download videos (working, but it could be better)
-* Download audio only (working, but it could be better)
+* Download videos (experimental)
+* Download audio only (experimental)
 * Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
+* Orbot/Tor support (no streaming yet)
 
 ### Coming Features
 
@@ -53,7 +58,7 @@ Although NewPipe only supports YouTube at the moment, it's designed to support m
 Whether you have ideas, translation, design changes, code cleaning, or real heavy code changes, help is always welcome.
 The more is done the better it gets!
 
-Join our [Slack group](http://invite.chschtsch.ml/) if you like to get involved.
+If you'd like to get involved, check our [contribution notes](CONTRIBUTING.md).
 
 ## License
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](http://www.gnu.org/licenses/gpl-3.0.en.html)  

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 7
-        versionName "0.6.1"
+        versionCode 12
+        versionName "0.7.3"
     }
     buildTypes {
         release {
@@ -17,7 +17,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
+
     lintOptions {
         checkReleaseBuilds false
         // Or, if you prefer, you can continue to check for errors in release builds,
@@ -31,6 +31,9 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:support-v4:23.1.1'
     compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:cardview-v7:23.1.1'
+    compile 'com.android.support:recyclerview-v7:23.1.1'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
+    compile 'info.guardianproject.netcipher:netcipher:1.2'
 }

app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngineTest.java

@@ -0,0 +1,89 @@
+package org.schabi.newpipe.services.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.VideoPreviewInfo;
+import org.schabi.newpipe.services.SearchEngine;
+
+import java.util.ArrayList;
+
+/**
+ * Created by the-scrabi on 29.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeSearchEngineTest.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 YoutubeSearchEngineTest extends AndroidTestCase {
+    private SearchEngine.Result result;
+    private ArrayList<String> suggestionReply;
+
+    @Override
+    public void setUp() throws Exception{
+        super.setUp();
+        SearchEngine engine = new YoutubeSearchEngine();
+        result = engine.search("https://www.youtube.com/results?search_query=bla", 0, "de");
+        suggestionReply = engine.suggestionList("hello");
+    }
+
+    public void testIfNoErrorOccur() {
+        assertEquals(result.errorMessage, "");
+    }
+
+    public void testIfListIsNotEmpty() {
+        assertEquals(result.resultList.size() > 0, true);
+    }
+
+    public void testItemsHaveTitle() {
+        for(VideoPreviewInfo i : result.resultList) {
+            assertEquals(i.title.isEmpty(), false);
+        }
+    }
+
+    public void testItemsHaveUploader() {
+        for(VideoPreviewInfo i : result.resultList) {
+            assertEquals(i.uploader.isEmpty(), false);
+        }
+    }
+
+    public void testItemsHaveRightDuration() {
+        for(VideoPreviewInfo i : result.resultList) {
+            assertTrue(i.duration, i.duration.contains(":"));
+        }
+    }
+
+    public void testItemsHaveRightThumbnail() {
+        for (VideoPreviewInfo i : result.resultList) {
+            assertTrue(i.thumbnail_url, i.thumbnail_url.contains("https://"));
+        }
+    }
+
+    public void testItemsHaveRightVideoUrl() {
+        for (VideoPreviewInfo i : result.resultList) {
+            assertTrue(i.webpage_url, i.webpage_url.contains("https://"));
+        }
+    }
+
+    public void testIfSuggestionsAreReplied() {
+        assertEquals(suggestionReply.size() > 0, true);
+    }
+
+    public void testIfSuggestionsAreValid() {
+        for(String s : suggestionReply) {
+            assertTrue(s, !s.isEmpty());
+        }
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeVideoExtractorDefaultTest.java

@@ -0,0 +1,100 @@
+package org.schabi.newpipe.services.youtube;
+
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+import org.schabi.newpipe.services.VideoInfo;
+
+/**
+ * Created by the-scrabi on 30.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeVideoExtractorDefault.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 YoutubeVideoExtractorDefaultTest extends AndroidTestCase {
+    private YoutubeVideoExtractor extractor;
+
+    public void setUp() {
+        extractor = new YoutubeVideoExtractor("https://www.youtube.com/watch?v=FmG385_uUys");
+    }
+
+    public void testGetErrorCode() {
+        assertEquals(extractor.getErrorCode(), VideoInfo.NO_ERROR);
+    }
+
+    public void testGetErrorMessage() {
+        assertEquals(extractor.getErrorMessage(), "");
+    }
+
+    public void testGetTimeStamp() {
+        assertTrue(Integer.toString(extractor.getTimeStamp()),
+                extractor.getTimeStamp() >= 0);
+    }
+
+    public void testGetTitle() {
+        assertTrue(!extractor.getTitle().isEmpty());
+    }
+
+    public void testGetDescription() {
+        assertTrue(extractor.getDescription() != null);
+    }
+
+    public void testGetUploader() {
+        assertTrue(!extractor.getUploader().isEmpty());
+    }
+
+    public void testGetLength() {
+        assertTrue(extractor.getLength() > 0);
+    }
+
+    public void testGetViews() {
+        assertTrue(extractor.getLength() > 0);
+    }
+
+    public void testGetUploadDate() {
+        assertTrue(extractor.getUploadDate().length() > 0);
+    }
+
+    public void testGetThumbnailUrl() {
+        assertTrue(extractor.getThumbnailUrl(),
+                extractor.getThumbnailUrl().contains("https://"));
+    }
+
+    public void testGetUploaderThumbnailUrl() {
+        assertTrue(extractor.getUploaderThumbnailUrl(),
+                extractor.getUploaderThumbnailUrl().contains("https://"));
+    }
+
+    public void testGetAudioStreams() {
+        for(VideoInfo.AudioStream s : extractor.getAudioStreams()) {
+            assertTrue(s.url,
+                    s.url.contains("https://"));
+            assertTrue(s.bandwidth > 0);
+            assertTrue(s.samplingRate > 0);
+        }
+    }
+
+    public void testGetVideoStreams() {
+        for(VideoInfo.VideoStream s : extractor.getVideoStreams()) {
+            assertTrue(s.url,
+                    s.url.contains("https://"));
+            assertTrue(s.resolution.length() > 0);
+            assertTrue(Integer.toString(s.format),
+                    0 <= s.format && s.format <= 4);
+        }
+    }
+}

app/src/androidTest/java/org/schabi/newpipe/services/youtube/YoutubeVideoExtractorGemaTest.java

@@ -0,0 +1,59 @@
+package org.schabi.newpipe.services.youtube;
+
+import android.test.AndroidTestCase;
+
+import org.schabi.newpipe.services.VideoInfo;
+
+/**
+ * Created by the-scrabi on 30.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * YoutubeVideoExtractorGema.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/>.
+ */
+
+
+// This class only works in Germany.
+public class YoutubeVideoExtractorGemaTest extends AndroidTestCase {
+
+    // Deaktivate this Test Case bevore uploading it githup, otherwise CI will fail.
+    private static final boolean testActive = false;
+
+
+    private YoutubeVideoExtractor extractor;
+
+    public void setUp() {
+        if(testActive) {
+            extractor = new YoutubeVideoExtractor("https://www.youtube.com/watch?v=3O1_3zBUKM8");
+        }
+    }
+
+    public void testGetErrorCode() {
+        if(testActive) {
+            assertEquals(extractor.getErrorCode(), VideoInfo.ERROR_BLOCKED_BY_GEMA);
+        } else {
+            assertTrue(true);
+        }
+    }
+
+    public void testGetErrorMessage() {
+        if(testActive) {
+            assertTrue(extractor.getErrorMessage(),
+                    extractor.getErrorMessage().contains("GEMA"));
+        } else {
+            assertTrue(true);
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -2,11 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.schabi.newpipe" >
-
     <uses-permission android:name= "android.permission.INTERNET" />
+    <uses-permission android:name= "android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:logo="@mipmap/ic_launcher"
@@ -15,7 +16,7 @@
         tools:ignore="AllowBackup">
         <activity
             android:name=".VideoItemListActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -29,43 +30,46 @@
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".VideoItemListActivity" />
+
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="www.youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="http"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="m.youtube.com"
-                    android:scheme="https"
-                    android:pathPattern="/?*#*/*watch"/>
-                <data
-                    android:host="youtu.be"
-                    android:scheme="https"
-                    android:pathPrefix="/"/>
-                <data
-                    android:host="youtu.be"
-                    android:scheme="http"
-                    android:pathPrefix="/"/>
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtube.com" />
+                <data android:host="m.youtube.com" />
+                <data android:host="www.youtube.com" />
+                <data android:pathPrefix="/v/" />
+                <data android:pathPrefix="/watch" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="youtu.be" />
+                <data android:pathPrefix="/" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="vnd.youtube" />
+                <data android:scheme="vnd.youtube.launch" />
             </intent-filter>
         </activity>
         <activity android:name=".PlayVideoActivity"
@@ -74,9 +78,26 @@
             android:parentActivityName=".VideoItemDetailActivity"
             tools:ignore="UnusedAttribute">
         </activity>
+        <service
+            android:name=".BackgroundPlayer"
+            android:label="@string/background_player_name"
+            android:exported="false" />
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings" >
+            android:label="@string/settings_activity_title" >
         </activity>
+        <activity
+            android:name=".PanicResponderActivity"
+            android:launchMode="singleInstance"
+            android:noHistory="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="info.guardianproject.panic.action.TRIGGER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ExitActivity"
+            android:theme="@android:style/Theme.NoDisplay" />
     </application>
 </manifest>

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

@@ -3,6 +3,7 @@ package org.schabi.newpipe;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -15,6 +16,9 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.ArrayAdapter;
 
+import org.schabi.newpipe.services.MediaFormat;
+import org.schabi.newpipe.services.VideoInfo;
+
 /**
  * Created by Christian Schabesberger on 18.08.15.
  *
@@ -40,7 +44,10 @@ class ActionBarHandler {
     private static final String TAG = ActionBarHandler.class.toString();
     private static final String KORE_PACKET = "org.xbmc.kore";
 
+    private int serviceId;
     private String websiteUrl = "";
+    private Bitmap videoThumbnail = null;
+    private String channelName = "";
     private AppCompatActivity activity;
     private VideoInfo.VideoStream[] videoStreams = null;
     private VideoInfo.AudioStream audioStream = null;
@@ -73,6 +80,18 @@ class ActionBarHandler {
         }
     }
 
+    public void setServiceId(int id) {
+        serviceId = id;
+    }
+
+    public void setSetVideoThumbnail(Bitmap bitmap) {
+        videoThumbnail = bitmap;
+    }
+
+    public void setChannelName(String name) {
+        channelName = name;
+    }
+
     @SuppressWarnings("deprecation")
     public void setStreams(VideoInfo.VideoStream[] videoStreams, VideoInfo.AudioStream[] audioStreams) {
         this.videoStreams = videoStreams;
@@ -80,8 +99,8 @@ class ActionBarHandler {
         defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
         String[] itemArray = new String[videoStreams.length];
         String defaultResolution = defaultPreferences
-                .getString(activity.getString(R.string.defaultResolutionPreference),
-                        activity.getString(R.string.defaultResolutionListItem));
+                .getString(activity.getString(R.string.default_resolution_key),
+                        activity.getString(R.string.default_resolution_value));
         int defaultResolutionPos = 0;
 
         for(int i = 0; i < videoStreams.length; i++) {
@@ -105,7 +124,7 @@ class ActionBarHandler {
         // set audioStream
         audioStream = null;
         String preferedFormat = defaultPreferences
-                .getString(activity.getString(R.string.defaultAudioFormatPreference), "webm");
+                .getString(activity.getString(R.string.default_audio_format_key), "webm");
         if(preferedFormat.equals("webm")) {
             for(VideoInfo.AudioStream s : audioStreams) {
                 if(s.format == MediaFormat.WEBMA.id) {
@@ -120,6 +139,9 @@ class ActionBarHandler {
                 }
             }
         }
+        else {
+            Log.e(TAG, "FAILED to set audioStream value!");
+        }
     }
 
     private void selectFormatItem(int i) {
@@ -136,41 +158,45 @@ class ActionBarHandler {
         MenuItem castItem = menu.findItem(R.id.action_play_with_kodi);
 
         castItem.setVisible(defaultPreferences
-                .getBoolean(activity.getString(R.string.showPlayWidthKodiPreference), false));
+                .getBoolean(activity.getString(R.string.show_play_with_kodi_key), false));
     }
 
     public boolean onItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        switch(id) {
-            case R.id.menu_item_share:
-                if(!videoTitle.isEmpty()) {
+        if(!videoTitle.isEmpty()) {
+            int id = item.getItemId();
+            switch (id) {
+                case R.id.menu_item_share: {
                     Intent intent = new Intent();
                     intent.setAction(Intent.ACTION_SEND);
                     intent.putExtra(Intent.EXTRA_TEXT, websiteUrl);
                     intent.setType("text/plain");
-                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.shareDialogTitle)));
+                    activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_dialog_title)));
+                    return true;
+                }
+                case R.id.menu_item_openInBrowser: {
+                    openInBrowser();
                 }
                 return true;
-            case R.id.menu_item_openInBrowser: {
-                openInBrowser();
+                case R.id.menu_item_download:
+                    downloadVideo();
+                    return true;
+                case R.id.action_settings: {
+                    Intent intent = new Intent(activity, SettingsActivity.class);
+                    activity.startActivity(intent);
+                }
+                break;
+                case R.id.action_play_with_kodi:
+                    playWithKodi();
+                    return true;
+                case R.id.menu_item_play_audio:
+                    playAudio();
+                    return true;
+                default:
+                    Log.e(TAG, "Menu Item not known");
             }
-                return true;
-            case R.id.menu_item_download:
-                downloadVideo();
-                return true;
-            case R.id.action_settings: {
-                Intent intent = new Intent(activity, SettingsActivity.class);
-                activity.startActivity(intent);
-            }
-            break;
-            case R.id.action_play_with_kodi:
-                playWithKodi();
-                return true;
-            case R.id.menu_item_play_audio:
-                playAudio();
-                return true;
-            default:
-                Log.e(TAG, "Menu Item not known");
+        } else {
+            // That line may not be necessary.
+            return true;
         }
         return false;
     }
@@ -184,7 +210,7 @@ class ActionBarHandler {
         // ----------- THE MAGIC MOMENT ---------------
         if(!videoTitle.isEmpty()) {
             if (PreferenceManager.getDefaultSharedPreferences(activity)
-                    .getBoolean(activity.getString(R.string.useExternalPlayer), false)) {
+                    .getBoolean(activity.getString(R.string.use_external_video_player_key), false)) {
 
                 // External Player
                 Intent intent = new Intent();
@@ -200,13 +226,13 @@ class ActionBarHandler {
                 } catch (Exception e) {
                     e.printStackTrace();
                     AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                    builder.setMessage(R.string.noPlayerFound)
-                            .setPositiveButton(R.string.installStreamPlayer, new DialogInterface.OnClickListener() {
+                    builder.setMessage(R.string.no_player_found)
+                            .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
                                     Intent intent = new Intent();
                                     intent.setAction(Intent.ACTION_VIEW);
-                                    intent.setData(Uri.parse(activity.getString(R.string.fdroidVLCurl)));
+                                    intent.setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
                                     activity.startActivity(intent);
                                 }
                             })
@@ -258,7 +284,7 @@ class ActionBarHandler {
             intent.setAction(Intent.ACTION_VIEW);
             intent.setData(Uri.parse(websiteUrl));
 
-            activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.chooseBrowser)));
+            activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.choose_browser)));
         }
     }
 
@@ -272,13 +298,13 @@ class ActionBarHandler {
             } catch (Exception e) {
                 e.printStackTrace();
                 AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-                builder.setMessage(R.string.koreNotFound)
-                        .setPositiveButton(R.string.installeKore, new DialogInterface.OnClickListener() {
+                builder.setMessage(R.string.kore_not_found)
+                        .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 Intent intent = new Intent();
                                 intent.setAction(Intent.ACTION_VIEW);
-                                intent.setData(Uri.parse(activity.getString(R.string.fdroidKoreUrl)));
+                                intent.setData(Uri.parse(activity.getString(R.string.fdroid_kore_url)));
                                 activity.startActivity(intent);
                             }
                         })
@@ -293,37 +319,63 @@ class ActionBarHandler {
         }
     }
 
-    private void playAudio() {
-        Intent intent = new Intent();
-        try {
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setDataAndType(Uri.parse(audioStream.url),
-                    MediaFormat.getMimeById(audioStream.format));
-            intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
-            intent.putExtra("title", videoTitle);
-            activity.startActivity(intent);      // HERE !!!
-        } catch (Exception e) {
-            e.printStackTrace();
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-            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(activity.getString(R.string.fdroidVLCurl)));
-                            activity.startActivity(intent);
-                        }
-                    })
-                    .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            Log.i(TAG, "You unlocked a secret unicorn.");
-                        }
-                    });
-            builder.create().show();
-            Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
-            e.printStackTrace();
+    public void playAudio() {
+
+        boolean externalAudioPlayer = PreferenceManager.getDefaultSharedPreferences(activity)
+                .getBoolean(activity.getString(R.string.use_external_audio_player_key), false);
+        Intent intent;
+
+        if (!externalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 18) {
+            //internal music player: explicit intent
+            if (!BackgroundPlayer.isRunning  && videoThumbnail != null) {
+                ActivityCommunicator.getCommunicator()
+                        .backgroundPlayerThumbnail = videoThumbnail;
+                intent = new Intent(activity, BackgroundPlayer.class);
+
+                intent.setAction(Intent.ACTION_VIEW);
+                Log.i(TAG, "audioStream is null:" + (audioStream == null));
+                Log.i(TAG, "audioStream.url is null:" + (audioStream.url == null));
+                intent.setDataAndType(Uri.parse(audioStream.url),
+                        MediaFormat.getMimeById(audioStream.format));
+                intent.putExtra(BackgroundPlayer.TITLE, videoTitle);
+                intent.putExtra(BackgroundPlayer.WEB_URL, websiteUrl);
+                intent.putExtra(BackgroundPlayer.SERVICE_ID, serviceId);
+                intent.putExtra(BackgroundPlayer.CHANNEL_NAME, channelName);
+                activity.startService(intent);
+            }
+        } else {
+            intent = new Intent();
+            try {
+                intent.setAction(Intent.ACTION_VIEW);
+                intent.setDataAndType(Uri.parse(audioStream.url),
+                        MediaFormat.getMimeById(audioStream.format));
+                intent.putExtra(Intent.EXTRA_TITLE, videoTitle);
+                intent.putExtra("title", videoTitle);
+
+                activity.startActivity(intent);      // HERE !!!
+            } catch (Exception e) {
+                e.printStackTrace();
+                AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+                builder.setMessage(R.string.no_player_found)
+                        .setPositiveButton(R.string.install, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Intent intent = new Intent();
+                                intent.setAction(Intent.ACTION_VIEW);
+                                intent.setData(Uri.parse(activity.getString(R.string.fdroid_vlc_url)));
+                                activity.startActivity(intent);
+                            }
+                        })
+                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Log.i(TAG, "You unlocked a secret unicorn.");
+                            }
+                        });
+                builder.create().show();
+                Log.e(TAG, "Either no Streaming player for audio was installed, or something important crashed:");
+                e.printStackTrace();
+            }
         }
     }
 }

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

@@ -0,0 +1,42 @@
+package org.schabi.newpipe;
+
+/**
+ * Created by Christian Schabesberger on 24.12.15.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * ActivityCommunicator.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/>.
+ */
+
+import android.graphics.Bitmap;
+
+/**
+ * Singleton:
+ * Used to send data between certain Activity/Services within the same process.
+ * This can be considered as hack inside the Android universe. **/
+public class ActivityCommunicator {
+
+    private static ActivityCommunicator activityCommunicator = null;
+
+    public static ActivityCommunicator getCommunicator() {
+        if(activityCommunicator == null) {
+            activityCommunicator = new ActivityCommunicator();
+        }
+        return activityCommunicator;
+    }
+
+    // Thumbnail send from VideoItemDetailFragment to BackgroundPlayer
+    public volatile Bitmap backgroundPlayerThumbnail;
+}

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

@@ -0,0 +1,71 @@
+package org.schabi.newpipe;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import info.guardianproject.netcipher.NetCipher;
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
+/**
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * App.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 App extends Application {
+
+    private static boolean useTor;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if(prefs.getBoolean(getString(R.string.use_tor_key), false)) {
+            OrbotHelper.requestStartTor(this);
+            configureTor(true);
+        } else {
+            configureTor(false);
+        }
+
+        // DO NOT REMOVE THIS FUNCTION!!!
+        // Otherwise downloadPathPreference has invalid value.
+        SettingsActivity.initSettings(this);
+    }
+
+    /**
+     * Set the proxy settings based on whether Tor should be enabled or not.
+     */
+    static void configureTor(boolean enabled) {
+        useTor = enabled;
+        if (useTor) {
+            NetCipher.useTor();
+        } else {
+            NetCipher.setProxy(null);
+        }
+    }
+
+    static void checkStartTor(Context context) {
+        if (useTor) {
+            OrbotHelper.requestStartTor(context);
+        }
+    }
+
+    static boolean isUsingTor() {
+        return useTor;
+    }
+}

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

@@ -0,0 +1,357 @@
+package org.schabi.newpipe;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.net.wifi.WifiManager;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.support.v7.app.NotificationCompat;
+import android.util.Log;
+import android.widget.RemoteViews;
+import android.widget.Toast;
+
+import java.io.IOException;
+
+/**
+ * Created by Adam Howard on 08/11/15.
+ * Copyright (c) Adam Howard <achdisposable1@gmail.com> 2015
+ *
+ * BackgroundPlayer.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/>.
+ */
+
+/**Plays the audio stream of videos in the background.*/
+public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPreparedListener*/ {
+
+    private static final String TAG = BackgroundPlayer.class.toString();
+    private static final String ACTION_STOP = TAG + ".STOP";
+    private static final String ACTION_PLAYPAUSE = TAG + ".PLAYPAUSE";
+
+    // Extra intent arguments
+    public static final String TITLE = "title";
+    public static final String WEB_URL = "web_url";
+    public static final String SERVICE_ID = "service_id";
+    public static final String CHANNEL_NAME="channel_name";
+
+    private volatile String webUrl = "";
+    private volatile int serviceId = -1;
+    private volatile String channelName = "";
+
+    // Determines if the service is already running.
+    // Prevents launching the service twice.
+    public static volatile boolean isRunning = false;
+
+    public BackgroundPlayer() {
+        super();
+    }
+
+    @Override
+    public void onCreate() {
+        /*PendingIntent pi = PendingIntent.getActivity(this, 0,
+                new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);*/
+        super.onCreate();
+    }
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Toast.makeText(this, R.string.background_player_playing_toast,
+                Toast.LENGTH_SHORT).show();
+
+        String source = intent.getDataString();
+        //Log.i(TAG, "backgroundPLayer source:"+source);
+        String videoTitle = intent.getStringExtra(TITLE);
+        webUrl = intent.getStringExtra(WEB_URL);
+        serviceId = intent.getIntExtra(SERVICE_ID, -1);
+        channelName = intent.getStringExtra(CHANNEL_NAME);
+
+        //do nearly everything in a separate thread
+        PlayerThread player = new PlayerThread(source, videoTitle, this);
+        player.start();
+
+        isRunning = true;
+
+        // If we get killed after returning here, don't restart
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        // We don't provide binding (yet?), so return null
+        return null;
+    }
+
+    @Override
+    public void onDestroy() {
+        //Toast.makeText(this, "service done", Toast.LENGTH_SHORT).show();
+        isRunning = false;
+    }
+
+    private class PlayerThread extends Thread {
+        MediaPlayer mediaPlayer;
+        private String source;
+        private String title;
+        private int noteID = TAG.hashCode();
+        private BackgroundPlayer owner;
+        private NotificationManager noteMgr;
+        private WifiManager.WifiLock wifiLock;
+        private Bitmap videoThumbnail = null;
+        private NotificationCompat.Builder noteBuilder;
+
+        public PlayerThread(String src, String title, BackgroundPlayer owner) {
+            this.source = src;
+            this.title = title;
+            this.owner = owner;
+            mediaPlayer = new MediaPlayer();
+            mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+        }
+
+        @Override
+        public void run() {
+            mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);//cpu lock
+            try {
+                mediaPlayer.setDataSource(source);
+                //We are already in a separate worker thread,
+                //so calling the blocking prepare() method should be ok
+                mediaPlayer.prepare();
+
+            } catch (IOException ioe) {
+                ioe.printStackTrace();
+                Log.e(TAG, "video source:" + source);
+                Log.e(TAG, "video title:" + title);
+                //can't do anything useful without a file to play; exit early
+                return;
+            }
+
+            try {
+                videoThumbnail = ActivityCommunicator.getCommunicator().backgroundPlayerThumbnail;
+            } catch (Exception e) {
+                Log.e(TAG, "Could not get video thumbnail from ActivityCommunicator");
+                e.printStackTrace();
+            }
+
+            WifiManager wifiMgr = ((WifiManager)getSystemService(Context.WIFI_SERVICE));
+            wifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG);
+
+            //listen for end of video
+            mediaPlayer.setOnCompletionListener(new EndListener(wifiLock));
+
+            //get audio focus
+            /*
+            AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+            int result = audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC,
+                    AudioManager.AUDIOFOCUS_GAIN);
+
+            if (result != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+                // could not get audio focus.
+            }*/
+            wifiLock.acquire();
+            mediaPlayer.start();
+
+            IntentFilter filter = new IntentFilter();
+            filter.setPriority(Integer.MAX_VALUE);
+            filter.addAction(ACTION_PLAYPAUSE);
+            filter.addAction(ACTION_STOP);
+            registerReceiver(broadcastReceiver, filter);
+
+            Notification note = buildNotification();
+
+            startForeground(noteID, note);
+
+            //currently decommissioned progressbar looping update code - works, but doesn't fit inside
+            //Notification.MediaStyle Notification layout.
+            noteMgr = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
+            /*
+            //update every 2s or 4 times in the video, whichever is shorter
+            int sleepTime = Math.min(2000, (int)((double)vidLength/4));
+            while(mediaPlayer.isPlaying()) {
+                noteBuilder.setProgress(vidLength, mediaPlayer.getCurrentPosition(), false);
+                noteMgr.notify(noteID, noteBuilder.build());
+                try {
+                    Thread.sleep(sleepTime);
+                } catch (InterruptedException e) {
+                    Log.d(TAG, "sleep failure");
+                }
+            }*/
+        }
+
+        /**Handles button presses from the notification. */
+        private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                String action = intent.getAction();
+                //Log.i(TAG, "received broadcast action:"+action);
+                if(action.equals(ACTION_PLAYPAUSE)) {
+                    if(mediaPlayer.isPlaying()) {
+                        mediaPlayer.pause();
+                    }
+                    else {
+                        //reacquire CPU lock after auto-releasing it on pause
+                        mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
+                        mediaPlayer.start();
+                    }
+                }
+                else if(action.equals(ACTION_STOP)) {
+                    //this auto-releases CPU lock
+                    mediaPlayer.stop();
+                    afterPlayCleanup();
+                }
+            }
+        };
+
+        private void afterPlayCleanup() {
+            //remove progress bar
+            //noteBuilder.setProgress(0, 0, false);
+
+            //remove notification
+            noteMgr.cancel(noteID);
+            unregisterReceiver(broadcastReceiver);
+            //release mediaPlayer's system resources
+            mediaPlayer.release();
+
+            //release wifilock
+            wifiLock.release();
+            //remove foreground status of service; make BackgroundPlayer killable
+            stopForeground(true);
+
+            stopSelf();
+        }
+
+        private class EndListener implements MediaPlayer.OnCompletionListener {
+            private WifiManager.WifiLock wl;
+            public EndListener(WifiManager.WifiLock wifiLock) {
+                this.wl = wifiLock;
+            }
+
+            @Override
+            public void onCompletion(MediaPlayer mp) {
+                afterPlayCleanup();
+            }
+        }
+
+        private Notification buildNotification() {
+            Notification note;
+            Resources res = getApplicationContext().getResources();
+            noteBuilder = new NotificationCompat.Builder(owner);
+
+            PendingIntent playPI = PendingIntent.getBroadcast(owner, noteID,
+                    new Intent(ACTION_PLAYPAUSE), PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent stopPI = PendingIntent.getBroadcast(owner, noteID,
+                    new Intent(ACTION_STOP), PendingIntent.FLAG_UPDATE_CURRENT);
+            /*
+            NotificationCompat.Action pauseButton = new NotificationCompat.Action.Builder
+                    (R.drawable.ic_pause_white_24dp, "Pause", playPI).build();
+            */
+
+            //build intent to return to video, on tapping notification
+            Intent openDetailView = new Intent(getApplicationContext(),
+                    VideoItemDetailActivity.class);
+            openDetailView.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, serviceId);
+            openDetailView.putExtra(VideoItemDetailFragment.VIDEO_URL, webUrl);
+            openDetailView.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            noteBuilder
+                    .setOngoing(true)
+                    .setDeleteIntent(stopPI)
+                            //doesn't fit with Notification.MediaStyle
+                            //.setProgress(vidLength, 0, false)
+                    .setSmallIcon(R.drawable.ic_play_circle_filled_white_24dp)
+                    .setTicker(
+                            String.format(res.getString(
+                                    R.string.background_player_time_text), title))
+                    .setContentIntent(PendingIntent.getActivity(getApplicationContext(),
+                            noteID, openDetailView,
+                            PendingIntent.FLAG_UPDATE_CURRENT));
+
+
+            if (android.os.Build.VERSION.SDK_INT < 21) {
+
+                NotificationCompat.Action playButton = new NotificationCompat.Action.Builder
+                        (R.drawable.ic_play_arrow_white_48dp,
+                                res.getString(R.string.play_btn_text), playPI).build();
+
+                noteBuilder
+                        .setContentTitle(title)
+                                //really? Id like to put something more helpful here.
+                                //was more of a placeholder than anything else. -medavox
+                                //.setContentText("NewPipe is playing in the background")
+                        .setContentText(channelName)
+                                //.setAutoCancel(!mediaPlayer.isPlaying())
+                        .setDeleteIntent(stopPI)
+                                //doesn't fit with Notification.MediaStyle
+                                //.setProgress(vidLength, 0, false)
+                        .setLargeIcon(videoThumbnail)
+                        .addAction(playButton);
+                        //.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                        //.setLargeIcon(cover)
+
+                //is wrapping this in an SDK version check really necessary,
+                // if we're using NotificationCompat?
+                // the compat libraries should handle this, right? -medavox
+                if (android.os.Build.VERSION.SDK_INT >= 16)
+                    noteBuilder.setPriority(Notification.PRIORITY_LOW);
+
+                noteBuilder.setStyle(new NotificationCompat.MediaStyle()
+                        //.setMediaSession(mMediaSession.getSessionToken())
+                        .setShowActionsInCompactView(new int[]{0})
+                        .setShowCancelButton(true)
+                        .setCancelButtonIntent(stopPI));
+                if (videoThumbnail != null) {
+                    noteBuilder.setLargeIcon(videoThumbnail);
+                }
+                note = noteBuilder.build();
+            } else {
+                RemoteViews view =
+                        new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification);
+                view.setImageViewBitmap(R.id.backgroundCover, videoThumbnail);
+                view.setTextViewText(R.id.backgroundSongName, title);
+                view.setTextViewText(R.id.backgroundArtist, channelName);
+                view.setOnClickPendingIntent(R.id.backgroundStop, stopPI);
+                view.setOnClickPendingIntent(R.id.backgroundPlayPause, playPI);
+
+                //possibly found the expandedView problem,
+                //but can't test it as I don't have a 5.0 device. -medavox
+                RemoteViews expandedView =
+                        new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification_expanded);
+                expandedView.setImageViewBitmap(R.id.backgroundCover, videoThumbnail);
+                expandedView.setTextViewText(R.id.backgroundSongName, title);
+                expandedView.setTextViewText(R.id.backgroundArtist, channelName);
+                expandedView.setOnClickPendingIntent(R.id.backgroundStop, stopPI);
+                expandedView.setOnClickPendingIntent(R.id.backgroundPlayPause, playPI);
+
+                noteBuilder.setCategory(Notification.CATEGORY_TRANSPORT);
+
+                //Make notification appear on lockscreen
+                noteBuilder.setVisibility(Notification.VISIBILITY_PUBLIC);
+
+                note = noteBuilder.build();
+                note.contentView = view;
+
+                //todo: This never shows up. I was not able to figure out why:
+                note.bigContentView = expandedView;
+            }
+
+            return note;
+        }
+    }
+}

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

@@ -1,19 +1,29 @@
 package org.schabi.newpipe;
 
+import android.Manifest;
+import android.app.Activity;
 import android.app.Dialog;
 import android.app.DownloadManager;
+import android.app.Notification;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.DialogFragment;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.util.Log;
+import android.widget.Toast;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by Christian Schabesberger on 21.09.15.
@@ -50,42 +60,95 @@ public class DownloadDialog extends DialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         arguments = getArguments();
         super.onCreateDialog(savedInstanceState);
+        if(ContextCompat.checkSelfPermission(this.getContext(),Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
+            ActivityCompat.requestPermissions(getActivity(),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},0);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(R.string.downloadDialogTitle)
-                .setItems(R.array.downloadOptions, new DialogInterface.OnClickListener() {
+        builder.setTitle(R.string.download_dialog_title)
+                .setItems(R.array.download_options, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         Context context = getActivity();
-                        SharedPreferences defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+                        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
                         String suffix = "";
                         String title = arguments.getString(TITLE);
                         String url = "";
+                        File downloadDir = NewPipeSettings.getDownloadFolder();
                         switch(which) {
                             case 0:     // Video
                                 suffix = arguments.getString(FILE_SUFFIX_VIDEO);
                                 url = arguments.getString(VIDEO_URL);
+                                downloadDir = NewPipeSettings.getVideoDownloadFolder(context);
                                 break;
                             case 1:
                                 suffix = arguments.getString(FILE_SUFFIX_AUDIO);
                                 url = arguments.getString(AUDIO_URL);
+                                downloadDir = NewPipeSettings.getAudioDownloadFolder(context);
                                 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();
+                        if(!downloadDir.exists()) {
+                            //attempt to create directory
+                            boolean mkdir = downloadDir.mkdirs();
+                            if(!mkdir && !downloadDir.isDirectory()) {
+                                String message = context.getString(R.string.err_dir_create,downloadDir.toString());
+                                Log.e(TAG, message);
+                                Toast.makeText(context,message , Toast.LENGTH_LONG).show();
+
+                                return;
+                            }
+                            String message = context.getString(R.string.info_dir_created,downloadDir.toString());
+                            Log.e(TAG, message);
+                            Toast.makeText(context,message , Toast.LENGTH_LONG).show();
                         }
+
+                        File saveFilePath = new File(downloadDir,createFileName(title) + suffix);
+
+                        long id = 0;
+                        if (App.isUsingTor()) {
+                            // if using Tor, do not use DownloadManager because the proxy cannot be set
+                            Downloader.downloadFile(getContext(), url, saveFilePath, title);
+                        } else {
+                            DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+                            DownloadManager.Request request = new DownloadManager.Request(
+                                    Uri.parse(url));
+                            request.setDestinationUri(Uri.fromFile(saveFilePath));
+                            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+
+                            request.setTitle(title);
+                            request.setDescription("'" + url +
+                                    "' => '" + saveFilePath + "'");
+                            request.allowScanningByMediaScanner();
+
+                            try {
+                                id = dm.enqueue(request);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+
+                        Log.i(TAG,"Started downloading '" + url +
+                                "' => '" + saveFilePath + "' #" + id);
                     }
                 });
         return builder.create();
     }
 
+    /**
+     * #143 #44 #42 #22: make shure that the filename does not contain illegal chars.
+     * This should fix some of the "cannot download" problems.
+     * */
+    private String createFileName(String fName) {
+        // from http://eng-przemelek.blogspot.de/2009/07/how-to-create-valid-file-name.html
+
+        List<String> forbiddenCharsPatterns = new ArrayList<String> ();
+        forbiddenCharsPatterns.add("[:]+"); // Mac OS, but it looks that also Windows XP
+        forbiddenCharsPatterns.add("[\\*\"/\\\\\\[\\]\\:\\;\\|\\=\\,]+");  // Windows
+        forbiddenCharsPatterns.add("[^\\w\\d\\.]+");  // last chance... only latin letters and digits
+        String nameToTest = fName;
+        for (String pattern : forbiddenCharsPatterns) {
+            nameToTest = nameToTest.replaceAll(pattern, "_");
+        }
+        return nameToTest;
+    }
 }

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

@@ -1,12 +1,31 @@
 package org.schabi.newpipe;
 
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+
+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.UnknownHostException;
 
+import javax.net.ssl.HttpsURLConnection;
+
+import info.guardianproject.netcipher.NetCipher;
+
 /**
  * Created by Christian Schabesberger on 14.08.15.
  *
@@ -27,10 +46,32 @@ import java.net.UnknownHostException;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class Downloader {
-
+public class Downloader extends AsyncTask<Void, Integer, Void> {
+    public static final String TAG = "Downloader";
     private static final String USER_AGENT = "Mozilla/5.0";
 
+    private NotificationManager nm;
+    private NotificationCompat.Builder builder;
+    private int notifyId = 0x1234;
+    private int fileSize = 0xffffffff;
+
+    private final Context context;
+    private final String fileURL;
+    private final File saveFilePath;
+    private final String title;
+
+    private final String debugContext;
+
+    public Downloader(Context context, String fileURL, File saveFilePath, String title) {
+        this.context = context;
+        this.fileURL = fileURL;
+        this.saveFilePath = saveFilePath;
+        this.title = title;
+
+        this.debugContext = "'" + fileURL +
+                "' => '" + saveFilePath + "'";
+    }
+
     /**Download the text file at the supplied URL as in download(String),
      * but set the HTTP header field "Accept-Language" to the supplied string.
      * @param siteUrl the URL of the text file to return the contents of
@@ -40,7 +81,7 @@ public class Downloader {
         String ret = "";
         try {
             URL url = new URL(siteUrl);
-            HttpURLConnection con = (HttpURLConnection) url.openConnection();
+            HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
             con.setRequestProperty("Accept-Language", language);
             ret = dl(con);
         }
@@ -49,8 +90,9 @@ public class Downloader {
         }
         return ret;
     }
+
     /**Common functionality between download(String url) and download(String url, String language)*/
-    private static String dl(HttpURLConnection con) throws IOException {
+    private static String dl(HttpsURLConnection con) throws IOException {
         StringBuilder response = new StringBuilder();
 
         try {
@@ -84,7 +126,7 @@ public class Downloader {
 
         try {
             URL url = new URL(siteUrl);
-            HttpURLConnection con = (HttpURLConnection) url.openConnection();
+            HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
             ret = dl(con);
         }
         catch(Exception e) {
@@ -93,4 +135,102 @@ public class Downloader {
 
         return ret;
     }
+
+    /**
+     * Downloads a file from a URL in the background using an {@link AsyncTask}.
+     *
+     * @param fileURL      HTTP URL of the file to be downloaded
+     * @param saveFilePath path of the directory to save the file
+     * @param title
+     * @throws IOException
+     */
+    public static void downloadFile(final Context context, final String fileURL, final File saveFilePath, String title) {
+        new Downloader(context, fileURL, saveFilePath, title).execute();
+    }
+
+    /** AsyncTask impl: executed in gui thread */
+    @Override
+    protected void onPreExecute() {
+        super.onPreExecute();
+        nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        Drawable icon = context.getResources().getDrawable(R.mipmap.ic_launcher);
+        builder = new NotificationCompat.Builder(context)
+                .setSmallIcon(android.R.drawable.stat_sys_download)
+                .setLargeIcon(((BitmapDrawable) icon).getBitmap())
+                .setContentTitle(saveFilePath.getName())
+                .setContentText(saveFilePath.getAbsolutePath())
+                .setProgress(fileSize, 0, false);
+        nm.notify(notifyId, builder.build());
+    }
+
+    /** AsyncTask impl: executed in background thread does the download */
+    @Override
+    protected Void doInBackground(Void... voids) {
+        HttpsURLConnection con = null;
+        InputStream inputStream = null;
+        FileOutputStream outputStream = null;
+        try {
+            con = NetCipher.getHttpsURLConnection(fileURL);
+            int responseCode = con.getResponseCode();
+
+            // always check HTTP response code first
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                fileSize = con.getContentLength();
+                inputStream = new BufferedInputStream(con.getInputStream());
+                outputStream = new FileOutputStream(saveFilePath);
+
+                int bufferSize = 8192;
+                int downloaded = 0;
+
+                int bytesRead = -1;
+                byte[] buffer = new byte[bufferSize];
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                    downloaded += bytesRead;
+                    if (downloaded % 50000 < bufferSize) {
+                        publishProgress(downloaded);
+                    }
+                }
+
+                publishProgress(bufferSize);
+
+            } else {
+                Log.i(TAG, "No file to download. Server replied HTTP code: " + responseCode);
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "No file to download. Server replied HTTP code: ", e);
+            e.printStackTrace();
+        } finally {
+            try {
+                if (outputStream != null) {
+                    outputStream.close();
+                    outputStream = null;
+                }
+                if (inputStream != null) {
+                    inputStream.close();
+                    inputStream = null;
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            if (con != null) {
+                con.disconnect();
+                con = null;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    protected void onProgressUpdate(Integer... progress) {
+        builder.setProgress(fileSize, progress[0], false);
+        nm.notify(notifyId, builder.build());
+    }
+
+    @Override
+    protected void onPostExecute(Void aVoid) {
+        super.onPostExecute(aVoid);
+        nm.cancel(notifyId);
+    }
+
 }

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

@@ -0,0 +1,54 @@
+
+package org.schabi.newpipe;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+
+/**
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * ExitActivity.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 ExitActivity extends Activity {
+
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            finishAndRemoveTask();
+        } else {
+            finish();
+        }
+
+        System.exit(0);
+    }
+
+    public static void exitAndRemoveFromRecentApps(Activity activity) {
+        Intent intent = new Intent(activity, ExitActivity.class);
+
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+                | Intent.FLAG_ACTIVITY_CLEAR_TASK
+                | Intent.FLAG_ACTIVITY_NO_ANIMATION);
+
+        activity.startActivity(intent);
+    }
+}

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

@@ -0,0 +1,93 @@
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.preference.PreferenceManager;
+
+import java.text.DateFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Created by chschtsch on 12/29/15.
+ *
+ * Copyright (C) Gregory Arkhipov 2015
+ * Localization.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 Localization {
+
+    public static Locale getPreferredLocale(Context context) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+
+        String languageCode = sp.getString(String.valueOf(R.string.search_language_key),
+                context.getString(R.string.default_language_value));
+
+        if(languageCode.length() == 2) {
+            return new Locale(languageCode);
+        }
+        else if(languageCode.contains("_")) {
+            String country = languageCode
+                    .substring(languageCode.indexOf("_"), languageCode.length());
+            return new Locale(languageCode.substring(0, 2), country);
+        }
+        return Locale.getDefault();
+    }
+
+    public static String localizeViewCount(long viewCount, Context context) {
+        Locale locale = getPreferredLocale(context);
+
+        Resources res = context.getResources();
+        String viewsString = res.getString(R.string.view_count_text);
+
+        NumberFormat nf = NumberFormat.getInstance(locale);
+        String formattedViewCount = nf.format(viewCount);
+        return String.format(viewsString, formattedViewCount);
+    }
+
+    public static String localizeNumber(long number, Context context) {
+        Locale locale = getPreferredLocale(context);
+        NumberFormat nf = NumberFormat.getInstance(locale);
+        return nf.format(number);
+    }
+
+    private static String formatDate(String date, Context context) {
+        Locale locale = getPreferredLocale(context);
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        Date datum = null;
+        try {
+            datum = formatter.parse(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
+
+        return df.format(datum);
+    }
+
+    public static String localizeDate(String date, Context context) {
+        Resources res = context.getResources();
+        String dateString = res.getString(R.string.upload_date_text);
+
+        String formattedDate = formatDate(date, context);
+        return String.format(dateString, formattedDate);
+    }
+}

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

@@ -0,0 +1,72 @@
+/**
+ * Created by k3b on 07.01.2016.
+ *
+ * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * NewPipeSettings.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/>.
+ */
+
+package org.schabi.newpipe;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.io.File;
+
+/**
+ * Helper for global settings
+ */
+public class NewPipeSettings {
+    public static void initSettings(Context context) {
+        PreferenceManager.setDefaultValues(context, R.xml.settings, false);
+        getVideoDownloadFolder(context);
+        getAudioDownloadFolder(context);
+    }
+
+    public static File getDownloadFolder() {
+        return getFolder(Environment.DIRECTORY_DOWNLOADS);
+    }
+
+    public static File getVideoDownloadFolder(Context context) {
+        return getFolder(context, R.string.download_path_key, Environment.DIRECTORY_MOVIES);
+    }
+
+    public static File getAudioDownloadFolder(Context context) {
+        return getFolder(context, R.string.download_path_audio_key, Environment.DIRECTORY_MUSIC);
+    }
+
+    private static File getFolder(Context context, int keyID, String defaultDirectoryName) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        final String key = context.getString(keyID);
+        String downloadPath = prefs.getString(key, null);
+        if ((downloadPath != null) && (!downloadPath.isEmpty())) return new File(downloadPath.trim());
+
+        final File folder = getFolder(defaultDirectoryName);
+        SharedPreferences.Editor spEditor = prefs.edit();
+        spEditor.putString(key
+                , new File(folder,"NewPipe").getAbsolutePath());
+        spEditor.apply();
+        return folder;
+    }
+
+    @NonNull
+    private static File getFolder(String defaultDirectoryName) {
+        return new File(Environment.getExternalStorageDirectory(),defaultDirectoryName);
+    }
+}

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

@@ -0,0 +1,50 @@
+
+package org.schabi.newpipe;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+
+/**
+ * Copyright (C) Hans-Christoph Steiner 2016 <hans@eds.org>
+ * PanicResponderActivity.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 PanicResponderActivity extends Activity {
+
+    public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
+
+    @SuppressLint("NewApi")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
+            // TODO explicitly clear the search results once they are restored when the app restarts
+            // or if the app reloads the current video after being killed, that should be cleared also
+            ExitActivity.exitAndRemoveFromRecentApps(this);
+        }
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            finishAndRemoveTask();
+        } else {
+            finish();
+        }
+    }
+}

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

@@ -187,6 +187,18 @@ public class PlayVideoActivity extends AppCompatActivity {
         videoView.pause();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        prefs = getPreferences(Context.MODE_PRIVATE);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
@@ -199,7 +211,7 @@ public class PlayVideoActivity extends AppCompatActivity {
                 intent.setAction(Intent.ACTION_SEND);
                 intent.putExtra(Intent.EXTRA_TEXT, videoUrl);
                 intent.setType("text/plain");
-                startActivity(Intent.createChooser(intent, getString(R.string.shareDialogTitle)));
+                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
                 break;
             case R.id.menu_item_screen_rotation:
                 toggleOrientation();

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

@@ -1,10 +1,15 @@
 package org.schabi.newpipe;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Environment;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
@@ -17,6 +22,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
 /**
  * Created by Christian Schabesberger on 31.08.15.
  *
@@ -37,8 +44,9 @@ import android.view.ViewGroup;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class SettingsActivity extends PreferenceActivity {
+public class SettingsActivity extends PreferenceActivity  {
 
+    private static final int REQUEST_INSTALL_ORBOT = 0x1234;
     private AppCompatDelegate mDelegate = null;
 
     @Override
@@ -55,12 +63,108 @@ public class SettingsActivity extends PreferenceActivity {
 
     }
 
-    public static class SettingsFragment extends PreferenceFragment {
+    public static class SettingsFragment extends PreferenceFragment{
+        SharedPreferences.OnSharedPreferenceChangeListener prefListener;
+
+        // get keys
+        String DEFAULT_RESOLUTION_PREFERENCE;
+        String DEFAULT_AUDIO_FORMAT_PREFERENCE;
+        String SEARCH_LANGUAGE_PREFERENCE;
+        String DOWNLOAD_PATH_PREFERENCE;
+        String DOWNLOAD_PATH_AUDIO_PREFERENCE;
+        String USE_TOR_KEY;
+
+        private ListPreference defaultResolutionPreference;
+        private ListPreference defaultAudioFormatPreference;
+        private ListPreference searchLanguagePreference;
+        private EditTextPreference downloadPathPreference;
+        private EditTextPreference downloadPathAudioPreference;
+        private CheckBoxPreference useTorCheckBox;
+        private SharedPreferences defaultPreferences;
+
+
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.settings_screen);
+            addPreferencesFromResource(R.xml.settings);
+
+            final Activity activity = getActivity();
+
+            defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
+
+            // get keys
+            DEFAULT_RESOLUTION_PREFERENCE =getString(R.string.default_resolution_key);
+            DEFAULT_AUDIO_FORMAT_PREFERENCE =getString(R.string.default_audio_format_key);
+            SEARCH_LANGUAGE_PREFERENCE =getString(R.string.search_language_key);
+            DOWNLOAD_PATH_PREFERENCE = getString(R.string.download_path_key);
+            DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
+            USE_TOR_KEY = getString(R.string.use_tor_key);
+
+            // get pref objects
+            defaultResolutionPreference =
+                    (ListPreference) findPreference(DEFAULT_RESOLUTION_PREFERENCE);
+            defaultAudioFormatPreference =
+                    (ListPreference) findPreference(DEFAULT_AUDIO_FORMAT_PREFERENCE);
+            searchLanguagePreference =
+                    (ListPreference) findPreference(SEARCH_LANGUAGE_PREFERENCE);
+            downloadPathPreference =
+                    (EditTextPreference) findPreference(DOWNLOAD_PATH_PREFERENCE);
+            downloadPathAudioPreference =
+                    (EditTextPreference) findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+            useTorCheckBox = (CheckBoxPreference) findPreference(USE_TOR_KEY);
+
+            prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+                @Override
+                public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+                                                      String key) {
+                    Activity a = getActivity();
+                    updateSummary();
+
+                    if (defaultPreferences.getBoolean(USE_TOR_KEY, false)) {
+                        if (OrbotHelper.isOrbotInstalled(a)) {
+                            App.configureTor(true);
+                            OrbotHelper.requestStartTor(a);
+                        } else {
+                            Intent intent = OrbotHelper.getOrbotInstallIntent(a);
+                            a.startActivityForResult(intent, REQUEST_INSTALL_ORBOT);
+                        }
+                    } else {
+                        App.configureTor(false);
+                    }
+                }
+            };
+            defaultPreferences.registerOnSharedPreferenceChangeListener(prefListener);
+
+            updateSummary();
         }
+
+        // This is used to show the status of some preference in the description
+        private void updateSummary() {
+            defaultResolutionPreference.setSummary(
+                    defaultPreferences.getString(DEFAULT_RESOLUTION_PREFERENCE,
+                            getString(R.string.default_resolution_value)));
+            defaultAudioFormatPreference.setSummary(
+                    defaultPreferences.getString(DEFAULT_AUDIO_FORMAT_PREFERENCE,
+                            getString(R.string.default_audio_format_value)));
+            searchLanguagePreference.setSummary(
+                    defaultPreferences.getString(SEARCH_LANGUAGE_PREFERENCE,
+                            getString(R.string.default_language_value)));
+            downloadPathPreference.setSummary(
+                    defaultPreferences.getString(DOWNLOAD_PATH_PREFERENCE,
+                            getString(R.string.download_path_summary)));
+            downloadPathAudioPreference.setSummary(
+                    defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
+                            getString(R.string.download_path_audio_summary)));
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        // try to start tor regardless of resultCode since clicking back after
+        // installing the app does not necessarily return RESULT_OK
+        App.configureTor(requestCode == REQUEST_INSTALL_ORBOT
+                && OrbotHelper.requestStartTor(this));
     }
 
     @Override
@@ -150,15 +254,6 @@ public class SettingsActivity extends PreferenceActivity {
     }
 
     public static void initSettings(Context context) {
-        PreferenceManager.setDefaultValues(context, R.xml.settings_screen, false);
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
-        if(sp.getString(context.getString(R.string.downloadPathPreference), "").isEmpty()){
-            SharedPreferences.Editor spEditor = sp.edit();
-            String newPipeDownloadStorage =
-                    Environment.getExternalStorageDirectory().getAbsolutePath() + "/NewPipe";
-            spEditor.putString(context.getString(R.string.downloadPathPreference)
-                    , newPipeDownloadStorage);
-            spEditor.apply();
-        }
+        NewPipeSettings.initSettings(context);
     }
 }

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

@@ -1,5 +1,6 @@
 package org.schabi.newpipe;
 
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -33,7 +34,7 @@ class VideoInfoItemViewCreator {
         this.inflater = inflater;
     }
 
-    public View getViewByVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info) {
+    public View getViewFromVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info, Context context) {
         ViewHolder holder;
         if(convertView == null) {
             convertView = inflater.inflate(R.layout.video_item, parent, false);
@@ -59,8 +60,7 @@ class VideoInfoItemViewCreator {
         if(!info.upload_date.isEmpty()) {
             holder.itemUploadDateView.setText(info.upload_date);
         } else {
-            //tweak if necessary: This is a hack to prevent having white space in the layout :P
-            holder.itemUploadDateView.setText(String.format("%d", info.view_count));
+            holder.itemUploadDateView.setText(Localization.localizeViewCount(info.view_count, context));
         }
 
         return convertView;

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

@@ -80,7 +80,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                     }
                 }
                 if(currentStreamingService == -1) {
-                    Toast.makeText(this, R.string.urlNotSupportedText, Toast.LENGTH_LONG)
+                    Toast.makeText(this, R.string.url_not_supported_toast, Toast.LENGTH_LONG)
                             .show();
                 }
                 //arguments.putString(VideoItemDetailFragment.VIDEO_URL,
@@ -89,7 +89,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
 
                 arguments.putBoolean(VideoItemDetailFragment.AUTO_PLAY,
                         PreferenceManager.getDefaultSharedPreferences(this)
-                                .getBoolean(getString(R.string.autoPlayThroughIntent), false));
+                                .getBoolean(getString(R.string.autoplay_through_intent_key), false));
             } else {
                 videoUrl = getIntent().getStringExtra(VideoItemDetailFragment.VIDEO_URL);
                 currentStreamingService = getIntent().getIntExtra(VideoItemDetailFragment.STREAMING_SERVICE, -1);
@@ -113,6 +113,12 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                 .commit();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);

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

@@ -1,13 +1,13 @@
 package org.schabi.newpipe;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Point;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -30,20 +30,16 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 import java.net.URL;
-import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.Locale;
 import java.util.Vector;
 
 import org.schabi.newpipe.services.VideoExtractor;
 import org.schabi.newpipe.services.ServiceList;
 import org.schabi.newpipe.services.StreamingService;
+import org.schabi.newpipe.services.VideoInfo;
 
 
 /**
@@ -72,7 +68,7 @@ public class VideoItemDetailFragment extends Fragment {
      * The fragment argument representing the item ID that this fragment
      * represents.
      */
-    public static final String ARG_ITEM_ID = "item_id";
+    //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";
@@ -80,6 +76,8 @@ public class VideoItemDetailFragment extends Fragment {
     private AppCompatActivity activity;
     private ActionBarHandler actionBarHandler;
 
+    private int streamingServiceId = -1;
+
     private boolean autoPlayEnabled = false;
     private VideoInfo currentVideoInfo = null;
     private boolean showNextVideoItem = false;
@@ -104,13 +102,14 @@ public class VideoItemDetailFragment extends Fragment {
             this.service = service;
             this.videoUrl = videoUrl;
         }
+
         @Override
         public void run() {
             try {
                 this.videoExtractor = service.getExtractorInstance(videoUrl);
                 VideoInfo videoInfo = videoExtractor.getVideoInfo();
                 h.post(new VideoResultReturnedRunnable(videoInfo));
-                if (videoInfo.videoAvailableStatus == VideoInfo.VIDEO_AVAILABLE) {
+                if (videoInfo.errorCode == VideoInfo.NO_ERROR) {
                     h.post(new SetThumbnailRunnable(
                             BitmapFactory.decodeStream(
                                     new URL(videoInfo.thumbnail_url)
@@ -175,6 +174,7 @@ public class VideoItemDetailFragment extends Fragment {
             switch (id) {
                 case SetThumbnailRunnable.VIDEO_THUMBNAIL:
                     thumbnailView = (ImageView) a.findViewById(R.id.detailThumbnailView);
+                    actionBarHandler.setSetVideoThumbnail(thumbnail);
                     break;
                 case SetThumbnailRunnable.CHANNEL_THUMBNAIL:
                     thumbnailView = (ImageView) a.findViewById(R.id.detailUploaderThumbnailView);
@@ -219,53 +219,49 @@ public class VideoItemDetailFragment extends Fragment {
             FrameLayout nextVideoFrame = (FrameLayout) activity.findViewById(R.id.detailNextVideoFrame);
             RelativeLayout nextVideoRootFrame =
                     (RelativeLayout) activity.findViewById(R.id.detailNextVideoRootLayout);
-            View nextVideoView = videoItemViewCreator
-                    .getViewByVideoInfoItem(null, nextVideoFrame, info.nextVideo);
-            nextVideoFrame.addView(nextVideoView);
-            Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
-            Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
+            Button backgroundButton = (Button)
+                    activity.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
 
-            textContentLayout.setVisibility(View.VISIBLE);
-            playVideoButton.setVisibility(View.VISIBLE);
             progressBar.setVisibility(View.GONE);
-            if(!showNextVideoItem) {
-                nextVideoRootFrame.setVisibility(View.GONE);
-                similarVideosButton.setVisibility(View.GONE);
-            }
 
-            switch (info.videoAvailableStatus) {
-                case VideoInfo.VIDEO_AVAILABLE: {
-                    videoTitleView.setText(info.title);
-                    uploaderView.setText(info.uploader);
-
-                    Locale locale = getPreferredLocale();
-                    NumberFormat nf = NumberFormat.getInstance(locale);
-                    String localisedViewCount = nf.format(info.view_count);
-                    viewCountView.setText(
-                            String.format(
-                                    res.getString(R.string.viewCountText), localisedViewCount));
+            switch (info.errorCode) {
+                case VideoInfo.NO_ERROR: {
+                    View nextVideoView = videoItemViewCreator
+                            .getViewFromVideoInfoItem(null, nextVideoFrame, info.nextVideo, getContext());
+                    nextVideoFrame.addView(nextVideoView);
 
 
-                    thumbsUpView.setText(nf.format(info.like_count));
-                    thumbsDownView.setText(nf.format(info.dislike_count));
+                    Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
+                    Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
 
-                    @SuppressLint("SimpleDateFormat")
-                    SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-                    Date datum = null;
-                    try {
-                        datum = formatter.parse(info.upload_date);
-                    } catch (ParseException e) {
-                        e.printStackTrace();
+                    textContentLayout.setVisibility(View.VISIBLE);
+                    playVideoButton.setVisibility(View.VISIBLE);
+                    if (!showNextVideoItem) {
+                        nextVideoRootFrame.setVisibility(View.GONE);
+                        similarVideosButton.setVisibility(View.GONE);
                     }
 
-                    DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
+                    videoTitleView.setText(info.title);
+                    uploaderView.setText(info.uploader);
+                    actionBarHandler.setChannelName(info.uploader);
+
+                    String localizedViewCount = Localization.localizeViewCount(info.view_count, getContext());
+                    viewCountView.setText(localizedViewCount);
+
+                    String localizedLikeCount = Localization.localizeNumber(info.like_count, getContext());
+                    thumbsUpView.setText(localizedLikeCount);
+
+                    String localizedDislikeCount = Localization.localizeNumber(info.dislike_count, getContext());
+                    thumbsDownView.setText(localizedDislikeCount);
+
+                    String localizedDate = Localization.localizeDate(info.upload_date, getContext());
+                    uploadDateView.setText(localizedDate);
 
-                    String localisedDate = df.format(datum);
-                    uploadDateView.setText(
-                            String.format(res.getString(R.string.uploadDateText), localisedDate));
                     descriptionView.setText(Html.fromHtml(info.description));
+
                     descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
 
+                    actionBarHandler.setServiceId(streamingServiceId);
                     actionBarHandler.setVideoInfo(info.webpage_url, info.title);
                     actionBarHandler.setStartPosition(info.startPosition);
 
@@ -281,30 +277,41 @@ public class VideoItemDetailFragment extends Fragment {
                         streamList[i] = streamsToUse.get(i);
                     }
                     actionBarHandler.setStreams(streamList, info.audioStreams);
-                }
 
-                nextVideoButton.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        Intent detailIntent =
-                                new Intent(getActivity(), VideoItemDetailActivity.class);
-                        detailIntent.putExtra(
-                                VideoItemDetailFragment.ARG_ITEM_ID, currentVideoInfo.nextVideo.id);
-                        detailIntent.putExtra(
-                                VideoItemDetailFragment.VIDEO_URL, currentVideoInfo.nextVideo.webpage_url);
-                        //todo: make id dynamic the following line is crap
-                        detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, 0);
-                        startActivity(detailIntent);
-                    }
-                });
+                    nextVideoButton.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Intent detailIntent =
+                                    new Intent(getActivity(), VideoItemDetailActivity.class);
+                        /*detailIntent.putExtra(
+                                VideoItemDetailFragment.ARG_ITEM_ID, currentVideoInfo.nextVideo.id); */
+                            detailIntent.putExtra(
+                                    VideoItemDetailFragment.VIDEO_URL, currentVideoInfo.nextVideo.webpage_url);
+
+                            detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
+                            startActivity(detailIntent);
+                        }
+                    });
+                }
                 break;
-                case VideoInfo.VIDEO_UNAVAILABLE_GEMA:
+                case VideoInfo.ERROR_BLOCKED_BY_GEMA:
                     thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
-                            getResources(), R.drawable.gruese_die_gema_unangebracht));
+                            getResources(), R.drawable.gruese_die_gema));
+                    backgroundButton.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Intent intent = new Intent();
+                            intent.setAction(Intent.ACTION_VIEW);
+                            intent.setData(Uri.parse(activity.getString(R.string.c3s_url)));
+                            activity.startActivity(intent);
+                        }
+                    });
                     break;
-                case VideoInfo.VIDEO_UNAVAILABLE:
+                case VideoInfo.ERROR_NO_SPECIFIED_ERROR:
                     thumbnailView.setImageBitmap(BitmapFactory.decodeResource(
                             getResources(), R.drawable.not_available_monkey));
+                    Toast.makeText(activity, info.errorMessage, Toast.LENGTH_LONG)
+                            .show();
                     break;
                 default:
                     Log.e(TAG, "Video Available Status not known.");
@@ -338,7 +345,7 @@ public class VideoItemDetailFragment extends Fragment {
         super.onCreate(savedInstanceState);
         activity = (AppCompatActivity) getActivity();
         showNextVideoItem = PreferenceManager.getDefaultSharedPreferences(getActivity())
-                .getBoolean(activity.getString(R.string.showNextVideo), true);
+                .getBoolean(activity.getString(R.string.show_next_video_key), true);
 
     }
 
@@ -359,8 +366,7 @@ public class VideoItemDetailFragment extends Fragment {
     public void onActivityCreated(Bundle savedInstanceBundle) {
         super.onActivityCreated(savedInstanceBundle);
         Activity a = getActivity();
-        playVideoButton =
-                (FloatingActionButton) a.findViewById(R.id.playVideoButton);
+        playVideoButton = (FloatingActionButton) a.findViewById(R.id.playVideoButton);
         thumbnailWindowLayout = a.findViewById(R.id.detailVideoThumbnailWindowLayout);
         Button backgroundButton = (Button)
                 a.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
@@ -370,8 +376,8 @@ public class VideoItemDetailFragment extends Fragment {
         // Otherwise the applications would crash.
         if(playVideoButton != null) {
             try {
-                StreamingService streamingService = ServiceList.getService(
-                        getArguments().getInt(STREAMING_SERVICE));
+                streamingServiceId = getArguments().getInt(STREAMING_SERVICE);
+                StreamingService streamingService = ServiceList.getService(streamingServiceId);
                 Thread videoExtractorThread = new Thread(new VideoExtractorRunnable(
                         getArguments().getString(VIDEO_URL), streamingService));
 
@@ -381,20 +387,6 @@ public class VideoItemDetailFragment extends Fragment {
                 e.printStackTrace();
             }
 
-            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.bottomMargin);
-                playVideoButton.setLayoutParams(layoutParams);
-            }
-
             playVideoButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -424,48 +416,29 @@ public class VideoItemDetailFragment extends Fragment {
                 }
             });
 
-            ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
-            thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-                // This is used to synchronize the thumbnailWindowButton and the playVideoButton
-                // inside the ScrollView with the actual size of the thumbnail.
-                @Override
-                public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                    RelativeLayout.LayoutParams newWindowLayoutParams =
-                            (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
-                    newWindowLayoutParams.height = bottom - top;
-                    thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
+            // todo: Fix this workaround (probably with a better design), so that older android
+            // versions don't have problems rendering the thumbnail right.
+            if(Build.VERSION.SDK_INT >= 18) {
+                ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+                thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+                    // This is used to synchronize the thumbnailWindowButton and the playVideoButton
+                    // inside the ScrollView with the actual size of the thumbnail.
+                    @Override
+                    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                        RelativeLayout.LayoutParams newWindowLayoutParams =
+                                (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
+                        newWindowLayoutParams.height = bottom - top;
+                        thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
 
+                        //noinspection SuspiciousNameCombination
+                        initialThumbnailPos.set(top, left);
 
-                    //noinspection SuspiciousNameCombination
-                    initialThumbnailPos.set(top, left);
-
-                }
-            });
+                    }
+                });
+            }
         }
     }
 
-    /**Returns the java.util.Locale object which corresponds to the locale set in NewPipe's preferences.
-     * Currently not affected by the device's locale.*/
-    private Locale getPreferredLocale() {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
-        String languageKey = getContext().getString(R.string.searchLanguage);
-        //i know the following line defaults languageCode to "en", but java is picky about uninitialised values
-        // Schabi: well lint tels me the value is redundant. I'll suppress it for now.
-        @SuppressWarnings("UnusedAssignment")
-        String languageCode = "en";
-        languageCode = sp.getString(languageKey, "en");
-
-        if(languageCode.length() == 2) {
-            return new Locale(languageCode);
-        }
-        else if(languageCode.contains("_")) {
-            String country = languageCode
-                    .substring(languageCode.indexOf("_"), languageCode.length());
-            return new Locale(languageCode.substring(0, 2), country);
-        }
-        return Locale.getDefault();
-    }
-
     private boolean checkIfLandscape() {
         DisplayMetrics displayMetrics = new DisplayMetrics();
         getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);

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

@@ -3,6 +3,7 @@ package org.schabi.newpipe;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SearchView;
@@ -171,7 +172,13 @@ public class VideoItemListActivity extends AppCompatActivity
             }
         }
 
-        SettingsActivity.initSettings(this);
+        PreferenceManager.setDefaultValues(this, R.xml.settings, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
     }
 
     /**
@@ -190,7 +197,7 @@ public class VideoItemListActivity extends AppCompatActivity
             // adding or replacing the detail fragment using a
             // fragment transaction.
             Bundle arguments = new Bundle();
-            arguments.putString(VideoItemDetailFragment.ARG_ITEM_ID, id);
+            //arguments.putString(VideoItemDetailFragment.ARG_ITEM_ID, id);
             arguments.putString(VideoItemDetailFragment.VIDEO_URL, webpage_url);
             arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingServiceId);
             videoFragment = new VideoItemDetailFragment();
@@ -209,7 +216,7 @@ public class VideoItemListActivity extends AppCompatActivity
             // In single-pane mode, simply start the detail activity
             // for the selected item ID.
             Intent detailIntent = new Intent(this, VideoItemDetailActivity.class);
-            detailIntent.putExtra(VideoItemDetailFragment.ARG_ITEM_ID, id);
+            //detailIntent.putExtra(VideoItemDetailFragment.ARG_ITEM_ID, id);
             detailIntent.putExtra(VideoItemDetailFragment.VIDEO_URL, webpage_url);
             detailIntent.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, currentStreamingServiceId);
             startActivity(detailIntent);

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

@@ -9,6 +9,7 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.app.ListFragment;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.ListView;
@@ -63,6 +64,11 @@ public class VideoItemListFragment extends ListFragment {
     private int currentRequestId = -1;
     private ListView list;
 
+    private View footer;
+
+    // used to suppress request for loading a new page while another page is already loading.
+    private boolean loadingNextPage = true;
+
     private class ResultRunnable implements Runnable {
         private final SearchEngine.Result result;
         private final int requestId;
@@ -73,6 +79,9 @@ public class VideoItemListFragment extends ListFragment {
         @Override
         public void run() {
             updateListOnResult(result, requestId);
+            if (android.os.Build.VERSION.SDK_INT >= 19) {
+                getListView().removeFooterView(footer);
+            }
         }
     }
 
@@ -81,7 +90,7 @@ public class VideoItemListFragment extends ListFragment {
         private final String query;
         private final int page;
         final Handler h = new Handler();
-        private volatile boolean run = true;
+        private volatile boolean runs = true;
         private final int requestId;
         public SearchRunnable(SearchEngine engine, String query, int page, int requestId) {
             this.engine = engine;
@@ -90,17 +99,18 @@ public class VideoItemListFragment extends ListFragment {
             this.requestId = requestId;
         }
         void terminate() {
-            run = false;
+            runs = false;
         }
         @Override
         public void run() {
             try {
                 SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
-                String searchLanguageKey = getContext().getString(R.string.searchLanguage);
-                String searchLanguage = sp.getString(searchLanguageKey, "en");
+                String searchLanguageKey = getContext().getString(R.string.search_language_key);
+                String searchLanguage = sp.getString(searchLanguageKey,
+                        getString(R.string.default_language_value));
                 SearchEngine.Result result = engine.search(query, page, searchLanguage);
                 Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
-                if(run) {
+                if(runs) {
                     h.post(new ResultRunnable(result, requestId));
                 }
             } catch(Exception e) {
@@ -108,7 +118,8 @@ public class VideoItemListFragment extends ListFragment {
                 h.post(new Runnable() {
                     @Override
                     public void run() {
-                        Toast.makeText(getActivity(), "Network Error", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getActivity(), getString(R.string.network_error),
+                                Toast.LENGTH_SHORT).show();
                     }
                 });
             }
@@ -185,12 +196,15 @@ public class VideoItemListFragment extends ListFragment {
         videoListAdapter.clearVideoList();
         setListShown(false);
         startSearch(query, lastPage);
+        //todo: Somehow this command is not working on older devices,
+        // although it was introduced with API level 8. Test this and find a solution.
         getListView().smoothScrollToPosition(0);
     }
 
     private void nextPage() {
+        loadingNextPage = true;
         lastPage++;
-        Log.d(TAG, getString(R.string.searchPage) + Integer.toString(lastPage));
+        Log.d(TAG, getString(R.string.search_page) + Integer.toString(lastPage));
         startSearch(query, lastPage);
     }
 
@@ -214,7 +228,7 @@ public class VideoItemListFragment extends ListFragment {
                 Toast.makeText(getActivity(), result.errorMessage, Toast.LENGTH_LONG).show();
             } else {
                 if (!result.suggestion.isEmpty()) {
-                    Toast.makeText(getActivity(), getString(R.string.didYouMean) + result.suggestion + " ?",
+                    Toast.makeText(getActivity(), getString(R.string.did_you_mean) + result.suggestion + " ?",
                             Toast.LENGTH_LONG).show();
                 }
                 updateList(result.resultList);
@@ -234,6 +248,8 @@ public class VideoItemListFragment extends ListFragment {
             Log.w(TAG, "Trying to set value while activity doesn't exist anymore.");
         } catch(Exception e) {
             e.printStackTrace();
+        } finally {
+            loadingNextPage = false;
         }
     }
 
@@ -283,6 +299,10 @@ public class VideoItemListFragment extends ListFragment {
         super.onViewCreated(view, savedInstanceState);
         list = getListView();
         videoListAdapter = new VideoListAdapter(getActivity(), this);
+        footer = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE))
+                .inflate(R.layout.paginate_footer, null, false);
+
+
         setListAdapter(videoListAdapter);
 
         // Restore the previously serialized activated item position.
@@ -292,6 +312,7 @@ public class VideoItemListFragment extends ListFragment {
             setActivatedPosition(savedInstanceState.getInt(STATE_ACTIVATED_POSITION));
         }
 
+
         getListView().setOnScrollListener(new AbsListView.OnScrollListener() {
             long lastScrollDate = 0;
 
@@ -300,14 +321,17 @@ public class VideoItemListFragment extends ListFragment {
             }
 
             @Override
-            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+            public void onScroll(AbsListView view, int firstVisibleItem,
+                                 int visibleItemCount, int totalItemCount) {
                 if (mode != PRESENT_VIDEOS_MODE
                         && list.getChildAt(0) != null
                         && list.getLastVisiblePosition() == list.getAdapter().getCount() - 1
                         && list.getChildAt(list.getChildCount() - 1).getBottom() <= list.getHeight()) {
                     long time = System.currentTimeMillis();
-                    if ((time - lastScrollDate) > 200) {
+                    if ((time - lastScrollDate) > 200
+                            && !loadingNextPage) {
                         lastScrollDate = time;
+                        getListView().addFooterView(footer);
                         nextPage();
                     }
                 }

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

@@ -33,7 +33,6 @@ import java.util.Vector;
  */
 
 class VideoListAdapter extends BaseAdapter {
-
     private final Context context;
     private final VideoInfoItemViewCreator viewCreator;
     private Vector<VideoPreviewInfo> videoList = new Vector<>();
@@ -43,6 +42,8 @@ class VideoListAdapter extends BaseAdapter {
     public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) {
         viewCreator = new VideoInfoItemViewCreator(LayoutInflater.from(context));
         this.listView = videoListFragment.getListView();
+        this.listView.setDivider(null);
+        this.listView.setDividerHeight(0);
         this.context = context;
     }
 
@@ -95,10 +96,10 @@ class VideoListAdapter extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        convertView = viewCreator.getViewByVideoInfoItem(convertView, parent, videoList.get(position));
+        convertView = viewCreator.getViewFromVideoInfoItem(convertView, parent, videoList.get(position), context);
 
         if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.primaryColorYoutube));
+            convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.light_youtube_primary_color));
         } else {
             convertView.setBackgroundColor(0);
         }

app/src/main/java/org/schabi/newpipe/services/MediaFormat.java

@@ -1,4 +1,4 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.services;
 
 /**
  * Created by Adam Howard on 08/11/15.

app/src/main/java/org/schabi/newpipe/services/ServiceList.java

@@ -26,6 +26,7 @@ import org.schabi.newpipe.services.youtube.YoutubeService;
 
 /**Provides access to the video streaming services supported by NewPipe.
  * Currently only Youtube until the API becomes more stable.*/
+
 @SuppressWarnings("ALL")
 public class ServiceList {
     private static final String TAG = ServiceList.class.toString();

app/src/main/java/org/schabi/newpipe/services/StreamingService.java

@@ -30,6 +30,6 @@ public interface StreamingService {
 
     /**When a VIEW_ACTION is caught this function will test if the url delivered within the calling
     Intent was meant to be watched with this Service.
-    Return false if this service shall not allow to be callean through ACTIONs.*/
+    Return false if this service shall not allow to be called through ACTIONs.*/
     boolean acceptUrl(String videoUrl);
 }

app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java

@@ -20,9 +20,8 @@ package org.schabi.newpipe.services;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import org.schabi.newpipe.VideoInfo;
-
 /**Scrapes information from a video streaming service (eg, YouTube).*/
+
 @SuppressWarnings("ALL")
 public abstract class VideoExtractor {
     protected final String pageUrl;
@@ -45,54 +44,60 @@ public abstract class VideoExtractor {
             videoInfo.webpage_url = pageUrl;
         }
 
-        if(videoInfo.title.isEmpty()) {
-            videoInfo.title = getTitle();
-        }
+        if(getErrorCode() == VideoInfo.NO_ERROR) {
 
-        if(videoInfo.duration  < 1) {
-            videoInfo.duration = getLength();
-        }
+            if (videoInfo.title.isEmpty()) {
+                videoInfo.title = getTitle();
+            }
+
+            if (videoInfo.duration < 1) {
+                videoInfo.duration = getLength();
+            }
 
 
-        if(videoInfo.uploader.isEmpty()) {
-            videoInfo.uploader = getUploader();
-        }
+            if (videoInfo.uploader.isEmpty()) {
+                videoInfo.uploader = getUploader();
+            }
 
-        if(videoInfo.description.isEmpty()) {
-            videoInfo.description = getDescription();
-        }
+            if (videoInfo.description.isEmpty()) {
+                videoInfo.description = getDescription();
+            }
 
-        if(videoInfo.view_count == -1) {
-            videoInfo.view_count = getViews();
-        }
+            if (videoInfo.view_count == -1) {
+                videoInfo.view_count = getViews();
+            }
 
-        if(videoInfo.upload_date.isEmpty()) {
-            videoInfo.upload_date = getUploadDate();
-        }
+            if (videoInfo.upload_date.isEmpty()) {
+                videoInfo.upload_date = getUploadDate();
+            }
 
-        if(videoInfo.thumbnail_url.isEmpty()) {
-            videoInfo.thumbnail_url = getThumbnailUrl();
-        }
+            if (videoInfo.thumbnail_url.isEmpty()) {
+                videoInfo.thumbnail_url = getThumbnailUrl();
+            }
 
-        if(videoInfo.id.isEmpty()) {
-            videoInfo.id = getVideoId(pageUrl);
-        }
+            if (videoInfo.id.isEmpty()) {
+                videoInfo.id = getVideoId(pageUrl);
+            }
 
-        /** Load and extract audio*/
-        if(videoInfo.audioStreams == null) {
-            videoInfo.audioStreams = getAudioStreams();
-        }
-        /** Extract video stream url*/
-        if(videoInfo.videoStreams == null) {
-            videoInfo.videoStreams = getVideoStreams();
-        }
+            /** Load and extract audio*/
+            if (videoInfo.audioStreams == null) {
+                videoInfo.audioStreams = getAudioStreams();
+            }
+            /** Extract video stream url*/
+            if (videoInfo.videoStreams == null) {
+                videoInfo.videoStreams = getVideoStreams();
+            }
 
-        if(videoInfo.uploader_thumbnail_url.isEmpty()) {
-            videoInfo.uploader_thumbnail_url = getUploaderThumbnailUrl();
-        }
+            if (videoInfo.uploader_thumbnail_url.isEmpty()) {
+                videoInfo.uploader_thumbnail_url = getUploaderThumbnailUrl();
+            }
 
-        if(videoInfo.startPosition < 0) {
-            videoInfo.startPosition = getTimeStamp();
+            if (videoInfo.startPosition < 0) {
+                videoInfo.startPosition = getTimeStamp();
+            }
+        } else {
+            videoInfo.errorCode = getErrorCode();
+            videoInfo.errorMessage = getErrorMessage();
         }
 
         //Bitmap thumbnail = null;
@@ -101,17 +106,23 @@ public abstract class VideoExtractor {
         return videoInfo;
     }
 
-    protected abstract String getVideoUrl(String videoId);
-    protected abstract String getVideoId(String siteUrl);
-    protected abstract int getTimeStamp();
-    protected abstract String getTitle();
-    protected abstract String getDescription();
-    protected abstract String getUploader();
-    protected abstract int getLength();
-    protected abstract int getViews();
-    protected abstract String getUploadDate();
-    protected abstract String getThumbnailUrl();
-    protected abstract String getUploaderThumbnailUrl();
-    protected abstract VideoInfo.AudioStream[] getAudioStreams();
-    protected abstract VideoInfo.VideoStream[] getVideoStreams();
+    //todo: add licence field
+    public abstract int getErrorCode();
+    public abstract String getErrorMessage();
+
+    //todo: remove these functions, or make them static, otherwise its useles, to have them here
+    public abstract String getVideoUrl(String videoId);
+    public abstract String getVideoId(String siteUrl);
+    ///////////////////////////////////////////////////////////////////////////////////////////
+    public abstract int getTimeStamp();
+    public abstract String getTitle();
+    public abstract String getDescription();
+    public abstract String getUploader();
+    public abstract int getLength();
+    public abstract long getViews();
+    public abstract String getUploadDate();
+    public abstract String getThumbnailUrl();
+    public abstract String getUploaderThumbnailUrl();
+    public abstract VideoInfo.AudioStream[] getAudioStreams();
+    public abstract VideoInfo.VideoStream[] getVideoStreams();
 }

app/src/main/java/org/schabi/newpipe/services/VideoInfo.java

@@ -1,5 +1,6 @@
-package org.schabi.newpipe;
+package org.schabi.newpipe.services;
 
+import org.schabi.newpipe.VideoPreviewInfo;
 import org.schabi.newpipe.services.AbstractVideoInfo;
 
 import java.util.List;
@@ -28,11 +29,20 @@ import java.util.List;
 @SuppressWarnings("ALL")
 public class VideoInfo extends AbstractVideoInfo {
 
+    // If a video could not be parsed, this predefined error codes
+    // will be returned AND can be parsed by the frontend of the app.
+    // Error codes:
+    public final static int NO_ERROR = 0x0;
+    public final static int ERROR_NO_SPECIFIED_ERROR = 0x1;
+    // GEMA a german music colecting society.
+    public final static int ERROR_BLOCKED_BY_GEMA = 0x2;
+
     public String uploader_thumbnail_url = "";
     public String description = "";
     public VideoStream[] videoStreams = null;
     public AudioStream[] audioStreams = null;
-    public int videoAvailableStatus = VIDEO_AVAILABLE;
+    public int errorCode = NO_ERROR;
+    public String errorMessage = "";
     public int duration = -1;
 
     /*YouTube-specific fields
@@ -45,11 +55,6 @@ public class VideoInfo extends AbstractVideoInfo {
     public List<VideoPreviewInfo> relatedVideos = null;
     public int startPosition = -1;//in seconds. some metadata is not passed using a VideoInfo object!
 
-    public static final int VIDEO_AVAILABLE = 0x00;
-    public static final int VIDEO_UNAVAILABLE = 0x01;
-    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;//German DRM organisation
-
-
     public VideoInfo() {}
 
 

app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeSearchEngine.java

@@ -109,7 +109,7 @@ public class YoutubeSearchEngine implements SearchEngine {
                     Matcher m = p.matcher(resultItem.webpage_url);
                     resultItem.id=m.group(1);
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    //e.printStackTrace();
                 }
                 resultItem.title = dl.text();
 

app/src/main/java/org/schabi/newpipe/services/youtube/YoutubeVideoExtractor.java

@@ -14,8 +14,8 @@ import org.mozilla.javascript.Function;
 import org.mozilla.javascript.ScriptableObject;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.services.VideoExtractor;
-import org.schabi.newpipe.MediaFormat;
-import org.schabi.newpipe.VideoInfo;
+import org.schabi.newpipe.services.MediaFormat;
+import org.schabi.newpipe.services.VideoInfo;
 import org.schabi.newpipe.VideoPreviewInfo;
 import org.xmlpull.v1.XmlPullParser;
 
@@ -53,6 +53,8 @@ public class YoutubeVideoExtractor extends VideoExtractor {
     private final Document doc;
     private JSONObject jsonObj;
     private JSONObject playerArgs;
+    private int errorCode = VideoInfo.NO_ERROR;
+    private String errorMessage = "";
 
     // static values
     private static final String DECRYPTION_FUNC_NAME="decrypt";
@@ -60,7 +62,6 @@ public class YoutubeVideoExtractor extends VideoExtractor {
     // cached values
     private static volatile String decryptionCode = "";
 
-
     public YoutubeVideoExtractor(String pageUrl) {
         super(pageUrl);//most common videoInfo fields are now set in our superclass, for all services
         String pageContents = Downloader.download(cleanUrl(pageUrl));
@@ -69,13 +70,19 @@ public class YoutubeVideoExtractor extends VideoExtractor {
         //attempt to load the youtube js player JSON arguments
         try {
             String jsonString = matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", pageContents);
+            //todo: implement this by try and catch. TESTING THE STRING AGAINST EMPTY IS CONSIDERED POOR STYLE !!!
+            if(jsonString.isEmpty()) {
+                errorCode = findErrorReason(doc);
+                return;
+            }
+
             jsonObj = new JSONObject(jsonString);
             playerArgs = jsonObj.getJSONObject("args");
 
         } catch (Exception e) {//if this fails, the video is most likely not available.
             // Determining why is done later.
-            videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE;
-            Log.d(TAG, "Could not load JSON data for Youtube video \""+pageUrl+"\". This most likely means the video is unavailable");
+            videoInfo.errorCode = VideoInfo.ERROR_NO_SPECIFIED_ERROR;
+            Log.e(TAG, "Could not load JSON data for Youtube video \""+pageUrl+"\". This most likely means the video is unavailable");
         }
 
         //----------------------------------
@@ -94,7 +101,7 @@ public class YoutubeVideoExtractor extends VideoExtractor {
                 }
                 decryptionCode = loadDecryptionCode(playerUrl);
             } catch (Exception e){
-                Log.d(TAG, "Could not load decryption code for the Youtube service.");
+                Log.e(TAG, "Could not load decryption code for the Youtube service.");
                 e.printStackTrace();
             }
         }
@@ -155,10 +162,10 @@ public class YoutubeVideoExtractor extends VideoExtractor {
     }
 
     @Override
-    public int getViews() {
+    public long getViews() {
         try {
             String viewCountString = doc.select("meta[itemprop=interactionCount]").attr("content");
-            return Integer.parseInt(viewCountString);
+            return Long.parseLong(viewCountString);
         } catch (Exception e) {//todo: find fallback method
             Log.e(TAG, "failed to number of views");
             e.printStackTrace();
@@ -323,10 +330,10 @@ public class YoutubeVideoExtractor extends VideoExtractor {
         }
         id = matchGroup1(pat, url);
         if(!id.isEmpty()){
-            Log.i(TAG, "string \""+url+"\" matches!");
+            //Log.i(TAG, "string \""+url+"\" matches!");
             return id;
         }
-        Log.i(TAG, "string \""+url+"\" does not match.");
+        //Log.i(TAG, "string \""+url+"\" does not match.");
         return "";
     }
 
@@ -358,7 +365,7 @@ public class YoutubeVideoExtractor extends VideoExtractor {
             int hours =   (hoursString.isEmpty()   ? 0 : Integer.parseInt(hoursString));
 
             int ret = seconds + (60*minutes) + (3600*hours);//don't trust BODMAS!
-            Log.d(TAG, "derived timestamp value:"+ret);
+            //Log.d(TAG, "derived timestamp value:"+ret);
             return ret;
             //the ordering varies internationally
         }//else, return default 0
@@ -367,70 +374,95 @@ public class YoutubeVideoExtractor extends VideoExtractor {
 
     @Override
     public VideoInfo getVideoInfo() {
+        //todo: @medovax i like your work, but what the fuck:
         videoInfo = super.getVideoInfo();
-        //todo: replace this with a call to getVideoId, if possible
-        videoInfo.id = matchGroup1("v=([0-9a-zA-Z_-]{11})", pageUrl);
 
-        videoInfo.age_limit = 0;
+        if(errorCode == VideoInfo.NO_ERROR) {
+            //todo: replace this with a call to getVideoId, if possible
+            videoInfo.id = matchGroup1("v=([0-9a-zA-Z_-]{11})", pageUrl);
 
-        //average rating
-        try {
-            videoInfo.average_rating = playerArgs.getString("avg_rating");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
+            if (videoInfo.audioStreams == null
+                    || videoInfo.audioStreams.length == 0) {
+                Log.e(TAG, "uninitialised audio streams!");
+            }
 
-        //---------------------------------------
-        // extracting information from html page
-        //---------------------------------------
+            if (videoInfo.videoStreams == null
+                    || videoInfo.videoStreams.length == 0) {
+                Log.e(TAG, "uninitialised video streams!");
+            }
 
+            videoInfo.age_limit = 0;
+
+            //average rating
+            try {
+                videoInfo.average_rating = playerArgs.getString("avg_rating");
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+
+            //---------------------------------------
+            // extracting information from html page
+            //---------------------------------------
+
+        /* Code does not work here anymore.
         // Determine what went wrong when the Video is not available
-        if(videoInfo.videoAvailableStatus == VideoInfo.VIDEO_UNAVAILABLE) {
+        if(videoInfo.errorCode == VideoInfo.ERROR_NO_SPECIFIED_ERROR) {
             if(doc.select("h1[id=\"unavailable-message\"]").first().text().contains("GEMA")) {
                 videoInfo.videoAvailableStatus = VideoInfo.VIDEO_UNAVAILABLE_GEMA;
             }
         }
+        */
 
-        String likesString = "";
-        String dislikesString = "";
-        try {
-            // likes
-            likesString = doc.select("button.like-button-renderer-like-button").first()
-                    .select("span.yt-uix-button-content").first().text();
-            videoInfo.like_count = Integer.parseInt(likesString.replaceAll("[^\\d]", ""));
-            // dislikes
-            dislikesString = doc.select("button.like-button-renderer-dislike-button").first()
-                            .select("span.yt-uix-button-content").first().text();
+            String likesString = "";
+            String dislikesString = "";
+            try {
+                // likes
+                likesString = doc.select("button.like-button-renderer-like-button").first()
+                        .select("span.yt-uix-button-content").first().text();
+                videoInfo.like_count = Integer.parseInt(likesString.replaceAll("[^\\d]", ""));
+                // dislikes
+                dislikesString = doc.select("button.like-button-renderer-dislike-button").first()
+                        .select("span.yt-uix-button-content").first().text();
 
-            videoInfo.dislike_count = Integer.parseInt(dislikesString.replaceAll("[^\\d]", ""));
-        } catch(NumberFormatException nfe) {
-            Log.e(TAG, "failed to parse likesString \""+likesString+"\" and dislikesString \""+
-            dislikesString+"\" as integers");
-        } catch(Exception e) {
-            // if it fails we know that the video does not offer dislikes.
-            e.printStackTrace();
-            videoInfo.like_count = 0;
-            videoInfo.dislike_count = 0;
-        }
-
-        // next video
-        videoInfo.nextVideo = extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
-                .select("li").first());
-
-        // related videos
-        Vector<VideoPreviewInfo> relatedVideos = new Vector<>();
-        for(Element li : doc.select("ul[id=\"watch-related\"]").first().children()) {
-            // first check if we have a playlist. If so leave them out
-            if(li.select("a[class*=\"content-link\"]").first() != null) {
-                relatedVideos.add(extractVideoPreviewInfo(li));
+                videoInfo.dislike_count = Integer.parseInt(dislikesString.replaceAll("[^\\d]", ""));
+            } catch (NumberFormatException nfe) {
+                Log.e(TAG, "failed to parse likesString \"" + likesString + "\" and dislikesString \"" +
+                        dislikesString + "\" as integers");
+            } catch (Exception e) {
+                // if it fails we know that the video does not offer dislikes.
+                e.printStackTrace();
+                videoInfo.like_count = 0;
+                videoInfo.dislike_count = 0;
             }
+
+            // next video
+            videoInfo.nextVideo = extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
+                    .select("li").first());
+
+            // related videos
+            Vector<VideoPreviewInfo> relatedVideos = new Vector<>();
+            for (Element li : doc.select("ul[id=\"watch-related\"]").first().children()) {
+                // first check if we have a playlist. If so leave them out
+                if (li.select("a[class*=\"content-link\"]").first() != null) {
+                    relatedVideos.add(extractVideoPreviewInfo(li));
+                }
+            }
+            //todo: replace conversion
+            videoInfo.relatedVideos = relatedVideos;
+            //videoInfo.relatedVideos = relatedVideos.toArray(new VideoPreviewInfo[relatedVideos.size()]);
         }
-        //todo: replace conversion
-        videoInfo.relatedVideos = relatedVideos;
-        //videoInfo.relatedVideos = relatedVideos.toArray(new VideoPreviewInfo[relatedVideos.size()]);
         return videoInfo;
     }
 
+    @Override
+    public int getErrorCode() {
+        return errorCode;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return errorMessage;
+    }
 
     private VideoInfo.AudioStream[] parseDashManifest(String dashManifest, String decryptoinCode) {
         if(!dashManifest.contains("/signature/")) {
@@ -445,13 +477,14 @@ public class YoutubeVideoExtractor extends VideoExtractor {
         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) {
+            for(int eventType = parser.getEventType();
+                eventType != XmlPullParser.END_DOCUMENT;
+                eventType = parser.next() ) {
                 switch(eventType) {
                     case XmlPullParser.START_TAG:
                         tagName = parser.getName();
@@ -465,8 +498,8 @@ public class YoutubeVideoExtractor extends VideoExtractor {
                         } else if(tagName.equals("BaseURL")) {
                             currentTagIsBaseUrl = true;
                         }
-
                         break;
+
                     case XmlPullParser.TEXT:
                         if(currentTagIsBaseUrl &&
                                 (currentMimeType.contains("audio"))) {
@@ -479,16 +512,14 @@ public class YoutubeVideoExtractor extends VideoExtractor {
                             audioStreams.add(new VideoInfo.AudioStream(parser.getText(),
                                     format, currentBandwidth, currentSamplingRate));
                         }
+                        //missing break here?
                     case XmlPullParser.END_TAG:
                         if(tagName.equals("AdaptationSet")) {
                             currentMimeType = "";
                         } else if(tagName.equals("BaseURL")) {
                             currentTagIsBaseUrl = false;
-                        }
-                        break;
-                    default:
+                        }//no break needed here
                 }
-                eventType = parser.next();
             }
         } catch(Exception e) {
             e.printStackTrace();
@@ -513,8 +544,8 @@ public class YoutubeVideoExtractor extends VideoExtractor {
         //this page causes the NullPointerException, after finding it by searching for "tjvg":
         //https://www.youtube.com/watch?v=Uqg0aEhLFAg
         String views = li.select("span.view-count").first().text();
-        Log.i(TAG, "title:"+info.title);
-        Log.i(TAG, "view count:"+views);
+        //Log.i(TAG, "title:"+info.title);
+        //Log.i(TAG, "view count:"+views);
         try {
             info.view_count = Long.parseLong(li.select("span.view-count")
                     .first().text().replaceAll("[^\\d]", ""));
@@ -551,9 +582,8 @@ public class YoutubeVideoExtractor extends VideoExtractor {
         try {
             decryptionFuncName = matchGroup1("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(", playerCode);
 
-            String functionPattern = "(var "+  decryptionFuncName.replace("$", "\\$") +"=function\\([a-zA-Z0-9_]*\\)\\{.+?\\})";
-            decryptionFunc = matchGroup1(functionPattern, playerCode);
-            decryptionFunc += ";";
+            String functionPattern = "(" + decryptionFuncName.replace("$", "\\$") +"=function\\([a-zA-Z0-9_]*\\)\\{.+?\\})";
+            decryptionFunc = "var " + matchGroup1(functionPattern, playerCode) + ";";
 
             helperObjectName = matchGroup1(";([A-Za-z0-9_\\$]{2})\\...\\(", decryptionFunc);
 
@@ -583,10 +613,7 @@ public class YoutubeVideoExtractor extends VideoExtractor {
             e.printStackTrace();
         }
         Context.exit();
-        if(result != null)
-            return result.toString();
-        else
-            return "";
+        return (result == null ? "" : result.toString());
     }
 
     private String cleanUrl(String complexUrl) {
@@ -601,10 +628,17 @@ public class YoutubeVideoExtractor extends VideoExtractor {
             return mat.group(1);
         }
         else {
-            Log.w(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
+            Log.e(TAG, "failed to find pattern \""+pattern+"\" inside of \""+input+"\"");
             new Exception("failed to find pattern \""+pattern+"\"").printStackTrace();
             return "";
         }
+    }
 
+    private int findErrorReason(Document doc) {
+        errorMessage = doc.select("h1[id=\"unavailable-message\"]").first().text();
+        if(errorMessage.contains("GEMA")) {
+            return VideoInfo.ERROR_BLOCKED_BY_GEMA;
+        }
+        return VideoInfo.ERROR_NO_SPECIFIED_ERROR;
     }
 }

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

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".VideoItemDetailFragment"
+    android:textIsSelectable="true"
+    style="?android:attr/textAppearanceLarge"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/videoitem_detail">
+
+    <ImageView android:id="@+id/detailThumbnailView"
+        android:contentDescription="@string/detail_thumbnail_view_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        android:adjustViewBounds="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:background="@android:color/black"
+        android:src="@drawable/dummy_thumbnail_dark"
+        tools:ignore="RtlHardcoded" />
+
+    <ScrollView
+        android:id="@+id/detailMainContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="visible">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <RelativeLayout
+                android:id="@+id/detailVideoThumbnailWindowLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
+                android:background="?attr/selectableItemBackground">
+
+                <ProgressBar android:id="@+id/detailProgressBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:indeterminate="true"/>
+
+                <android.support.design.widget.FloatingActionButton
+                    android:id="@+id/playVideoButton"
+                    android:visibility="invisible"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    app:backgroundTint="@color/light_youtube_primary_color"
+                    android:src="@drawable/ic_play_arrow_black"
+                    android:layout_margin="@dimen/video_item_detail_play_fab_margin"/>
+
+                <Button
+                    android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"/>
+
+            </RelativeLayout>
+
+            <RelativeLayout android:id="@+id/detailTextContentLayout"
+                android:visibility="invisible"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/video_item_detail_info_text_padding"
+                android:layout_below="@id/detailVideoThumbnailWindowLayout"
+                android:background="@color/light_background_color">
+
+                <TextView android:id="@+id/detailVideoTitleView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/video_item_detail_title_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <ImageView android:id="@+id/detailUploaderThumbnailView"
+                    android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+                    android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_height="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:src="@drawable/buddy"
+                    tools:ignore="RtlHardcoded" />
+
+                <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:layout_alignParentStart="true"
+                    android:textStyle="bold"
+                    android:textSize="@dimen/video_item_detail_uploader_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <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:layout_alignParentEnd="true"
+                    android:textSize="@dimen/video_item_detail_views_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <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:layout_alignParentEnd="true"
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
+
+                <ImageView android:id="@+id/detailThumbsDownImgView"
+                    android:contentDescription="@string/detail_dislikes_img_view_description"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
+                    android:layout_toStartOf="@id/detailThumbsDownCountView"
+                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+                    android:src="@drawable/thumbs_down"
+                    tools:ignore="RtlHardcoded" />
+
+                <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:layout_toStartOf="@id/detailThumbsDownImgView"
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
+
+                <ImageView android:id="@+id/detailThumbsUpImgView"
+                    android:contentDescription="@string/detail_likes_img_view_description"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
+                    android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                    android:layout_toStartOf="@id/detailThumbsUpCountView"
+                    android:src="@drawable/thumbs_up"
+                    tools:ignore="RtlHardcoded" />
+
+                <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:layout_alignParentStart="true"
+                    android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
+
+                <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:layout_alignParentStart="true"
+                    android:textSize="@dimen/video_item_detail_description_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
+
+
+                <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/video_item_detail_info_text_padding"
+                    android:layout_below="@id/detailDescriptionView" >
+
+                    <TextView android:id="@+id/detailNextVideoTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:textSize="@dimen/video_item_detail_next_text_size"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="@string/next_video_title"
+                        android:textAllCaps="true" />
+
+                    <RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVideoTitle">
+                        <FrameLayout
+                            android:id="@+id/detailNextVideoFrame"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+                        <Button
+                            android:id="@+id/detailNextVideoButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_alignTop="@id/detailNextVideoFrame"
+                            android:layout_alignBottom="@id/detailNextVideoFrame"
+                            android:background="?attr/selectableItemBackground"/>
+                    </RelativeLayout>
+                    <Button android:id="@+id/detailShowSimilarButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVidButtonAndContentLayout"
+                        android:textSize="@dimen/video_item_detail_similar_text_size"
+                        android:text="@string/similar_videos_btn_text"/>
+                </RelativeLayout>
+
+            </RelativeLayout>
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>

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

@@ -11,15 +11,17 @@
     android:id="@+id/videoitem_detail">
 
     <ImageView android:id="@+id/detailThumbnailView"
-        android:contentDescription="@string/detailThumbnailViewDescription"
+        android:contentDescription="@string/detail_thumbnail_view_description"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:scaleType="fitCenter"
+        android:scaleType="centerCrop"
         android:adjustViewBounds="true"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:background="@android:color/black"
-        android:src="@drawable/dummy_thumbnail_dark"/>
+        android:src="@drawable/dummy_thumbnail_dark"
+        tools:ignore="RtlHardcoded" />
 
     <ScrollView
         android:id="@+id/detailMainContent"
@@ -34,7 +36,7 @@
             <RelativeLayout
                 android:id="@+id/detailVideoThumbnailWindowLayout"
                 android:layout_width="match_parent"
-                android:layout_height="250dp"
+                android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
                 android:background="?attr/selectableItemBackground">
 
                 <ProgressBar android:id="@+id/detailProgressBar"
@@ -42,19 +44,18 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:indeterminate="true"
-                    android:indeterminateTint="@color/primaryColorDarkYoutube"
+                    android:indeterminateTint="@color/light_youtube_primary_color"
                     android:indeterminateTintMode="src_in"/>
 
                 <android.support.design.widget.FloatingActionButton
                     android:id="@+id/playVideoButton"
                     android:visibility="invisible"
                     android:layout_width="wrap_content"
-
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    app:backgroundTint="@color/primaryColorYoutube"
+                    app:backgroundTint="@color/light_youtube_primary_color"
                     android:src="@drawable/ic_play_arrow_black"
-                    android:layout_margin="20dp"/>
+                    android:layout_margin="@dimen/video_item_detail_play_fab_margin"/>
 
                 <Button
                     android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
@@ -68,145 +69,152 @@
                 android:visibility="invisible"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingRight="5dp"
-                android:paddingLeft="5dp"
+                android:padding="@dimen/video_item_detail_info_text_padding"
                 android:layout_below="@id/detailVideoThumbnailWindowLayout"
-                android:background="@color/background_gray">
+                android:background="@color/light_background_color">
 
                 <TextView android:id="@+id/detailVideoTitleView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textStyle="bold"
-                    android:paddingBottom="3dp"
-                    android:textSize="@dimen/text_video_title_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge"/>
+                    android:textSize="@dimen/video_item_detail_title_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
 
                 <ImageView android:id="@+id/detailUploaderThumbnailView"
-                    android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                    android:layout_width="80dp"
-                    android:layout_height="80dp"
+                    android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+                    android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_height="@dimen/video_item_detail_uploader_image_size"
                     android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
-                    android:src="@drawable/buddy" />
+                    android:src="@drawable/buddy"
+                    tools:ignore="RtlHardcoded" />
 
                 <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:layout_alignParentStart="true"
                     android:textStyle="bold"
-                    android:textSize="@dimen/text_video_uploader_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+                    android:textSize="@dimen/video_item_detail_uploader_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
 
                 <TextView android:id="@+id/detailViewCountView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="3dp"
                     android:layout_below="@id/detailVideoTitleView"
+                    android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
-                    android:textSize="@dimen/text_video_views_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+                    android:textSize="@dimen/video_item_detail_views_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
 
                 <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:layout_alignParentEnd="true"
-                    android:textSize="@dimen/text_video_like_size"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
 
                 <ImageView android:id="@+id/detailThumbsDownImgView"
-                    android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                    android:layout_width="30dp"
-                    android:layout_height="15dp"
+                    android:contentDescription="@string/detail_dislikes_img_view_description"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
                     android:layout_below="@id/detailViewCountView"
+                    android:layout_toLeftOf="@id/detailThumbsDownCountView"
                     android:layout_toStartOf="@id/detailThumbsDownCountView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:src="@drawable/thumbs_down" />
+                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+                    android:src="@drawable/thumbs_down"
+                    tools:ignore="RtlHardcoded" />
 
                 <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:layout_toStartOf="@id/detailThumbsDownImgView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:textSize="@dimen/text_video_like_size"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
 
                 <ImageView android:id="@+id/detailThumbsUpImgView"
-                    android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                    android:layout_width="30dp"
-                    android:layout_height="15dp"
+                    android:contentDescription="@string/detail_likes_img_view_description"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
                     android:layout_below="@id/detailViewCountView"
-                    android:layout_toStartOf="@id/detailThumbsUpImgView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:src="@drawable/thumbs_up" />
+                    android:layout_toLeftOf="@id/detailThumbsUpCountView"
+                    android:layout_toStartOf="@id/detailThumbsUpCountView"
+                    android:src="@drawable/thumbs_up"
+                    tools:ignore="RtlHardcoded" />
 
                 <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:layout_alignParentStart="true"
-                    android:textSize="@dimen/text_video_upload_date_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge" />
+                    android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    tools:ignore="RtlHardcoded" />
 
                 <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:layout_alignParentStart="true"
-                    android:textSize="@dimen/text_video_description_size"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                    android:textSize="@dimen/video_item_detail_description_text_size"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    tools:ignore="RtlHardcoded" />
 
 
-                <RelativeLayout
-                    android:id="@+id/detailNextVideoRootLayout"
+                <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:padding="@dimen/video_item_detail_info_text_padding"
                     android:layout_below="@id/detailDescriptionView" >
 
                     <TextView android:id="@+id/detailNextVideoTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_upload_date_size"
+                        android:layout_centerHorizontal="true"
+                        android:textSize="@dimen/video_item_detail_next_text_size"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textColor="@android:color/black"
-                        android:text="@string/nextVideoTitle"
-                        />
-                    <FrameLayout
-                        android:id="@+id/detailNextVideoFrame"
+                        android:text="@string/next_video_title"
+                        android:textAllCaps="true" />
+
+                    <RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/detailNextVideoTitle"/>
-                    <Button
-                        android:id="@+id/detailNextVideoButton"
+                        android:layout_below="@id/detailNextVideoTitle">
+                        <FrameLayout
+                            android:id="@+id/detailNextVideoFrame"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+                        <Button
+                            android:id="@+id/detailNextVideoButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_alignTop="@id/detailNextVideoFrame"
+                            android:layout_alignBottom="@id/detailNextVideoFrame"
+                            android:background="?attr/selectableItemBackground"/>
+                    </RelativeLayout>
+                    <Button android:id="@+id/detailShowSimilarButton"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_alignTop="@id/detailNextVideoFrame"
-                        android:layout_alignBottom="@id/detailNextVideoFrame"
-                        android:background="?attr/selectableItemBackground"/>
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVidButtonAndContentLayout"
+                        android:textSize="@dimen/video_item_detail_similar_text_size"
+                        android:text="@string/similar_videos_btn_text"/>
                 </RelativeLayout>
 
-                <Button android:id="@+id/detailShowSimilarButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:layout_below="@id/detailNextVideoRootLayout"
-                    android:text="@string/showSimilarVideosButtonText"/>
             </RelativeLayout>
         </RelativeLayout>
     </ScrollView>

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

@@ -10,6 +10,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>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".VideoItemDetailFragment"
@@ -10,23 +10,12 @@
     android:layout_height="match_parent"
     android:id="@+id/videoitem_detail">
 
-    <ImageView android:id="@+id/detailThumbnailView"
-        android:contentDescription="@string/detailThumbnailViewDescription"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:background="@android:color/black"
-        android:src="@drawable/dummy_thumbnail_dark"/>
-
     <ScrollView
         android:id="@+id/detailMainContent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="visible">
+        android:visibility="visible"
+        tools:ignore="UselessParent">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -35,9 +24,21 @@
             <RelativeLayout
                 android:id="@+id/detailVideoThumbnailWindowLayout"
                 android:layout_width="match_parent"
-                android:layout_height="250dp"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground">
 
+                <ImageView android:id="@+id/detailThumbnailView"
+                    android:contentDescription="@string/detail_thumbnail_view_description"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:scaleType="fitCenter"
+                    android:adjustViewBounds="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:background="@android:color/black"
+                    android:src="@drawable/dummy_thumbnail_dark"/>
+
                 <ProgressBar android:id="@+id/detailProgressBar"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -48,12 +49,11 @@
                     android:id="@+id/playVideoButton"
                     android:visibility="invisible"
                     android:layout_width="wrap_content"
-
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    app:backgroundTint="@color/primaryColorYoutube"
+                    app:backgroundTint="@color/light_youtube_primary_color"
                     android:src="@drawable/ic_play_arrow_black"
-                    android:layout_margin="20dp"/>
+                    android:layout_margin="@dimen/video_item_detail_play_fab_margin"/>
 
                 <Button
                     android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
@@ -67,12 +67,9 @@
                 android:visibility="invisible"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingRight="5dp"
-                android:paddingLeft="5dp"
+                android:padding="@dimen/video_item_detail_info_text_padding"
                 android:layout_below="@id/detailVideoThumbnailWindowLayout"
-                android:background="@color/background_gray">
+                android:background="@color/light_background_color">
 
                 <TextView android:id="@+id/detailVideoTitleView"
                     android:layout_width="wrap_content"
@@ -80,14 +77,13 @@
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textStyle="bold"
-                    android:paddingBottom="3dp"
-                    android:textSize="@dimen/text_video_title_size"
+                    android:textSize="@dimen/video_item_detail_title_text_size"
                     android:textAppearance="?android:attr/textAppearanceLarge"/>
 
                 <ImageView android:id="@+id/detailUploaderThumbnailView"
-                    android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                    android:layout_width="80dp"
-                    android:layout_height="80dp"
+                    android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+                    android:layout_width="@dimen/video_item_detail_uploader_image_size"
+                    android:layout_height="@dimen/video_item_detail_uploader_image_size"
                     android:layout_below="@id/detailVideoTitleView"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
@@ -100,17 +96,16 @@
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
                     android:textStyle="bold"
-                    android:textSize="@dimen/text_video_uploader_size"
+                    android:textSize="@dimen/video_item_detail_uploader_text_size"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
 
                 <TextView android:id="@+id/detailViewCountView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="3dp"
                     android:layout_below="@id/detailVideoTitleView"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
-                    android:textSize="@dimen/text_video_views_size"
+                    android:textSize="@dimen/video_item_detail_views_text_size"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
 
                 <TextView android:id="@+id/detailThumbsDownCountView"
@@ -119,20 +114,17 @@
                     android:layout_below="@id/detailViewCountView"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
-                    android:textSize="@dimen/text_video_like_size"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
                 <ImageView android:id="@+id/detailThumbsDownImgView"
-                    android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                    android:layout_width="30dp"
-                    android:layout_height="15dp"
+                    android:contentDescription="@string/detail_dislikes_img_view_description"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
                     android:layout_below="@id/detailViewCountView"
                     android:layout_toLeftOf="@id/detailThumbsDownCountView"
                     android:layout_toStartOf="@id/detailThumbsDownCountView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
+                    android:layout_marginLeft="@dimen/video_item_detail_like_margin"
                     android:src="@drawable/thumbs_down" />
 
                 <TextView android:id="@+id/detailThumbsUpCountView"
@@ -141,20 +133,16 @@
                     android:layout_below="@id/detailViewCountView"
                     android:layout_toLeftOf="@id/detailThumbsDownImgView"
                     android:layout_toStartOf="@id/detailThumbsDownImgView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
-                    android:textSize="@dimen/text_video_like_size"
+                    android:textSize="@dimen/video_item_detail_likes_text_size"
                     android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <ImageView android:id="@+id/detailThumbsUpImgView"
-                    android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                    android:layout_width="30dp"
-                    android:layout_height="15dp"
+                    android:contentDescription="@string/detail_likes_img_view_description"
+                    android:layout_width="@dimen/video_item_detail_like_image_width"
+                    android:layout_height="@dimen/video_item_detail_like_image_height"
                     android:layout_below="@id/detailViewCountView"
                     android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                    android:layout_toStartOf="@id/detailThumbsUpImgView"
-                    android:paddingRight="5dp"
-                    android:paddingLeft="5dp"
+                    android:layout_toStartOf="@id/detailThumbsUpCountView"
                     android:src="@drawable/thumbs_up" />
 
                 <TextView android:id="@+id/detailUploadDateView"
@@ -163,7 +151,7 @@
                     android:layout_below="@id/detailUploaderView"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
-                    android:textSize="@dimen/text_video_upload_date_size"
+                    android:textSize="@dimen/video_item_detail_upload_date_text_size"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
 
                 <TextView android:id="@+id/detailDescriptionView"
@@ -172,52 +160,50 @@
                     android:layout_below="@id/detailUploadDateView"
                     android:layout_alignParentLeft="true"
                     android:layout_alignParentStart="true"
-                    android:textSize="@dimen/text_video_description_size"
+                    android:textSize="@dimen/video_item_detail_description_text_size"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
 
-                <RelativeLayout
-                    android:id="@+id/detailNextVideoRootLayout"
+                <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:padding="@dimen/video_item_detail_info_text_padding"
                     android:layout_below="@id/detailDescriptionView" >
 
                     <TextView android:id="@+id/detailNextVideoTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/text_video_upload_date_size"
+                        android:layout_centerHorizontal="true"
+                        android:textSize="@dimen/video_item_detail_next_text_size"
                         android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:textColor="@android:color/black"
-                        android:text="@string/nextVideoTitle"
-                        />
-                    <FrameLayout
-                        android:id="@+id/detailNextVideoFrame"
+                        android:text="@string/next_video_title"
+                        android:textAllCaps="true" />
+
+                    <RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/detailNextVideoTitle"/>
-                    <Button
-                        android:id="@+id/detailNextVideoButton"
+                        android:layout_below="@id/detailNextVideoTitle">
+                        <FrameLayout
+                            android:id="@+id/detailNextVideoFrame"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"/>
+                        <Button
+                            android:id="@+id/detailNextVideoButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_alignTop="@id/detailNextVideoFrame"
+                            android:layout_alignBottom="@id/detailNextVideoFrame"
+                            android:background="?attr/selectableItemBackground"/>
+                    </RelativeLayout>
+                    <Button android:id="@+id/detailShowSimilarButton"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_alignTop="@id/detailNextVideoFrame"
-                        android:layout_alignBottom="@id/detailNextVideoFrame"
-                        android:background="?attr/selectableItemBackground"/>
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/detailNextVidButtonAndContentLayout"
+                        android:textSize="@dimen/video_item_detail_similar_text_size"
+                        android:text="@string/similar_videos_btn_text"/>
                 </RelativeLayout>
 
-                <Button android:id="@+id/detailShowSimilarButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="6dp"
-                    android:layout_marginRight="6dp"
-                    android:layout_below="@id/detailNextVideoRootLayout"
-                    android:text="@string/showSimilarVideosButtonText"/>
             </RelativeLayout>
         </RelativeLayout>
     </ScrollView>
-</RelativeLayout>
+</FrameLayout>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/loading"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <ProgressBar
+        android:id="@+id/paginate_progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="10dp" />
+
+</LinearLayout>

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

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:background="@color/background_notification_color"
+    tools:targetApi="jelly_bean">
+
+    <ImageView
+        android:id="@+id/backgroundCover"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:src="@drawable/dummy_thumbnail"
+        android:scaleType="centerCrop"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/backgroundSongName"
+            style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="title" />
+
+        <TextView
+            android:id="@+id/backgroundArtist"
+            style="@android:style/TextAppearance.StatusBar.EventContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="artist" />
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/backgroundPlayPause"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
+        android:background="#00ffffff"
+        android:clickable="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_play_arrow_white_48dp" />
+
+    <ImageButton
+        android:id="@+id/backgroundStop"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
+        android:background="#00ffffff"
+        android:clickable="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_close_white_24dp" />
+
+</LinearLayout>

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:background="@color/background_notification_color"
+    tools:targetApi="jelly_bean" >
+
+    <ImageView
+        android:id="@+id/backgroundCover"
+        android:layout_width="128dp"
+        android:layout_height="128dp"
+        android:layout_marginRight="8dp"
+        android:src="@drawable/dummy_thumbnail"
+        android:scaleType="centerCrop"/>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@+id/backgroundButtons"
+        android:layout_toRightOf="@+id/backgroundCover"
+        android:gravity="center_vertical"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/backgroundSongName"
+            style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="40dp"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="title" />
+
+        <TextView
+            android:id="@+id/backgroundArtist"
+            style="@android:style/TextAppearance.StatusBar.EventContent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:text="artist" />
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/backgroundStop"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_alignParentRight="true"
+        android:layout_margin="5dp"
+        android:background="#00ffffff"
+        android:clickable="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/ic_close_white_24dp" />
+
+    <LinearLayout
+        android:id="@+id/backgroundButtons"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_alignBottom="@id/backgroundCover"
+        android:layout_alignParentRight="true"
+        android:layout_toRightOf="@+id/backgroundCover"
+        android:orientation="horizontal" >
+
+        <ImageButton
+            android:id="@+id/backgroundPlayPause"
+            android:layout_width="0dp"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:layout_weight="1"
+            android:background="#00ffffff"
+            android:clickable="true"
+            android:scaleType="centerInside"
+            android:src="@drawable/ic_play_arrow_white_48dp" />
+    </LinearLayout>
+
+</RelativeLayout>

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

@@ -1,67 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="92dp"
-    android:padding="6dp">
+    android:layout_height="wrap_content" >
 
-    <ImageView android:id="@+id/itemThumbnailView"
-        android:contentDescription="@string/itemThumbnailViewDescription"
-        android:layout_width="142dp"
-        android:layout_height="80dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginRight="6dp"
-        android:scaleType="centerCrop"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:src="@drawable/dummy_thumbnail"/>
-
-    <TextView android:id="@+id/itemVideoTitleView"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_toEndOf="@id/itemThumbnailView"
-        android:layout_alignParentTop="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="@dimen/text_search_title_size"/>
-
-    <TextView android:id="@+id/itemUploaderView"
-        android:layout_width="wrap_content"
-        android:layout_height="18dp"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_toEndOf="@id/itemThumbnailView"
-        android:layout_below="@id/itemVideoTitleView"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/text_search_uploader_size"/>
-
-    <TextView android:id="@+id/itemUploadDateView"
-        android:layout_width="wrap_content"
+    <android.support.v7.widget.CardView
+        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/card_view"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_toEndOf="@id/itemThumbnailView"
-        android:layout_below="@id/itemUploaderView"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/text_search_uploadtime_size"
-        />
+        card_view:cardCornerRadius="@dimen/video_item_search_card_radius"
+        android:layout_marginTop="@dimen/video_item_search_card_vertical_margin"
+        android:layout_marginBottom="@dimen/video_item_search_card_vertical_margin"
+        android:layout_marginLeft="@dimen/video_item_search_card_horizontal_margin"
+        android:layout_marginRight="@dimen/video_item_search_card_horizontal_margin" >
 
-    <TextView android:id="@+id/itemDurationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/itemThumbnailView"
-        android:layout_alignRight="@id/itemThumbnailView"
-        android:layout_alignEnd="@id/itemThumbnailView"
-        android:layout_marginRight="2dp"
-        android:layout_marginEnd="2dp"
-        android:layout_marginBottom="2dp"
-        android:paddingTop="1dp"
-        android:paddingBottom="1dp"
-        android:paddingRight="5dp"
-        android:paddingLeft="5dp"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/text_search_duration_size"
-        android:background="@color/durationBackground"
-        android:textColor="@color/durationText"/>
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/video_item_search_card_padding">
 
-</RelativeLayout>
+            <RelativeLayout android:id="@+id/itemThumbnailViewContainer"
+                android:layout_marginRight="@dimen/video_item_search_image_right_margin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:ignore="RtlHardcoded">
+
+                <ImageView android:id="@+id/itemThumbnailView"
+                    android:contentDescription="@string/list_thumbnail_view_description"
+                    android:layout_width="@dimen/video_item_search_thumbnail_image_width"
+                    android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+                    android:scaleType="centerCrop"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:src="@drawable/dummy_thumbnail"/>
+
+                <TextView android:id="@+id/itemDurationView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignBottom="@id/itemThumbnailView"
+                    android:layout_alignRight="@id/itemThumbnailView"
+                    android:layout_alignEnd="@id/itemThumbnailView"
+                    android:layout_marginRight="@dimen/video_item_search_duration_margin"
+                    android:layout_marginEnd="@dimen/video_item_search_duration_margin"
+                    android:layout_marginBottom="@dimen/video_item_search_duration_margin"
+                    android:paddingTop="@dimen/video_item_search_duration_vertical_padding"
+                    android:paddingBottom="@dimen/video_item_search_duration_vertical_padding"
+                    android:paddingRight="@dimen/video_item_search_duration_horizontal_padding"
+                    android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/video_item_search_duration_text_size"
+                    android:background="@color/duration_dackground_color"
+                    android:textColor="@color/duration_text_color"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="@dimen/video_item_search_thumbnail_image_height"
+                android:layout_toRightOf="@id/itemThumbnailViewContainer"
+                tools:ignore="RtlHardcoded">
+
+                <TextView android:id="@+id/itemVideoTitleView"
+                    android:layout_weight="1"
+                    android:layout_width="fill_parent"
+                    android:layout_height="0dp"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textSize="@dimen/video_item_search_title_text_size"/>
+
+                <TextView android:id="@+id/itemUploaderView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/video_item_search_uploader_text_size"/>
+
+                <TextView android:id="@+id/itemUploadDateView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:singleLine="true"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textSize="@dimen/video_item_search_upload_date_text_size"/>
+
+            </LinearLayout>
+
+        </RelativeLayout>
+    </android.support.v7.widget.CardView>
+</LinearLayout>

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/menu_item_screen_rotation"
-        android:title="@string/screenRotation"
+        android:title="@string/screen_rotation"
         app:showAsAction="always"
         android:icon="@drawable/ic_screen_rotation_white"/>
 </menu>

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item android:id="@+id/menu_item_play_audio"
-        android:title="@string/playAudio"
+        android:title="@string/play_audio"
         app:showAsAction="ifRoom"
         android:icon="@drawable/ic_headset_black" />
 
@@ -18,7 +18,7 @@
         android:icon="@drawable/ic_share_black"/>
 
     <item android:id="@+id/action_play_with_kodi"
-        android:title="@string/playWithKodiTitle"
+        android:title="@string/play_with_kodi_title"
         app:showAsAction="ifRoom"
         android:icon="@drawable/ic_cast_black"/>
 

app/src/main/res/values-de/strings.xml

@@ -1,54 +1,62 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="viewCountText">%1$s Aufrufe</string>
-    <string name="uploadDateText">Hochgeladen am %1$s</string>
-    <string name="noPlayerFound">Keinen Streamplayer gefunden. Vielleicht möchtest du einen installieren.</string>
-    <string name="installStreamPlayer">Jetzt installieren</string>
+    <string name="view_count_text">%1$s Aufrufe</string>
+    <string name="upload_date_text">Hochgeladen am %1$s</string>
+    <string name="no_player_found">Keinen Streamplayer gefunden. Möchtest du VLC installieren?</string>
+    <string name="install">Jetzt installieren</string>
     <string name="cancel">Abbrechen</string>
     <string name="open_in_browser">In Browser öffnen</string>
     <string name="share">Teilen</string>
     <string name="download">Download</string>
     <string name="search">Suchen</string>
     <string name="settings">Einstellungen</string>
-    <string name="didYouMean">Meintest du: </string>
-    <string name="searchPage">Suchseite: </string>
-    <string name="shareDialogTitle">Teilen mit:</string>
-    <string name="chooseBrowser">Browser:</string>
-    <string name="screenRotation">Rotation</string>
-    <string name="title_activity_settings">Einstellungen</string>
+    <string name="did_you_mean">Meintest du: </string>
+    <string name="search_page">Suchseite: </string>
+    <string name="share_dialog_title">Teilen mit:</string>
+    <string name="choose_browser">Browser:</string>
+    <string name="screen_rotation">Rotation</string>
+    <string name="settings_activity_title">Einstellungen</string>
     <string name="useExternalPlayerTitle">Externen Player benutzen</string>
-    <string name="downloadLocation">Downloadverzeichnis</string>
-    <string name="downloadLocationSummary">Verzeichnis in dem heruntergeladene Videos gespeichert werden.</string>
-    <string name="downloadLocationDialogTitle">Download Verzeichnis eingeben</string>
-    <string name="autoPlayThroughIntentTitle">Automatisches 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="download_path_title">Downloadverzeichnis</string>
+    <string name="download_path_summary">Verzeichnis in dem heruntergeladene Videos gespeichert werden.</string>
+    <string name="download_path_dialog_title">Download Verzeichnis eingeben</string>
+    <string name="autoplay_through_intent_title">Automatisches Abspielen durch Intent</string>
+    <string name="autoplay_through_intent_summary">Startet ein Video automatisch wenn es von einer anderen App aufgerufen wurde.</string>
+    <string name="default_resolution_title">Standard Auflösung</string>
+    <string name="play_with_kodi_title">Mit Kodi abspielen</string>
+    <string name="kore_not_found">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="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">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 name="show_play_with_kodi_title">Zeige \"Mit Kodi abspielen\" Option</string>
+    <string name="show_play_with_kodi_summary">Zeigt eine Option an, über die man Videos mit dem Kodi Mediacenter abspielen kann.</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Bevorzugtes Audio Format</string>
+    <string name="webm_description">WebM — freies Format</string>
+    <string name="m4a_description">m4a — bessere Qualität</string>
+    <string name="download_dialog_title">Herunterladen</string>
     <string-array name="downloadOptions">
         <item>Video</item>
         <item>Audio</item>
     </string-array>
-    <string name="nextVideoTitle">Nächstes Video</string>
-    <string name="showNextAndSimilarTitle">Zeige nächstes und ähnliche Videos</string>
-    <string name="urlNotSupportedText">URL wird nicht unterstützt.</string>
-    <string name="showSimilarVideosButtonText">Ähnliche Videos</string>
-    <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
-    <string name="settingsCategoryEtcTitle">ETC</string>
-<string name="searchLanguageTitle">Bevorzugte Sprache</string>
-    <string name="itemThumbnailViewDescription">Video-Vorschau-Bild</string>
-    <string name="detailThumbnailViewDescription">Video-Vorschau-Bild</string>
-    <string name="detailUploaderThumbnailViewDescription">Nutzerbild</string>
-    <string name="detailThumbsDownImgViewDescription">gefällt nicht</string>
-    <string name="detailThumbsUpImgViewDescription">gefällt</string>
-</resources>
+    <string name="next_video_title">Nächstes Video</string>
+    <string name="show_next_and_similar_title">Zeige nächstes und ähnliche Videos</string>
+    <string name="url_not_supported_toast">URL wird nicht unterstützt.</string>
+    <string name="similar_videos_btn_text">Ähnliche Videos</string>
+    <string name="settings_category_video_audio_title">Video &amp; Audio</string>
+    <string name="search_language_title">Bevorzugte Sprache des Inhalts</string>
+    <string name="list_thumbnail_view_description">Video-Vorschau-Bild</string>
+    <string name="detail_thumbnail_view_description">Video-Vorschau-Bild</string>
+    <string name="detail_uploader_thumbnail_view_description">Nutzerbild</string>
+    <string name="detail_dislikes_img_view_description">Gefällt nicht</string>
+    <string name="detail_likes_img_view_description">Gefällt</string>
+    <string name="loading">Lade</string>
+    <string name="use_external_video_player_title">Benutze externen Videoabspieler</string>
+    <string name="use_external_audio_player_title">Benutze externen Audioabspieler</string>
+    <string name="background_player_playing_toast">Spiele im Hintergrund ab</string>
+    <string name="play_btn_text">Abspielen</string>
+
+    <string name="use_tor_title">Benutze TOR</string>
+    <string name="use_tor_summary">Erzwinge das Herunterladen durch TOR für verbesserte Privatsphäre (Videostream noch nicht unterstützt)</string>
+<string name="background_player_name">NewPipe Hintergrundwiedergabe</string>
+    <string name="network_error">Netzwerk Fehler</string>
+
+    </resources>

app/src/main/res/values-es/strings.xml

@@ -1,40 +1,41 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="viewCountText">%1$s visitas</string>
-    <string name="uploadDateText">Subido el %1$s</string>
-    <string name="noPlayerFound">No se ha encontrado ningún reproductor de vídeo. Quizás quieras instalar alguno.</string>
-    <string name="installStreamPlayer">Instalarlo</string>
+    <string name="view_count_text">%1$s visitas</string>
+    <string name="upload_date_text">Subido el %1$s</string>
+    <string name="no_player_found">No se ha encontrado ningún reproductor de vídeo. Quizás quieras instalar alguno.</string>
+    <string name="install">Instalarlo</string>
     <string name="cancel">Cancelar</string>
     <string name="open_in_browser">Abrir en el navegador</string>
     <string name="share">Compartir</string>
     <string name="download">Descargar</string>
     <string name="search">Buscar</string>
     <string name="settings">Ajustes</string>
-    <string name="didYouMean">"¿Querías 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="did_you_mean">"¿Querías decir?: "</string>
+    <string name="search_page">Buscar página: </string>
+    <string name="share_dialog_title">Compartir con:</string>
+    <string name="choose_browser">Selecciona navegador:</string>
+    <string name="screen_rotation">rotación</string>
+    <string name="settings_activity_title">Ajustes</string>
     <string name="useExternalPlayerTitle">Usar reproductor externo</string>
-    <string name="downloadLocation">Descargar en&#8230;</string>
-    <string name="downloadLocationSummary">Ruta donde guardar 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">Reproducir los vídeos automaticamente cuando se llama desde 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="download_path_title">Descargar en…</string>
+    <string name="download_path_summary">Ruta donde guardar los vídeos descargados.</string>
+    <string name="download_path_dialog_title">Localización del directorio de descargas</string>
+    <string name="autoplay_through_intent_title">Reproducción automática</string>
+    <string name="autoplay_through_intent_summary">Reproducir los vídeos automaticamente cuando se llama desde otra aplicación.</string>
+    <string name="default_resolution_title">Resolución por defecto</string>
+    <string name="play_with_kodi_title">Reproducir con Kodi</string>
+    <string name="kore_not_found">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="showPlayWithKodiTitle">Mostrar la opción \"Reproducir con Kodi\"</string>
-    <string name="showPlayWithKodiSummary">Muestra una opción para reproducir el vídeo con Kodi media center.</string>
-<string name="leftPlayButtonTitle">Mostrar el botón de reproducir en el lado izquierdo.</string>
-    <string name="playAudio">Audio</string>
-    <string name="defaultAudioFormatTitle">Formato de audio por defecto</string>
-    <string name="webMAudioDescription">WebM - formato libre</string>
-    <string name="m4aAudioDescription">m4a - mejor calidad</string>
-    <string name="downloadDialogTitle">Descargar</string>
-    <string name="nextVideoTitle">Siguiente vídeo</string>
-    <string name="urlNotSupportedText">URL no soportada.</string>
-    <string name="showSimilarVideosButtonText">Vídeos similares</string>
-</resources>
+    <string name="show_play_with_kodi_title">Mostrar la opción \"Reproducir con Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Muestra una opción para reproducir el vídeo con Kodi media center.</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Formato de audio por defecto</string>
+    <string name="webm_description">WebM — formato libre</string>
+    <string name="m4a_description">m4a — mejor calidad</string>
+    <string name="download_dialog_title">Descargar</string>
+    <string name="next_video_title">Siguiente vídeo</string>
+    <string name="url_not_supported_toast">URL no soportada.</string>
+    <string name="similar_videos_btn_text">Vídeos similares</string>
+<string name="background_player_name">Reproductor de fondo NewPipe</string>
+    <string name="loading">Cargando</string>
+    </resources>

app/src/main/res/values-eu/strings.xml

@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">%1$s ikustaldi</string>
+    <string name="upload_date_text">Argitaratze-data: %1$s</string>
+    <string name="install">Instalatu</string>
+    <string name="cancel">Utzi</string>
+    <string name="open_in_browser">Nabigatzailean ireki</string>
+    <string name="share">Partekatu</string>
+    <string name="loading">Kargatzen</string>
+    <string name="download">Deskargatu</string>
+    <string name="search">Bilatu</string>
+    <string name="settings">Ezarpenak</string>
+    <string name="share_dialog_title">Partekatu honekin:</string>
+    <string name="choose_browser">Nabigatzailea aukeratu:</string>
+    <string name="screen_rotation">biratzea</string>
+    <string name="settings_activity_title">Ezarpenak</string>
+    <string name="download_path_title">Deskargatzeko kokapena</string>
+    <string name="download_path_summary">Deskargatutako bideoak gordetzeko lekua.</string>
+    <string name="download_path_dialog_title">Sar ezazu deskargatzeko lekua</string>
+    <string name="default_resolution_title">Lehenetsitako bereizmena</string>
+    <string name="play_with_kodi_title">Kodirekin erreproduzitu</string>
+    <string name="kore_not_found">Kore aplikazioa ez da aurkitu. Kore beharrezkoa da Kodi multimedia zentroarekin bideoak erreproduzitzeko.</string>
+    <string name="installeKore">Kore instalatu</string>
+    <string name="show_play_with_kodi_title">\"Kodirekin erreproduzitu\" aukera erakutsi</string>
+    <string name="show_play_with_kodi_summary">Kodi multimedia zentroarekin bideoa erreproduzitzeko aukera erakusten du.</string>
+    <string name="play_audio">Audioa</string>
+    <string name="default_audio_format_title">Audio formatu lehenetsia</string>
+    <string name="webm_description">WebM &#8212; formatu askea</string>
+    <string name="m4a_description">m4a &#8212; kalitate hobea</string>
+    <string name="download_dialog_title">Deskargatu</string>
+    <string name="next_video_title">Hurrengo bideoa</string>
+    <string name="show_next_and_similar_title">Hurrengo bideoa eta antzekoak erakutsi</string>
+    <string name="url_not_supported_toast">URLa ez da onartzen.</string>
+    <string name="similar_videos_btn_text">Antzeko bideoak</string>
+    <string name="search_language_title">Edukiaren hizkuntz lehenetsia</string>
+    <string name="settings_category_video_audio_title">Bideoa eta Audioa</string>
+    <string name="play_btn_text">Erreproduzitu</string>
+
+    <string name="list_thumbnail_view_description">Bideoaren aurreikuspen argazkitxoa</string>
+    <string name="detail_thumbnail_view_description">Bideoaren aurreikuspen argazkitxoa</string>
+    <string name="detail_uploader_thumbnail_view_description">Igotzailearen argazkitxoa</string>
+    <string name="detail_dislikes_img_view_description">Ez dute gustoko</string>
+    <string name="detail_likes_img_view_description">Gustoko dute</string>
+    <string name="use_tor_title">Tor erabili</string>
+    <string name="use_tor_summary">Trafikoa Tor bidez deskargatzea behartzen du pribatutasuna hobetzeko (jario bideoak ez daude oraindik onartuta)</string>
+    <string name="background_player_name">NewPipe atzeko planoko erreproduzitzailea</string>
+    <string name="no_player_found">Jario erreproduzitzailerik ez da aurkitu. Agian bat instalatu nahi dezakezu.</string>
+    <string name="did_you_mean">"Hau esan nahi al zenuen: "</string>
+    <string name="search_page">"Orrialdea bilatu: "</string>
+    <string name="use_external_video_player_title">Kanpoko bideo erreproduzitzailea erabili</string>
+    <string name="use_external_audio_player_title">Kanpoko audio erreproduzitzailea erabili</string>
+    <string name="autoplay_through_intent_title">Intent bidez automatikoki erreproduzitu</string>
+    <string name="autoplay_through_intent_summary">Bideoa automatikoki hasten du beste aplikazio batetik deitu denean.</string>
+    <string name="background_player_playing_toast">Atzeko planoan erreproduzitzen</string>
+</resources>

app/src/main/res/values-fa/strings.xml

@@ -1,43 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="viewCountText">%1$s نماها</string>
-    <string name="uploadDateText">بارگذاری‌شده در: %1$s</string>
-    <string name="noPlayerFound">هیچ پخش‌کننده‌ی جریانی یافت نشد. ممکن است بخواهید یکی نصب کنید.</string>
-    <string name="installStreamPlayer">نصب کنید</string>
+    <string name="view_count_text">%1$s نماها</string>
+    <string name="upload_date_text">بارگذاری‌شده در: %1$s</string>
+    <string name="no_player_found">هیچ پخش‌کننده‌ی جریانی یافت نشد. ممکن است بخواهید یکی نصب کنید.</string>
+    <string name="install">نصب کنید</string>
     <string name="cancel">انصراف</string>
     <string name="open_in_browser">بازکردن در مرورگر</string>
     <string name="share">هم‌رسانی</string>
     <string name="download">بارگیری</string>
     <string name="search">جستجو</string>
     <string name="settings">تنظیمات</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="did_you_mean">منظورتان این است: </string>
+    <string name="search_page">صفحه‌ی جستجو: </string>
+    <string name="share_dialog_title">هم‌رسانی با:</string>
+    <string name="choose_browser">مرورگر را برگزینید:</string>
+    <string name="screen_rotation">چرخش</string>
+    <string name="settings_activity_title">تنظیمات</string>
     <string name="useExternalPlayerTitle">استفاده از پخش‌کننده‌ی خارجی</string>
-    <string name="downloadLocation">محل بارگیری</string>
-    <string name="downloadLocationSummary">مسیری که ویدئوهای دریافت شده در آن ذخیره می‌شوند.</string>
-    <string name="downloadLocationDialogTitle">مسیر دریافت را وارد کنید</string>
-    <string name="autoPlayThroughIntentTitle">پخش خودکار از Intent</string>
-    <string name="autoPlayThroughIntentSummary">ویدئو هنگامی که از برنامه‌ی دیگری فراخوانده شد خودکار پخش می‌شود.</string>
-    <string name="defaultResolutionPreferenceTitle">وضوح پیش‌فرض</string>
-    <string name="playWithKodiTitle">پخش با Kodi</string>
-    <string name="koreNotFound">برنامه‌ی Kore نصب نیست. برای پخش کردن ویدئوها با مرکز رسانه‌ی Kodi، به Kore نیاز دارید.</string>
+    <string name="download_path_title">محل بارگیری</string>
+    <string name="download_path_summary">مسیری که ویدئوهای دریافت شده در آن ذخیره می‌شوند.</string>
+    <string name="download_path_dialog_title">مسیر دریافت را وارد کنید</string>
+    <string name="autoplay_through_intent_title">پخش خودکار از Intent</string>
+    <string name="autoplay_through_intent_summary">ویدئو هنگامی که از برنامه‌ی دیگری فراخوانده شد خودکار پخش می‌شود.</string>
+    <string name="default_resolution_title">وضوح پیش‌فرض</string>
+    <string name="play_with_kodi_title">پخش با Kodi</string>
+    <string name="kore_not_found">برنامه‌ی Kore نصب نیست. برای پخش کردن ویدئوها با مرکز رسانه‌ی Kodi، به Kore نیاز دارید.</string>
     <string name="installeKore">نصب Kore</string>
-    <string name="showPlayWithKodiTitle">نمایش گزینه‌ی «پخش با Kodi»</string>
-    <string name="showPlayWithKodiSummary">گزینه‌ای برای پخش کردن ویدئو با مرکز رسانه‌ی Kodi نشان می‌دهد.</string>
-    <string name="leftPlayButtonTitle">نمایش دکمه‌ی پخش در سمت چپ.</string>
-    <string name="playAudio">صدا</string>
-    <string name="defaultAudioFormatTitle">قالب پیش‌فرض صدا</string>
-    <string name="webMAudioDescription">WebM - قالبی آزاد</string>
-    <string name="m4aAudioDescription">m4a - کیفیت بهتر</string>
-    <string name="downloadDialogTitle">دریافت</string>
+    <string name="show_play_with_kodi_title">نمایش گزینه‌ی «پخش با Kodi»</string>
+    <string name="show_play_with_kodi_summary">گزینه‌ای برای پخش کردن ویدئو با مرکز رسانه‌ی Kodi نشان می‌دهد.</string>
+    <string name="play_audio">صدا</string>
+    <string name="default_audio_format_title">قالب پیش‌فرض صدا</string>
+    <string name="webm_description">WebM &#8212; قالبی آزاد</string>
+    <string name="m4a_description">m4a &#8212; کیفیت بهتر</string>
+    <string name="download_dialog_title">دریافت</string>
     <string-array name="downloadOptions">
         <item>ویدئو</item>
         <item>صدا</item>
     </string-array>
-    <string name="nextVideoTitle">ویدئوی بعدی</string>
-    <string name="urlNotSupportedText">پیوند پشتیبانی نمی‌شود.</string>
+    <string name="next_video_title">ویدئوی بعدی</string>
+    <string name="url_not_supported_toast">پیوند پشتیبانی نمی‌شود.</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -1,41 +1,65 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="autoPlayThroughIntentSummary">Démarrer automatiquement la vidéo si elle a été appellée à partir d\'une autre application.</string>
+    <string name="autoplay_through_intent_summary">Lire automatiquement une vidéo si elle a été appelée depuis 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="choose_browser">Choisir un navigateur :</string>
+    <string name="default_resolution_title">Résolution par défaut</string>
+    <string name="did_you_mean">"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="installStreamPlayer">Installer</string>
+    <string name="download_path_title">Emplacement des téléchargements</string>
+    <string name="download_path_dialog_title">Entrez l\'emplacement du téléchargement</string>
+    <string name="download_path_summary">Chemin des vidéos téléchargées</string>
+    <string name="install">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="kore_not_found">L\'application Kore est introuvable. Installer Kore ?</string>
+    <string name="no_player_found">Aucun lecteur streaming trouvé. Installer VLC ?</string>
     <string name="open_in_browser">Ouvrir dans le navigateur</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="autoplay_through_intent_title">Lecture automatique via Intent</string>
+    <string name="play_with_kodi_title">Lire avec Kodi</string>
+    <string name="screen_rotation">rotation</string>
+    <string name="search">Rechercher</string>
+    <string name="search_page">"Rechercher dans la page : "</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="uploadDateText">Mise en ligne le %1$s</string>
+    <string name="share_dialog_title">Partager avec :</string>
+    <string name="show_play_with_kodi_summary">Afficher une option pour lire la vidéo via Kodi media center</string>
+    <string name="show_play_with_kodi_title">Afficher l\'option \"Lire avec Kodi\"</string>
+    <string name="settings_activity_title">Paramètres</string>
+    <string name="upload_date_text">Mise en ligne le %1$s</string>
     <string name="useExternalPlayerTitle">Utiliser un lecteur externe</string>
-    <string name="viewCountText">%1$s vues</string>
-    <string name="leftPlayButtonTitle">Afficher le bouton de lecture sur la gauche.</string>
-    <string name="playAudio">Audio</string>
-    <string name="defaultAudioFormatTitle">Format audio par défaut</string>
-    <string name="webMAudioDescription">WebM- format libre</string>
-    <string name="m4aAudioDescription">m4a - meilleur qualité</string>
-    <string name="downloadDialogTitle">Télécharger</string>
-    <string name="nextVideoTitle">Vidéo suivante</string>
-    <string name="showNextAndSimilarTitle">Afficher les vidéos suivantes et similaires</string>
-    <string name="urlNotSupportedText">URL non supportée.</string>
-    <string name="showSimilarVideosButtonText">Vidéos similaires</string>
+    <string name="view_count_text">%1$s vues</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Format audio par défaut</string>
+    <string name="webm_description">WebM — format libre</string>
+    <string name="m4a_description">m4a — meilleure qualité</string>
+    <string name="download_dialog_title">Télécharger</string>
+    <string name="next_video_title">Vidéo suivante</string>
+    <string name="show_next_and_similar_title">Afficher les vidéos suivantes et similaires</string>
+    <string name="url_not_supported_toast">URL non supportée</string>
+    <string name="similar_videos_btn_text">Vidéos similaires</string>
+    <string name="settings_category_video_audio_title">Vidéo &amp; Audio</string>
+    <string name="settings_category_other_title">Divers</string>
+
+    <string name="list_thumbnail_view_description">Miniature d\'aperçu vidéo</string>
+    <string name="detail_thumbnail_view_description">Miniature d\'aperçu vidéo</string>
+    <string name="detail_dislikes_img_view_description">Je n\'aime pas</string>
+    <string name="detail_likes_img_view_description">J\'aime</string>
+    <string name="search_language_title">Langue du contenu</string>
+    <string name="detail_uploader_thumbnail_view_description">Avatar de l\'utilisateur</string>
+    <string name="use_external_video_player_title">Utiliser un lecteur vidéo externe</string>
+    <string name="use_external_audio_player_title">Utiliser un lecteur audio externe</string>
+    <string name="background_player_playing_toast">Lecture en arrière-plan</string>
+    <string name="background_player_name">Lecteur en arrière-plan NewPipe</string>
+    <string name="loading">Chargement</string>
+    <string name="play_btn_text">Lecture</string>
+
+    <string name="use_tor_title">Utiliser Tor</string>
+    <string name="use_tor_summary">Forcer le trafic de téléchargement via Tor pour plus de confidentialité (vidéos streaming non supporté)</string>
+<string name="theme_title">Thème</string>
+    <string name="dark_theme_title">Sombre</string>
+    <string name="light_theme_title">Clair</string>
+
+    <string name="settings_category_appearance_title">Apparence</string>
+    <string name="network_error">Erreur réseau</string>
+
     </resources>

app/src/main/res/values-he/strings.xml

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">%1$s צפיות</string>
+    <string name="upload_date_text">הועלה בתאריך %1$s</string>
+    <string name="share">שתף</string>
+    <string name="search">חפש</string>
+    <string name="next_video_title">הבא</string>
+    <string name="download">הורדה</string>
+    <string name="settings">הגדרות</string>
+    <string name="settings_activity_title">הגדרות</string>
+    </resources>

app/src/main/res/values-hu/strings.xml

@@ -1,44 +1,43 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="viewCountText">%1$s megtekintés</string>
-    <string name="uploadDateText">Feltöltve: %1$s</string>
-    <string name="noPlayerFound">Nem található lejátszó. Telepítsen egyet!</string>
-    <string name="installStreamPlayer">Telepítsen egyet</string>
+    <string name="view_count_text">%1$s megtekintés</string>
+    <string name="upload_date_text">Feltöltve: %1$s</string>
+    <string name="no_player_found">Nem található lejátszó. Telepítsen egyet!</string>
+    <string name="install">Telepítsen egyet</string>
     <string name="cancel">Mégse</string>
     <string name="open_in_browser">Megnyitás böngészőben</string>
     <string name="share">Megosztá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="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="did_you_mean">Erre gondolt: </string>
+    <string name="search_page">Keresési lap: </string>
+    <string name="share_dialog_title">Megosztás ezzel:</string>
+    <string name="choose_browser">Válasszon böngészőt:</string>
+    <string name="screen_rotation">forgatás</string>
+    <string name="settings_activity_title">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="download_path_title">Letöltések helye</string>
+    <string name="download_path_summary">Útvonal a letöltött videók tárolásához</string>
+    <string name="download_path_dialog_title">Adja meg a letöltési útvonalat</string>
+    <string name="autoplay_through_intent_title">Automatikus lejátszás Intent-en keresztül</string>
+    <string name="autoplay_through_intent_summary">Automatikusan elindítja a videót, ha az külső alkalmazásból volt hívva</string>
+    <string name="default_resolution_title">Alapértelmezett felbontás</string>
+    <string name="play_with_kodi_title">Lejátszás Kodi-val</string>
+    <string name="kore_not_found">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="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 name="show_play_with_kodi_title">\"Lejátszás Kodi-val\" opció mutatása</string>
+    <string name="show_play_with_kodi_summary">Mutat egy opciót a videók Kodi médiaközponttal való lejátszására</string>
+    <string name="play_audio">Hang</string>
+    <string name="default_audio_format_title">Alapértelmezett hang formátum</string>
+    <string name="webm_description">WebM &#8212; szabad formátum</string>
+    <string name="m4a_description">m4a &#8212; jobb minőség</string>
+    <string name="download_dialog_title">Letöltés</string>
     <string-array name="downloadOptions">
         <item>Videó</item>
         <item>Hang</item>
     </string-array>
-<string name="nextVideoTitle">Következő videó</string>
-    <string name="urlNotSupportedText">A webcím nem támogatott.</string>
-<string name="showSimilarVideosButtonText">Hasonló videók</string>
-    </resources>
+    <string name="next_video_title">Következő videó</string>
+    <string name="url_not_supported_toast">A webcím nem támogatott.</string>
+    <string name="similar_videos_btn_text">Hasonló videók</string>
+</resources>

app/src/main/res/values-id

@@ -0,0 +1 @@
+values-in

app/src/main/res/values-in/strings.xml

@@ -0,0 +1,3 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+</resources>

app/src/main/res/values-it/strings.xml

@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">%1$s visite</string>
+    <string name="upload_date_text">Caricato in %1$s</string>
+    <string name="no_player_found">Nessun riproduttore trovato. Dovresti installarne uno.</string>
+    <string name="install">Installa</string>
+    <string name="cancel">Cancella</string>
+    <string name="open_in_browser">Apri nel browser</string>
+    <string name="share">Condividi</string>
+    <string name="download">Scarica</string>
+    <string name="search">Cerca</string>
+    <string name="settings">Impostazioni</string>
+    <string name="did_you_mean">"Intendevi: "</string>
+    <string name="search_page">"Cerca pagina: "</string>
+    <string name="share_dialog_title">Condividi con:</string>
+    <string name="choose_browser">Scegli browser:</string>
+    <string name="screen_rotation">rotazione</string>
+    <string name="settings_activity_title">Impostazioni</string>
+    <string name="useExternalPlayerTitle">Usa un riproduttore video esterno</string>
+    <string name="download_path_title">Cartella di download</string>
+    <string name="download_path_summary">Percorso dove memorizzare i video scaricati.</string>
+    <string name="download_path_dialog_title">Inserisci il percorso di download</string>
+    <string name="autoplay_through_intent_title">Auto riproduzione attraverso internet</string>
+    <string name="autoplay_through_intent_summary">Avvia automaticamente un video quando è stato chiamato da un\'altra applicazione.</string>
+    <string name="default_resolution_title">Risoluzione predefinita</string>
+    <string name="play_with_kodi_title">Riproduci con Kodi</string>
+    <string name="kore_not_found">Kore app non trovata. Kore è richiesto per riprodurre video con Kodi media center.</string>
+    <string name="installeKore">Installa Kore</string>
+    <string name="show_play_with_kodi_title">Mostra l\'opzione \"Riproduci con Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Mostra un opzione per riprodurre un video attraverso Kodi media center.</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Formato audio predefinito</string>
+    <string name="webm_description">WedM &#8212; formato libero</string>
+    <string name="m4a_description">m4a &#8212; qualità migliore</string>
+    <string name="download_dialog_title">Scarica</string>
+    <string name="next_video_title">Prossimo video</string>
+    <string name="show_next_and_similar_title">Mostra i video successivi e simili</string>
+    <string name="url_not_supported_toast">URL non supportato.</string>
+    <string name="similar_videos_btn_text">Video simili</string>
+    <string name="search_language_title">Lingua preferita dei contenuti</string>
+    <string name="settings_category_video_audio_title">VIDEO &amp; AUDIO</string>
+    <string name="settingsCategoryVideoInfoTittle">INFO</string>
+    <string name="settingsCategoryEtcTitle">ETC</string>
+
+    <string name="list_thumbnail_view_description">Anteprima video</string>
+    <string name="detail_thumbnail_view_description">Anteprima video</string>
+    <string name="detail_uploader_thumbnail_view_description">Miniatura caricata</string>
+    <string name="detail_dislikes_img_view_description">Non mi piace</string>
+    <string name="detail_likes_img_view_description">Mi piace</string>
+</resources>

app/src/main/res/values-iw

@@ -0,0 +1 @@
+values-he

app/src/main/res/values-ja/strings.xml

@@ -1,50 +1,65 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="uploadDateText">"アップロード: "%1$s</string>
-    <string name="noPlayerFound">StreamPlayer が見つかりませんでした｡ｲﾝｽﾄｰﾙが必要になるかもしれません｡</string>
-    <string name="installStreamPlayer">ｲﾝｽﾄｰﾙ</string>
+    <string name="upload_date_text">"アップロード: "%1$s</string>
+    <string name="no_player_found">StreamPlayer が見つかりませんでした｡ｲﾝｽﾄｰﾙが必要になるかもしれません｡</string>
+    <string name="install">ｲﾝｽﾄｰﾙ</string>
     <string name="cancel">取り消し</string>
     <string name="open_in_browser">ﾌﾞﾗｳｻﾞｰで開く</string>
     <string name="share">共有</string>
     <string name="download">ﾀﾞｳﾝﾛｰﾄﾞ</string>
     <string name="search">検索</string>
     <string name="settings">設定</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="did_you_mean">"この意味ですか: "</string>
+    <string name="search_page">"検索ﾍﾟｰｼﾞ: "</string>
+    <string name="share_dialog_title">…共有:</string>
+    <string name="choose_browser">ﾌﾞﾗｳｻﾞｰを選択:</string>
+    <string name="screen_rotation">回転</string>
+    <string name="settings_activity_title">設定</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>
-    <string name="playWithKodiTitle">Kodi で再生</string>
-    <string name="koreNotFound">Kore ｱﾌﾟﾘが見つかりません｡ Kodi ﾒﾃﾞｨｱｾﾝﾀｰで動画を再生するには､ Kore が必要です｡</string>
+    <string name="download_path_title">ﾀﾞｳﾝﾛｰﾄﾞする場所</string>
+    <string name="download_path_summary">ﾀﾞｳﾝﾛｰﾄﾞした動画を保存する場所のﾊﾟｽ｡</string>
+    <string name="download_path_dialog_title">ﾀﾞｳﾝﾛｰﾄﾞのﾊﾟｽを入力してください｡</string>
+    <string name="autoplay_through_intent_title">ｲﾝﾃﾝﾄで自動再生</string>
+    <string name="autoplay_through_intent_summary">他のｱﾌﾟﾘｹｰｼｮﾝから呼び出されたとき､自動的に動画再生を開始します｡</string>
+    <string name="default_resolution_title">基本の解像度</string>
+    <string name="play_with_kodi_title">Kodi で再生</string>
+    <string name="kore_not_found">Kore ｱﾌﾟﾘが見つかりません｡ Kodi ﾒﾃﾞｨｱｾﾝﾀｰで動画を再生するには､ Kore が必要です｡</string>
     <string name="installeKore">Kore をｲﾝｽﾄｰﾙ</string>
-    <string name="showPlayWithKodiTitle">\"Kodi で再生\" 設定を表示</string>
-    <string name="showPlayWithKodiSummary">Kodi ﾒﾃﾞｨｱｾﾝﾀｰ経由で動画を再生するための設定を表示します.</string>
-    <string name="leftPlayButtonTitle">左側に再生ﾎﾞﾀﾝを表示.</string>
-    <string name="playAudio">ｵｰﾃﾞｨｵ</string>
-    <string name="defaultAudioFormatTitle">基本のｵｰﾃﾞｨｵﾌｫｰﾏｯﾄ</string>
-    <string name="webMAudioDescription">.WebM - ﾌﾘｰﾌｫｰﾏｯﾄ</string>
-    <string name="m4aAudioDescription">.m4a - より良い品質</string>
-    <string name="downloadDialogTitle">ﾀﾞｳﾝﾛｰﾄﾞ</string>
-    <string name="nextVideoTitle">次の動画</string>
-    <string name="showNextAndSimilarTitle">次の同様の動画を表示します｡</string>
-    <string name="urlNotSupportedText">URL は使用できません｡</string>
-    <string name="showSimilarVideosButtonText">同様の動画</string>
-    <string name="searchLanguageTitle">優先される言語</string>
-    <string name="settingsCategoryVideoAudioTitle">動画とｵｰﾃﾞｨｵ</string>
-    <string name="settingsCategoryVideoInfoTittle">情報</string>
-    <string name="settingsCategoryEtcTitle">その他</string>
-<string name="viewCountText">%1$s ビュー</string>
-    <string name="itemThumbnailViewDescription">ビデオ プレビュー サムネイル</string>
-    <string name="detailThumbnailViewDescription">ビデオ プレビュー サムネイル</string>
-    <string name="detailUploaderThumbnailViewDescription">アップローダー サムネイル</string>
-    <string name="detailThumbsDownImgViewDescription">いいね解除</string>
-    <string name="detailThumbsUpImgViewDescription">いいね</string>
-</resources>
+    <string name="show_play_with_kodi_title">\"Kodi で再生\" 設定を表示</string>
+    <string name="show_play_with_kodi_summary">Kodi ﾒﾃﾞｨｱｾﾝﾀｰ経由で動画を再生するための設定を表示します.</string>
+    <string name="play_audio">ｵｰﾃﾞｨｵ</string>
+    <string name="default_audio_format_title">基本のｵｰﾃﾞｨｵﾌｫｰﾏｯﾄ</string>
+    <string name="webm_description">WebM — ﾌﾘｰﾌｫｰﾏｯﾄ</string>
+    <string name="m4a_description">m4a — より良い品質</string>
+    <string name="download_dialog_title">ﾀﾞｳﾝﾛｰﾄﾞ</string>
+    <string name="next_video_title">次の動画</string>
+    <string name="show_next_and_similar_title">次の同様の動画を表示します｡</string>
+    <string name="url_not_supported_toast">URL は使用できません｡</string>
+    <string name="similar_videos_btn_text">同様の動画</string>
+    <string name="search_language_title">優先される言語</string>
+    <string name="settings_category_video_audio_title">動画とｵｰﾃﾞｨｵ</string>
+    <string name="view_count_text">%1$s ビュー</string>
+    <string name="list_thumbnail_view_description">ビデオ プレビュー サムネイル</string>
+    <string name="detail_thumbnail_view_description">ビデオ プレビュー サムネイル</string>
+    <string name="detail_uploader_thumbnail_view_description">アップローダー サムネイル</string>
+    <string name="detail_dislikes_img_view_description">残念だね</string>
+    <string name="detail_likes_img_view_description">いいね</string>
+    <string name="use_external_video_player_title">外部ビデオ プレイヤーを使用する</string>
+    <string name="use_external_audio_player_title">外部オーディオ プレイヤーを使用する</string>
+    <string name="background_player_playing_toast">バックグラウンドで再生しています</string>
+
+    <string name="background_player_name">NewPipe バックグラウンド プレーヤー</string>
+    <string name="loading">読み込み中</string>
+    <string name="play_btn_text">再生</string>
+
+    <string name="use_tor_title">Tor を使用する</string>
+    <string name="use_tor_summary">強制的に Tor を経由したプライバシーを高めたトラフィックでダウンロードします (ビデオのストリーミングはまだサポートされていません)</string>
+<string name="theme_title">テーマ</string>
+    <string name="dark_theme_title">ダーク</string>
+    <string name="light_theme_title">ライト</string>
+
+    <string name="settings_category_appearance_title">外観</string>
+    <string name="settings_category_other_title">その他</string>
+    <string name="network_error">ネットワーク エラー</string>
+
+    </resources>

app/src/main/res/values-ko/strings.xml

@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">시청 횟수 %1$s</string>
+    <string name="upload_date_text">%1$s에 업로드됨</string>
+    <string name="no_player_found">스트리밍 플레이어가 발견되지 않았습니다. 플레이어를 설치하시기 바랍니다.</string>
+    <string name="install">설치</string>
+    <string name="cancel">취소</string>
+    <string name="open_in_browser">브라우저에서 열기</string>
+    <string name="share">공유</string>
+    <string name="download">다운로드</string>
+    <string name="search">검색</string>
+    <string name="settings">설정</string>
+    <string name="did_you_mean">"혹시 이것을 검색하셨습니까? "</string>
+    <string name="search_page">"검색 페이지: "</string>
+    <string name="share_dialog_title">다음으로 공유:</string>
+    <string name="choose_browser">브라우저 선택:</string>
+    <string name="screen_rotation">회전</string>
+    <string name="settings_activity_title">설정</string>
+    <string name="useExternalPlayerTitle">외부 플레이어 사용</string>
+    <string name="download_path_title">다운로드 위치</string>
+    <string name="download_path_summary">다운로드된 비디오가 저장될 경로를 선택하세요.</string>
+    <string name="download_path_dialog_title">다운로드 경로 입력</string>
+    <string name="autoplay_through_intent_title">인텐트로 경유할 경우 자동 재생</string>
+    <string name="autoplay_through_intent_summary">다른 앱으로부터 호출되었을 경우에 비디오를 자동으로 재생합니다.</string>
+    <string name="default_resolution_title">기본 해상도</string>
+    <string name="play_with_kodi_title">Kodi로 재생</string>
+    <string name="kore_not_found">Kore 앱이 발견되지 않았습니다. Kodi media center로 비디오를 재생하려면 Kore가 필요합니다.</string>
+    <string name="installeKore">Kore 설치</string>
+    <string name="show_play_with_kodi_title">\"Kodi로 재생\" 옵션 표시</string>
+    <string name="show_play_with_kodi_summary">비디오를 Kodi media center를 사용해 재생하는 옵션을 표시합니다.</string>
+    <string name="play_audio">오디오</string>
+    <string name="default_audio_format_title">기본 오디오 포맷</string>
+    <string name="webm_description">WebM &#8212; 무료 자유 포맷입니다</string>
+    <string name="m4a_description">m4a &#8212; 보다 나은 품질</string>
+    <string name="download_dialog_title">다운로드</string>
+    <string name="next_video_title">다음 비디오</string>
+    <string name="show_next_and_similar_title">다음 및 유사한 비디오 표시</string>
+    <string name="url_not_supported_toast">지원하지 않는 URL 입니다.</string>
+    <string name="similar_videos_btn_text">유사한 비디오</string>
+    <string name="search_language_title">선호하는 컨텐츠 언어</string>
+    <string name="settings_category_video_audio_title">비디오 &amp; 오디오</string>
+    <string name="settingsCategoryVideoInfoTittle">정보</string>
+    <string name="settingsCategoryEtcTitle">기타</string>
+
+    <string name="list_thumbnail_view_description">비디오 미리보기 썸네일</string>
+    <string name="detail_thumbnail_view_description">비디오 미리보기 썸네일</string>
+    <string name="detail_uploader_thumbnail_view_description">업로더 썸네일</string>
+    <string name="detail_dislikes_img_view_description">싫어요</string>
+    <string name="detail_likes_img_view_description">좋아요</string>
+</resources>

app/src/main/res/values-land/dimens.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Video Item Search View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_search_title_text_size">22sp</dimen>
+    <dimen name="video_item_search_duration_text_size">16sp</dimen>
+    <dimen name="video_item_search_uploader_text_size">18sp</dimen>
+    <dimen name="video_item_search_upload_date_text_size">18sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_search_thumbnail_image_width">210dp</dimen>
+    <dimen name="video_item_search_thumbnail_image_height">130dp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_search_card_vertical_margin">5dp</dimen>
+    <dimen name="video_item_search_card_horizontal_margin">10dp</dimen>
+    <dimen name="video_item_search_card_padding">10dp</dimen>
+    <dimen name="video_item_search_image_right_margin">10dp</dimen>
+    <dimen name="video_item_search_duration_vertical_padding">1sp</dimen>
+    <dimen name="video_item_search_duration_horizontal_padding">7sp</dimen>
+    <dimen name="video_item_search_duration_margin">5sp</dimen>
+    <!-- Miscellaneous -->
+    <dimen name="video_item_search_card_radius">4dp</dimen>
+
+    <!-- Video Item Detail View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_detail_title_text_size">24sp</dimen>
+    <dimen name="video_item_detail_views_text_size">18sp</dimen>
+    <dimen name="video_item_detail_likes_text_size">16sp</dimen>
+    <dimen name="video_item_detail_uploader_text_size">18sp</dimen>
+    <dimen name="video_item_detail_upload_date_text_size">18sp</dimen>
+    <dimen name="video_item_detail_description_text_size">18sp</dimen>
+    <dimen name="video_item_detail_next_text_size">20sp</dimen>
+    <dimen name="video_item_detail_similar_text_size">20sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_detail_thumbnail_image_height">240dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">100dp</dimen>
+    <dimen name="video_item_detail_like_image_height">20sp</dimen>
+    <dimen name="video_item_detail_like_image_width">20sp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_detail_info_text_padding">10sp</dimen>
+    <dimen name="video_item_detail_like_margin">10sp</dimen>
+    <dimen name="video_item_detail_play_fab_margin">20dp</dimen>
+
+</resources>

app/src/main/res/values-nl/strings.xml

@@ -1,42 +1,49 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="viewCountText">%1$s keer bekeken</string>
-    <string name="uploadDateText">Geüpload op %1$s</string>
-    <string name="noPlayerFound">Geen speler met streaming ondersteuning gevonden. Misschien wil je er een installeren.</string>
-    <string name="installStreamPlayer">Installeer speler</string>
+    <string name="view_count_text">%1$s keer bekeken</string>
+    <string name="upload_date_text">Geüpload op %1$s</string>
+    <string name="no_player_found">Geen speler met streaming ondersteuning gevonden. Misschien wil je er een installeren.</string>
+    <string name="install">Installeer speler</string>
     <string name="cancel">Annuleer</string>
     <string name="open_in_browser">Open in browser</string>
     <string name="share">Deel</string>
     <string name="download">Download</string>
     <string name="search">Zoek</string>
     <string name="settings">Instellingen</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="did_you_mean">Bedoelde je: </string>
+    <string name="search_page">Zoekpagina: </string>
+    <string name="share_dialog_title">Deel met:</string>
+    <string name="choose_browser">Kies browser:</string>
+    <string name="screen_rotation">rotatie</string>
+    <string name="settings_activity_title">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="download_path_title">Downloadlocatie</string>
+    <string name="download_path_summary">Locatie om gedownloadde videos in op te slaan.</string>
+    <string name="download_path_dialog_title">Voer downloadlocatie is</string>
+    <string name="autoplay_through_intent_title">Speel automatisch via Intent</string>
+    <string name="autoplay_through_intent_summary">Speel een video automatisch af indien geopend vanuit een andere app.</string>
+    <string name="default_resolution_title">Standaardresolutie</string>
+    <string name="play_with_kodi_title">Speel af met Kodi</string>
+    <string name="kore_not_found">Kore app niet gevonden. Kore is nodig om videos op Kodi af te spelen.</string>
     <string name="installeKore">Installeer 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>
-    <string name="leftPlayButtonTitle">Afspeel knop aan de linker kant weergeven.</string>
-    <string name="playAudio">Audio</string>
-    <string name="defaultAudioFormatTitle">Standaard audio formaat</string>
-    <string name="webMAudioDescription">Webam - open formaat</string>
-    <string name="m4aAudioDescription">m4a - betere kwaliteit</string>
-    <string name="downloadDialogTitle">Download</string>
-    <string name="nextVideoTitle">Volgende video</string>
-    <string name="urlNotSupportedText">URL wordt niet ondersteund.</string>
-    <string name="showSimilarVideosButtonText">Vergelijkbare videos</string>
-    <string name="showNextAndSimilarTitle">Laat volgende en vergelijkbare videos zien</string>
-    <string name="searchLanguageTitle">Voorkeurs content taal</string>
-</resources>
+    <string name="show_play_with_kodi_title">Toon \"Speel af met Kodi\" optie</string>
+    <string name="show_play_with_kodi_summary">Toont een optie om een video op een Kodi media center af te spelen.</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Standaard audio formaat</string>
+    <string name="webm_description">WebM &#8212; open formaat</string>
+    <string name="m4a_description">m4a &#8212; betere kwaliteit</string>
+    <string name="download_dialog_title">Download</string>
+    <string name="next_video_title">Volgende video</string>
+    <string name="url_not_supported_toast">URL wordt niet ondersteund.</string>
+    <string name="similar_videos_btn_text">Vergelijkbare videos</string>
+    <string name="show_next_and_similar_title">Laat volgende en vergelijkbare videos zien</string>
+    <string name="search_language_title">Voorkeurs content taal</string>
+    <string name="use_external_video_player_title">Gebruik externe videospeler</string>
+    <string name="use_external_audio_player_title">Gebruik externe audiospeler</string>
+    <string name="settings_category_video_audio_title">Video &amp; Geluid</string>
+
+    <string name="list_thumbnail_view_description">Videovoorbeeld thumbnail</string>
+    <string name="detail_thumbnail_view_description">Videovoorbeeld thumbnail</string>
+    <string name="detail_uploader_thumbnail_view_description">Uploader miniatuur</string>
+    <string name="detail_dislikes_img_view_description">Dislikes</string>
+    </resources>

app/src/main/res/values-pl/strings.xml

@@ -1,50 +1,50 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="noPlayerFound">Nie znaleziono odtwarzacza strumieniowego.</string>
-    <string name="installStreamPlayer">Zainstaluj</string>
+    <string name="no_player_found">Nie znaleziono odtwarzacza strumieniowego.</string>
+    <string name="install">Zainstaluj</string>
     <string name="cancel">Anuluj</string>
     <string name="open_in_browser">Otwórz w przeglądarce</string>
     <string name="share">Udostępnij</string>
     <string name="download">Pobierz</string>
     <string name="search">Szukaj</string>
     <string name="settings">Ustawienia</string>
-    <string name="didYouMean">"Czy chodziło Ci o: "</string>
-    <string name="shareDialogTitle">Udostępnij za pośrednictwem:</string>
-    <string name="chooseBrowser">Wybierz przeglądarkę:</string>
-    <string name="screenRotation">obrót</string>
-    <string name="title_activity_settings">Ustawienia</string>
+    <string name="did_you_mean">"Czy chodziło Ci o: "</string>
+    <string name="share_dialog_title">Udostępnij za pośrednictwem:</string>
+    <string name="choose_browser">Wybierz przeglądarkę:</string>
+    <string name="screen_rotation">obrót</string>
+    <string name="settings_activity_title">Ustawienia</string>
     <string name="useExternalPlayerTitle">Użyj zewnętrznego odtwarzacza</string>
-    <string name="downloadLocation">Miejsce zapisu pobieranych plików</string>
-    <string name="downloadLocationSummary">Ścieżka folderu do zapisywania pobieranego wideo.</string>
-    <string name="downloadLocationDialogTitle">Wprowadź ścieżkę folderu dla pobieranych plików</string>
-    <string name="autoPlayThroughIntentTitle">Automatycznie odtwarzaj przez Intent</string>
-    <string name="autoPlayThroughIntentSummary">Automatycznie odtwarza wideo po wywołaniu z innej aplikacji.</string>
-    <string name="defaultResolutionPreferenceTitle">Domyślna rozdzielczość</string>
-    <string name="playWithKodiTitle">Odtwarzaj za pośrednictwem Kodi</string>
-    <string name="koreNotFound">Aplikacja Kore nie została znaleziona. Wymagana jest do odtwarzania w Kodi.</string>
+    <string name="download_path_title">Miejsce zapisu pobieranych plików</string>
+    <string name="download_path_summary">Ścieżka folderu do zapisywania pobieranego wideo.</string>
+    <string name="download_path_dialog_title">Wprowadź ścieżkę folderu dla pobieranych plików</string>
+    <string name="autoplay_through_intent_title">Automatycznie odtwarzaj przez Intent</string>
+    <string name="autoplay_through_intent_summary">Automatycznie odtwarza wideo po wywołaniu z innej aplikacji.</string>
+    <string name="default_resolution_title">Domyślna rozdzielczość</string>
+    <string name="play_with_kodi_title">Odtwarzaj za pośrednictwem Kodi</string>
+    <string name="kore_not_found">Aplikacja Kore nie została znaleziona. Wymagana jest do odtwarzania w Kodi.</string>
     <string name="installeKore">Zainstaluj Kore</string>
-    <string name="showPlayWithKodiTitle">Wyświetlaj opcję \"Odtwarzaj za pośrednictwem Kodi\"</string>
-    <string name="showPlayWithKodiSummary">Wyświetla opcję do odtwarzania wideo przez aplikację Kodi.</string>
-    <string name="leftPlayButtonTitle">Wyświetl przycisk odtwarzania po lewej stronie.</string>
-    <string name="playAudio">Dźwięk</string>
-    <string name="defaultAudioFormatTitle">Domyślny format dźwięku</string>
-    <string name="webMAudioDescription">WebM - otwarty format</string>
-    <string name="m4aAudioDescription">m4a - lepsza jakość</string>
-    <string name="downloadDialogTitle">Pobierz</string>
-    <string name="nextVideoTitle">Następne wideo</string>
-    <string name="showNextAndSimilarTitle">Wyświetl następne i podobne wideo</string>
-    <string name="urlNotSupportedText">Niewspierany URL.</string>
-    <string name="showSimilarVideosButtonText">Podobne wideo</string>
-    <string name="searchLanguageTitle">Preferowany język zawartości</string>
-    <string name="settingsCategoryVideoAudioTitle">WIDEO &amp; DŹWIĘK</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
-    <string name="settingsCategoryEtcTitle">INNE</string>
-<string name="searchPage">"Szukaj strony: "</string>
-    <string name="viewCountText">%1$s wyświetleń</string>
-    <string name="uploadDateText">Opublikowany %1$s</string>
-    <string name="itemThumbnailViewDescription">Miniaturka podglądowa wideo</string>
-    <string name="detailThumbnailViewDescription">Miniaturka podglądowa wideo</string>
-    <string name="detailUploaderThumbnailViewDescription">Miniaturka wysyłającego</string>
-    <string name="detailThumbsDownImgViewDescription">łapek w dół</string>
-    <string name="detailThumbsUpImgViewDescription">polubień</string>
+    <string name="show_play_with_kodi_title">Wyświetlaj opcję \"Odtwarzaj za pośrednictwem Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Wyświetla opcję do odtwarzania wideo przez aplikację Kodi.</string>
+    <string name="play_audio">Dźwięk</string>
+    <string name="default_audio_format_title">Domyślny format dźwięku</string>
+    <string name="webm_description">WebM &#8212; otwarty format</string>
+    <string name="m4a_description">m4a &#8212; lepsza jakość</string>
+    <string name="download_dialog_title">Pobierz</string>
+    <string name="next_video_title">Następne wideo</string>
+    <string name="show_next_and_similar_title">Wyświetl następne i podobne wideo</string>
+    <string name="url_not_supported_toast">Niewspierany URL.</string>
+    <string name="similar_videos_btn_text">Podobne wideo</string>
+    <string name="search_language_title">Preferowany język zawartości</string>
+    <string name="settings_category_video_audio_title">Wideo &amp; Dźwięk</string>
+
+    <string name="search_page">"Szukaj strony: "</string>
+    <string name="view_count_text">%1$s wyświetleń</string>
+    <string name="upload_date_text">Opublikowany %1$s</string>
+    <string name="list_thumbnail_view_description">Miniaturka podglądowa wideo</string>
+    <string name="detail_thumbnail_view_description">Miniaturka podglądowa wideo</string>
+    <string name="detail_uploader_thumbnail_view_description">Miniaturka wysyłającego</string>
+    <string name="detail_dislikes_img_view_description">łapek w dół</string>
+    <string name="detail_likes_img_view_description">Polubień</string>
+    <string name="use_external_video_player_title">Użyj zewnętrznego odtwarzacza wideo</string>
+    <string name="use_external_audio_player_title">Użyj zewnętrznego odtwarzacza audio</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">%1$s visualizações</string>
+    <string name="upload_date_text">Carregado em %1$s</string>
+    <string name="no_player_found">Reprodutor não disponível. Instalar o VLC?</string>
+    <string name="install">Instalar</string>
+    <string name="cancel">Cancelar</string>
+    <string name="open_in_browser">Abrir no navegador</string>
+    <string name="share">Partilhar</string>
+    <string name="download">Descarregar</string>
+    <string name="search">Pesquisar</string>
+    <string name="settings">Definições</string>
+    <string name="did_you_mean">"Será que queria dizer: "</string>
+    <string name="search_page">"Página de pesquisa: "</string>
+    <string name="share_dialog_title">Partilhar com:</string>
+    <string name="choose_browser">Escolher navegador:</string>
+    <string name="screen_rotation">rotação</string>
+    <string name="settings_activity_title">Definições</string>
+    <string name="use_external_video_player_title">Utilizar reprodutor de vídeo externo</string>
+    <string name="use_external_audio_player_title">Utilizar reprodutor de áudio externo</string>
+    <string name="download_path_title">Local para a descarga</string>
+    <string name="download_path_summary">Local para guardar os vídeos descarregados</string>
+    <string name="download_path_dialog_title">Digite o caminho</string>
+    <string name="autoplay_through_intent_title">Reproduzir via Intent</string>
+    <string name="autoplay_through_intent_summary">Iniciar automaticamente o vídeo se for invocado por outra aplicação</string>
+    <string name="default_resolution_title">Resolução padrão</string>
+    <string name="play_with_kodi_title">Reproduzir com Kodi</string>
+    <string name="kore_not_found">Aplicação não encontrada. Instalar o Kore?</string>
+    <string name="installeKore">Instalar o Kore</string>
+    <string name="show_play_with_kodi_title">Mostrar opção \"Reproduzir com Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Mostra uma opção para reproduzir o vídeo com o Kodi</string>
+    <string name="play_audio">Áudio</string>
+    <string name="default_audio_format_title">Formato áudio padrão</string>
+    <string name="webm_description">WebM — formato livre</string>
+    <string name="m4a_description">m4a — melhor qualidade</string>
+    <string name="download_dialog_title">Descarregar</string>
+    <string name="next_video_title">Vídeo seguinte</string>
+    <string name="show_next_and_similar_title">Mostrar vídeos seguintes e similares</string>
+    <string name="url_not_supported_toast">URL não suportado</string>
+    <string name="similar_videos_btn_text">Vídeos similares</string>
+    <string name="search_language_title">Idioma preferencial do conteúdo</string>
+    <string name="settings_category_video_audio_title">Vídeo e áudio</string>
+    <string name="settingsCategoryVideoInfoTittle">Informações</string>
+    <string name="settingsCategoryEtcTitle">Outras</string>
+
+    <string name="list_thumbnail_view_description">Miniatura de vídeos</string>
+    <string name="detail_thumbnail_view_description">Miniatura de vídeos</string>
+    <string name="detail_uploader_thumbnail_view_description">Carregador de miniaturas</string>
+    <string name="detail_dislikes_img_view_description">Não gosto</string>
+    <string name="detail_likes_img_view_description">Gosto</string>
+<string name="background_player_name">Reprodutor de fundo NewPipe</string>
+    <string name="loading">A carregar</string>
+    <string name="theme_title">Tema</string>
+    <string name="dark_theme_title">Escuro</string>
+    <string name="light_theme_title">Claro</string>
+
+    <string name="settings_category_appearance_title">Aparência</string>
+    <string name="settings_category_other_title">Outra</string>
+    <string name="background_player_playing_toast">A reproduzir em segundo plano</string>
+    <string name="play_btn_text">Reproduzir</string>
+    <string name="network_error">Erro de rede</string>
+
+    <string name="use_tor_title">Utilizar Tor</string>
+    <string name="use_tor_summary">Utilizar a rede Tor para ter mais privacidade (ainda não é suportada a transmissão de vídeos)</string>
+</resources>

app/src/main/res/values-ru/strings.xml

@@ -1,46 +1,67 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="viewCountText">%1$s просмотров</string>
-    <string name="uploadDateText">Опубликовано: %1$s</string>
-    <string name="noPlayerFound">Ни одного потокового проигрывателя не было найдено. Установить?</string>
-    <string name="installStreamPlayer">Установить</string>
+    <string name="view_count_text">%1$s просмотров</string>
+    <string name="upload_date_text">Опубликовано %1$s</string>
+    <string name="no_player_found">Ни одного потокового проигрывателя не было найдено. Установить?</string>
+    <string name="install">Установить</string>
     <string name="cancel">Отмена</string>
     <string name="open_in_browser">Открыть в браузере</string>
     <string name="share">Поделиться</string>
     <string name="download">Скачать</string>
     <string name="search">Найти</string>
     <string name="settings">Настройки</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="did_you_mean">Возможно, вы имели в виду: </string>
+    <string name="search_page">Страница поиска: </string>
+    <string name="share_dialog_title">Поделиться с помощью:</string>
+    <string name="choose_browser">Выбрать браузер:</string>
+    <string name="screen_rotation">поворот</string>
+    <string name="settings_activity_title">Настройки</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>
-    <string name="playWithKodiTitle">Воспроизвести с помощью Kodi</string>
-    <string name="koreNotFound">Приложение Kore не наидено. Чтобы проигрывать видео через Kodi media center, нужен Kore.</string>
+    <string name="download_path_title">Место для загрузок</string>
+    <string name="download_path_summary">Папка для хранения загруженных файлов</string>
+    <string name="download_path_dialog_title">Введите путь к папке для загрузок</string>
+    <string name="autoplay_through_intent_title">Автопроигрывание через интернет</string>
+    <string name="autoplay_through_intent_summary">Автоматически воспроизводить видео, открытое через другое приложение</string>
+    <string name="default_resolution_title">Разрешение по-умолчанию</string>
+    <string name="play_with_kodi_title">Воспроизвести с помощью Kodi</string>
+    <string name="kore_not_found">Приложение Kore не наидено. Установить Kore?</string>
     <string name="installeKore">Установить Kore</string>
-    <string name="showPlayWithKodiTitle">Показывать опцию \"Воспроизвести с помощью Kodi\"</string>
-    <string name="showPlayWithKodiSummary">Показать опцию воспроизведения видео через Kodi media center.</string>
-    <string name="leftPlayButtonTitle">Показать кнопку воспроизведения слева.</string>
-    <string name="playAudio">Аудио</string>
-    <string name="defaultAudioFormatTitle">Формат аудио по-умолчанию</string>
-    <string name="webMAudioDescription">WebM - свободный формат</string>
-    <string name="m4aAudioDescription">m4a - лучшее качество</string>
-    <string name="downloadDialogTitle">Скачать</string>
+    <string name="show_play_with_kodi_title">Показывать опцию \"Воспроизвести с помощью Kodi\"</string>
+    <string name="show_play_with_kodi_summary">Показать опцию воспроизведения видео через Kodi media center</string>
+    <string name="play_audio">Аудио</string>
+    <string name="default_audio_format_title">Формат аудио по-умолчанию</string>
+    <string name="webm_description">WebM — свободный формат</string>
+    <string name="m4a_description">m4a — лучшее качество</string>
+    <string name="download_dialog_title">Скачать</string>
     <string-array name="downloadOptions">
         <item>Видео</item>
         <item>Аудио</item>
     </string-array>
-    <string name="nextVideoTitle">Следующее видео</string>
-    <string name="urlNotSupportedText">URL не поддерживается.</string>
-    <string name="showSimilarVideosButtonText">Похожие видео</string>
-    <string name="showNextAndSimilarTitle">Показывать следующее и предложенные видео</string>
-    <string name="searchLanguageTitle">Предпочитаемый язык контента</string>
-</resources>
+    <string name="next_video_title">Следующее видео</string>
+    <string name="url_not_supported_toast">URL не поддерживается</string>
+    <string name="similar_videos_btn_text">Похожие видео</string>
+    <string name="show_next_and_similar_title">Показывать следующее и предложенные видео</string>
+    <string name="search_language_title">Предпочитаемый язык контента</string>
+    <string name="settings_category_video_audio_title">Видео и Аудио</string>
+    <string name="settings_category_appearance_title">Внешний вид</string>
+    <string name="settings_category_other_title">Другое</string>
+
+    <string name="list_thumbnail_view_description">Миниатюра видео-превью</string>
+    <string name="detail_thumbnail_view_description">Миниатюра видео-превью</string>
+    <string name="detail_uploader_thumbnail_view_description">Миниатюра аватара пользователся</string>
+    <string name="detail_dislikes_img_view_description">Дислайки</string>
+    <string name="detail_likes_img_view_description">Лайки</string>
+<string name="use_external_video_player_title">Использовать внешний проигрыватель для видео</string>
+    <string name="use_external_audio_player_title">Использовать внешний проигрыватель для аудио</string>
+    <string name="background_player_playing_toast">Проигрывание в фоновом режиме</string>
+    <string name="background_player_name">Фоновый проигрыватель NewPipe</string>
+    <string name="loading">Загрузка</string>
+    <string name="theme_title">Тема</string>
+    <string name="dark_theme_title">Темная</string>
+    <string name="light_theme_title">Светлая</string>
+
+    <string name="play_btn_text">Воспроизвести</string>
+    <string name="network_error">Ошибка сети</string>
+
+    <string name="use_tor_title">Использовать Tor</string>
+    </resources>

app/src/main/res/values-sl/strings.xml

@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="view_count_text">%1$s pogledov</string>
+    <string name="upload_date_text">Poslano %1$s</string>
+    <string name="no_player_found">Predvajalnika pretoka ni mogoče najti. Ali želite namestiti program VLC?</string>
+    <string name="install">Namesti</string>
+    <string name="cancel">Prekliči</string>
+    <string name="open_in_browser">Odpri v brskalniku</string>
+    <string name="share">Omogoči souporabo</string>
+    <string name="download">Prejmi</string>
+    <string name="search">Poišči</string>
+    <string name="settings">Nastavitve</string>
+    <string name="did_you_mean">"Ste mislili vpisati: "</string>
+    <string name="search_page">"Stran iskanja: "</string>
+    <string name="share_dialog_title">Omogoči souporabo z:</string>
+    <string name="choose_browser">Izbor brskalnika:</string>
+    <string name="screen_rotation">usmerjenost</string>
+    <string name="settings_activity_title">Nastavitve</string>
+    <string name="use_external_video_player_title">Uporabi zunanji predvajalnik videa</string>
+    <string name="use_external_audio_player_title">Uporabi zunanji predvajalnik zvoka</string>
+    <string name="download_path_title">Mapa za prejem</string>
+    <string name="download_path_summary">Pot do mape za prejem datotek</string>
+    <string name="download_path_dialog_title">Vpis poti za prejem</string>
+    <string name="default_resolution_title">Privzeta ločljivost</string>
+    <string name="play_with_kodi_title">Predvajaj s Kodi</string>
+    <string name="kore_not_found">Programa Kore ni mogoče najti. Ali želite program namestiti?</string>
+    <string name="installeKore">Namesti program Kore</string>
+    <string name="show_play_with_kodi_title">Pokaži možnost \"Predvajaj s Kodi\"</string>
+    <string name="default_audio_format_title">Privzet zapis zvoka</string>
+    <string name="play_audio">Zvok</string>
+    <string name="webm_description">WebM — prost zapis</string>
+    <string name="m4a_description">m4a — višja kakovost posnetkov</string>
+    <string name="download_dialog_title">Prejem</string>
+    <string name="next_video_title">Naslednji video</string>
+    <string name="show_next_and_similar_title">Pokaži naslednji video in podobne posnetke</string>
+    <string name="url_not_supported_toast">Zapis naslova URL ni podprt.</string>
+    <string name="similar_videos_btn_text">Podobni posnetki</string>
+    <string name="search_language_title">Prednostni jezik vsebine</string>
+    <string name="settings_category_video_audio_title">Video in Zvok</string>
+    <string name="list_thumbnail_view_description">Sličica predogleda videa</string>
+    <string name="detail_thumbnail_view_description">Sličica predogleda videa</string>
+    <string name="detail_uploader_thumbnail_view_description">Sličica pošiljalnika</string>
+    <string name="autoplay_through_intent_title">Samodejno predvajaj prek vmesnika Intent</string>
+    <string name="autoplay_through_intent_summary">Začne samodejno predvajanje videa, ko je zagnan prek drugega programa.</string>
+    <string name="show_play_with_kodi_summary">Pokaže možnost predvajanja videa preko predstavnega središča Kodi.</string>
+    <string name="settingsCategoryEtcTitle">Drugo</string>
+
+    <string name="detail_likes_img_view_description">Všeč mi je</string>
+<string name="detail_dislikes_img_view_description">Ni mi všeč</string>
+    <string name="background_player_name">Ozadnji predvajalnik NewPipe</string>
+    <string name="loading">Nalaganje ...</string>
+    <string name="background_player_playing_toast">Predvajanje v ozadju</string>
+    <string name="play_btn_text">Predvajaj</string>
+
+    <string name="theme_title">Tema</string>
+    <string name="dark_theme_title">Temna</string>
+    <string name="light_theme_title">Svetla</string>
+
+    <string name="settings_category_appearance_title">Videz</string>
+    <string name="settings_category_other_title">Drugo</string>
+    <string name="network_error">Omrežna napaka</string>
+
+    <string name="use_tor_title">Uporabi Tor</string>
+    <string name="use_tor_summary">Vsili prenos prejema preko sistema Tor za povečanje zasebnosti (pretakanje videa ni še podprto)</string>
+</resources>

app/src/main/res/values-sr/strings.xml

@@ -1,54 +1,69 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="viewCountText">%1$s приказа</string>
-    <string name="uploadDateText">"Отпремљен "%1$s</string>
-    <string name="noPlayerFound">Нема плејера токова. Можда желите да га инсталирате.</string>
-    <string name="installStreamPlayer">Инсталирај</string>
+    <string name="view_count_text">%1$s приказа</string>
+    <string name="upload_date_text">"Отпремљен "%1$s</string>
+    <string name="no_player_found">Нема плејера токова. Инсталирати ВЛЦ?</string>
+    <string name="install">Инсталирај</string>
     <string name="cancel">Одустани</string>
     <string name="open_in_browser">Отвори у прегледачу</string>
     <string name="share">Дели</string>
     <string name="download">Преузми</string>
     <string name="search">Тражи</string>
     <string name="settings">Поставке</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="did_you_mean">Да ли сте мислили: </string>
+    <string name="search_page">Страница претраге: </string>
+    <string name="share_dialog_title">Подели помоћу:</string>
+    <string name="choose_browser">Отвори помоћу:</string>
+    <string name="screen_rotation">ротација</string>
+    <string name="settings_activity_title">Поставке</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>
-    <string name="playWithKodiTitle">Пусти помоћу Кодија</string>
-    <string name="koreNotFound">Апликација Кор није нађена. Кор (Kore) је потребан да бисте пуштали видее у Коди медија центру.</string>
+    <string name="download_path_title">Одредиште преузимања</string>
+    <string name="download_path_summary">Путања за упис преузетих видеа</string>
+    <string name="download_path_dialog_title">Унесите путању за преузимања</string>
+    <string name="autoplay_through_intent_title">Аутопуштање преко Интента</string>
+    <string name="autoplay_through_intent_summary">Аутоматско пуштање видеа по позиву из друге апликације</string>
+    <string name="default_resolution_title">Подразумевана резолуција</string>
+    <string name="play_with_kodi_title">Пусти помоћу Кодија</string>
+    <string name="kore_not_found">Апликација Кор (Kore) није нађена. Инсталирати Кор?</string>
     <string name="installeKore">Инсталирај Кор</string>
-    <string name="showPlayWithKodiTitle">Прикажи „Пусти помоћу Кодија“</string>
-    <string name="showPlayWithKodiSummary">Приказ опције за пуштање видеа у Коди медија центру.</string>
-    <string name="leftPlayButtonTitle">Прикажи дугме за пуштање на левој страни.</string>
-    <string name="playAudio">Аудио</string>
-    <string name="defaultAudioFormatTitle">Подразумевани формат звука</string>
-    <string name="webMAudioDescription">WebM - слободни формат</string>
-    <string name="m4aAudioDescription">m4a - бољи квалитет</string>
-    <string name="downloadDialogTitle">Преузми</string>
+    <string name="show_play_with_kodi_title">Прикажи „Пусти помоћу Кодија“</string>
+    <string name="show_play_with_kodi_summary">Приказ опције за пуштање видеа у Коди медија центру</string>
+    <string name="play_audio">Аудио</string>
+    <string name="default_audio_format_title">Подразумевани формат звука</string>
+    <string name="webm_description">WebM — слободни формат</string>
+    <string name="m4a_description">m4a — бољи квалитет</string>
+    <string name="download_dialog_title">Преузми</string>
     <string-array name="downloadOptions">
         <item>Видео</item>
         <item>Аудио</item>
     </string-array>
-    <string name="nextVideoTitle">Следећи видео</string>
-    <string name="urlNotSupportedText">УРЛ није подржан.</string>
-    <string name="showNextAndSimilarTitle">Прикажи следећи и слични видео</string>
-    <string name="showSimilarVideosButtonText">Слични видео</string>
-    <string name="searchLanguageTitle">Пожељни језик садржаја</string>
-<string name="settingsCategoryVideoAudioTitle">ВИДЕО И АУДИО</string>
-    <string name="settingsCategoryVideoInfoTittle">ПОДАЦИ</string>
-    <string name="settingsCategoryEtcTitle">ОСТАЛО</string>
-<string name="itemThumbnailViewDescription">Сличица видео прегледа</string>
-    <string name="detailThumbnailViewDescription">Сличица видео прегледа</string>
-    <string name="detailUploaderThumbnailViewDescription">Сличица отпремаоца</string>
-    <string name="detailThumbsDownImgViewDescription">Несвиђања</string>
-    <string name="detailThumbsUpImgViewDescription">Свиђања</string>
-</resources>
+    <string name="next_video_title">Следећи видео</string>
+    <string name="url_not_supported_toast">УРЛ није подржан</string>
+    <string name="show_next_and_similar_title">Прикажи следећи и слични видео</string>
+    <string name="similar_videos_btn_text">Слични видео</string>
+    <string name="search_language_title">Пожељни језик садржаја</string>
+    <string name="settings_category_video_audio_title">Видео и Аудио</string>
+    <string name="settings_category_other_title">Остало</string>
+    <string name="list_thumbnail_view_description">Сличица видео прегледа</string>
+    <string name="detail_thumbnail_view_description">Сличица видео прегледа</string>
+    <string name="detail_uploader_thumbnail_view_description">Сличица отпремаоца</string>
+    <string name="detail_dislikes_img_view_description">Несвиђања</string>
+    <string name="detail_likes_img_view_description">Свиђања</string>
+    <string name="use_external_video_player_title">Користи спољашњи видео плејер</string>
+    <string name="use_external_audio_player_title">Користи спољашњи аудио плејер</string>
+    <string name="background_player_playing_toast">Пуштам у позадини</string>
+
+    <string name="background_player_name">Позадински плејер за Јутјуб цев</string>
+    <string name="loading">Учитавам</string>
+    <string name="play_btn_text">Пусти</string>
+
+    <string name="use_tor_title">Користи Тор</string>
+    <string name="use_tor_summary">Принудно преусмерење саобраћаја кроз Тор за доданту приватност (токови још нису подржани)</string>
+<string name="theme_title">Тема</string>
+    <string name="dark_theme_title">Тамна</string>
+    <string name="light_theme_title">Светла</string>
+
+    <string name="settings_category_appearance_title">Изглед</string>
+    <string name="network_error">Грешка мреже</string>
+
+    </resources>

app/src/main/res/values-sw600dp-land/dimens.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Video Item Search View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_search_title_text_size">14sp</dimen>
+    <dimen name="video_item_search_duration_text_size">11sp</dimen>
+    <dimen name="video_item_search_uploader_text_size">12sp</dimen>
+    <dimen name="video_item_search_upload_date_text_size">12sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_search_thumbnail_image_width">140dp</dimen>
+    <dimen name="video_item_search_thumbnail_image_height">85dp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_search_card_vertical_margin">3dp</dimen>
+    <dimen name="video_item_search_card_horizontal_margin">6dp</dimen>
+    <dimen name="video_item_search_card_padding">6dp</dimen>
+    <dimen name="video_item_search_image_right_margin">6dp</dimen>
+    <dimen name="video_item_search_duration_vertical_padding">1sp</dimen>
+    <dimen name="video_item_search_duration_horizontal_padding">5sp</dimen>
+    <dimen name="video_item_search_duration_margin">2sp</dimen>
+    <!-- Miscellaneous -->
+    <dimen name="video_item_search_card_radius">4dp</dimen>
+
+</resources>

app/src/main/res/values-sw600dp/dimens.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Video Item Detail View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_detail_title_text_size">20sp</dimen>
+    <dimen name="video_item_detail_views_text_size">16sp</dimen>
+    <dimen name="video_item_detail_likes_text_size">14sp</dimen>
+    <dimen name="video_item_detail_uploader_text_size">16sp</dimen>
+    <dimen name="video_item_detail_upload_date_text_size">16sp</dimen>
+    <dimen name="video_item_detail_description_text_size">16sp</dimen>
+    <dimen name="video_item_detail_next_text_size">18sp</dimen>
+    <dimen name="video_item_detail_similar_text_size">18sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_detail_thumbnail_image_height">300dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">100dp</dimen>
+    <dimen name="video_item_detail_like_image_height">18sp</dimen>
+    <dimen name="video_item_detail_like_image_width">18sp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_detail_info_text_padding">10sp</dimen>
+    <dimen name="video_item_detail_like_margin">10sp</dimen>
+    <dimen name="video_item_detail_play_fab_margin">20dp</dimen>
+
+</resources>

app/src/main/res/values-v21/styles.xml

@@ -3,18 +3,18 @@
     <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>
-        <item name="android:windowBackground">@color/background_gray</item>
+        <item name="android:colorPrimary">@color/light_youtube_primary_color</item>
+        <item name="android:colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/light_youtube_accent_color</item>
+        <item name="android:colorAccent">@color/light_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/light_background_color</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>
+        <item name="android:background">@color/light_youtube_primary_color</item>
+        <item name="background">@color/light_youtube_primary_color</item>
     </style>
 
     <style name="VideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -23,15 +23,15 @@
         <item name="windowActionBarOverlay">true</item>
         <item name="android:actionBarStyle">@style/VideoPlayerActionBarTheme</item>
         <item name="actionBarStyle">@style/VideoPlayerActionBarTheme</item>
-        <item name="colorAccent">@color/primaryColorYoutube</item>
-        <item name="android:colorAccent">@color/primaryColorYoutube</item>
+        <item name="colorAccent">@color/light_youtube_primary_color</item>
+        <item name="android:colorAccent">@color/light_youtube_primary_color</item>
         <item name="android:windowBackground">@android:color/black</item>
     </style>
 
     <style name="VideoPlayerActionBarTheme" 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>
+        <item name="android:background">@color/video_overlay_color</item>
+        <item name="background">@color/video_overlay_color</item>
     </style>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="background_player_name">NewPipe 背景播放器</string>
+    <string name="view_count_text">%1$s 次观看</string>
+    <string name="upload_date_text">于 %1$s 发布</string>
+    <string name="no_player_found">找不到任何串流播放器。您是否要安装 VLC？</string>
+    <string name="install">安装</string>
+    <string name="cancel">取消</string>
+    <string name="open_in_browser">在浏览器打开</string>
+    <string name="share">分享</string>
+    <string name="loading">载入中</string>
+    <string name="download">下载</string>
+    <string name="search">搜索</string>
+    <string name="settings">设置</string>
+    <string name="did_you_mean">"您是不是要找： "</string>
+    <string name="search_page">"搜索页面： "</string>
+    <string name="share_dialog_title">分享视频：</string>
+    <string name="choose_browser">选择浏览器：</string>
+    <string name="screen_rotation">旋转</string>
+    <string name="settings_activity_title">设置</string>
+    <string name="use_external_video_player_title">使用外置视频播放器</string>
+    <string name="use_external_audio_player_title">使用外置音频播放器</string>
+    <string name="download_path_title">下载路径</string>
+    <string name="download_path_summary">存放已下载视频的路径</string>
+    <string name="download_path_dialog_title">输入下载路径</string>
+    <string name="autoplay_through_intent_title">刻意自动播放</string>
+    <string name="autoplay_through_intent_summary">当另一个程式发出要求时自动播放视频</string>
+    <string name="default_resolution_title">默认分辨率</string>
+    <string name="play_with_kodi_title">用 Kodi 播放</string>
+    <string name="kore_not_found">找不到 Kore 应用程式，您要安装 Kore 吗？</string>
+    <string name="show_play_with_kodi_title">显示 “用 Kodi 播放” 的选项</string>
+    <string name="show_play_with_kodi_summary">显示以 Kodi 媒体中心播放视频的选项</string>
+    <string name="play_audio">音频</string>
+    <string name="default_audio_format_title">默认音频格式</string>
+    <string name="webm_description">WebM — 开放格式</string>
+    <string name="m4a_description">m4a — 更佳品质</string>
+    <string name="theme_title">主题</string>
+    <string name="dark_theme_title">暗色系</string>
+    <string name="light_theme_title">明亮色系</string>
+
+    <string name="download_dialog_title">下载</string>
+    <string name="next_video_title">即将播放</string>
+    <string name="show_next_and_similar_title">显示下一部和相近的视频</string>
+    <string name="url_not_supported_toast">不支援此网址</string>
+    <string name="similar_videos_btn_text">相近的视频</string>
+    <string name="search_language_title">内容位置</string>
+    <string name="settings_category_video_audio_title">视频和音频</string>
+    <string name="settings_category_appearance_title">外观</string>
+    <string name="settings_category_other_title">其他</string>
+    <string name="background_player_playing_toast">背景播放</string>
+    <string name="play_btn_text">播放</string>
+    <string name="network_error">网络错误</string>
+
+    <string name="list_thumbnail_view_description">视频预览缩图</string>
+    <string name="detail_thumbnail_view_description">视频预览缩图</string>
+    <string name="detail_uploader_thumbnail_view_description">上传者的头像缩图</string>
+    <string name="detail_likes_img_view_description">顶</string>
+    <string name="detail_dislikes_img_view_description">踩</string>
+    <string name="use_tor_title">使用 Tor</string>
+    <string name="use_tor_summary">强迫下载流量通过 Tor 加强隐私（暂时不支援串流视频）</string>
+</resources>

app/src/main/res/values-zh-rHK/strings.xml

@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="install">安裝</string>
+    <string name="cancel">取消</string>
+    <string name="upload_date_text">於 %1$s 發佈</string>
+    <string name="share">分享</string>
+    <string name="loading">加載中</string>
+    <string name="download">下載</string>
+    <string name="search">搜尋</string>
+    <string name="settings">設置</string>
+    <string name="did_you_mean">"您是不是要查： "</string>
+    <string name="search_page">"搜尋頁面： "</string>
+    <string name="choose_browser">選擇瀏覽器：</string>
+    <string name="screen_rotation">旋轉</string>
+    <string name="settings_activity_title">設置</string>
+    <string name="use_external_video_player_title">使用外置影片播放器</string>
+    <string name="use_external_audio_player_title">使用外置聲音播放器</string>
+    <string name="download_path_title">下載路徑</string>
+    <string name="download_path_summary">存放已下載影片的路徑</string>
+    <string name="download_path_dialog_title">輸入下載路徑</string>
+    <string name="autoplay_through_intent_title">刻意自動播放</string>
+    <string name="autoplay_through_intent_summary">當另一個程式發出要求時自動播放影片</string>
+    <string name="default_resolution_title">預設解析度</string>
+    <string name="play_with_kodi_title">用 Kodi 播放</string>
+    <string name="kore_not_found">找不到 Kore 應用程式，您要安裝 Kore 嗎？</string>
+    <string name="show_play_with_kodi_title">顯示「用 Kodi 播放」的選項</string>
+    <string name="show_play_with_kodi_summary">顯示以 Kodi 媒體中心播放影片的選項</string>
+    <string name="play_audio">聲音</string>
+    <string name="default_audio_format_title">預設聲音檔案格式</string>
+    <string name="webm_description">WebM — 開放格式</string>
+    <string name="m4a_description">m4a — 更佳畫質</string>
+    <string name="theme_title">主題</string>
+    <string name="dark_theme_title">暗色系</string>
+    <string name="light_theme_title">明亮色系</string>
+
+    <string name="download_dialog_title">下載</string>
+    <string name="next_video_title">下一部影片</string>
+    <string name="show_next_and_similar_title">顯示下一部及相關的影片</string>
+    <string name="url_not_supported_toast">不支援此網址</string>
+    <string name="similar_videos_btn_text">相關影片</string>
+    <string name="search_language_title">內容位置</string>
+    <string name="settings_category_video_audio_title">影片及聲音</string>
+    <string name="settings_category_appearance_title">外觀</string>
+    <string name="settings_category_other_title">其他</string>
+    <string name="background_player_playing_toast">背景播放</string>
+    <string name="play_btn_text">播放</string>
+    <string name="network_error">網絡故障</string>
+
+    <string name="list_thumbnail_view_description">影片預覽縮圖</string>
+    <string name="detail_thumbnail_view_description">影片預覽縮圖</string>
+    <string name="detail_uploader_thumbnail_view_description">上載者的個人頭像縮圖</string>
+    <string name="detail_likes_img_view_description">讚好</string>
+    <string name="detail_dislikes_img_view_description">討厭</string>
+    <string name="use_tor_title">使用 Tor</string>
+    <string name="use_tor_summary">強迫下載流量通過 Tor 加強私隱 (暫時不支援串流影片)</string>
+<string name="background_player_name">NewPipe 背景播放器</string>
+    <string name="view_count_text">觀看次數：%1$s</string>
+    <string name="no_player_found">找不到任何串流播放器，您要安裝 VLC 嗎？</string>
+    <string name="open_in_browser">在瀏覽器開啟</string>
+    <string name="share_dialog_title">分享影片：</string>
+    </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources><string name="background_player_name">NewPipe 背景播放器</string>
+    <string name="view_count_text">觀看次數：%1$s</string>
+    <string name="upload_date_text">發佈日期：%1$s</string>
+    <string name="no_player_found">找不到任何串流播放器，您要否安裝 VLC？</string>
+    <string name="install">安裝</string>
+    <string name="cancel">取消</string>
+    <string name="open_in_browser">在瀏覽器開啟</string>
+    <string name="share">分享</string>
+    <string name="loading">加載中</string>
+    <string name="download">下載</string>
+    <string name="search">搜尋</string>
+    <string name="settings">設定</string>
+    <string name="did_you_mean">"您是不是要查： "</string>
+    <string name="search_page">"搜尋頁面： "</string>
+    <string name="share_dialog_title">分享影片：</string>
+    <string name="choose_browser">選擇瀏覽器：</string>
+    <string name="screen_rotation">旋轉</string>
+    <string name="settings_activity_title">設定</string>
+    <string name="use_external_video_player_title">使用外置影片播放器</string>
+    <string name="use_external_audio_player_title">使用外置聲音播放器</string>
+    <string name="download_path_title">下載路徑</string>
+    <string name="download_path_summary">存放已下載影片的路徑</string>
+    <string name="download_path_dialog_title">輸入下載路徑</string>
+    <string name="autoplay_through_intent_title">刻意自動播放</string>
+    <string name="autoplay_through_intent_summary">當另一個程式發出要求時自動播放影片</string>
+    <string name="default_resolution_title">預設解析度</string>
+    <string name="play_with_kodi_title">用 Kodi 播放</string>
+    <string name="show_play_with_kodi_summary">顯示以 Kodi 媒體中心播放影片的選項</string>
+    <string name="play_audio">聲音</string>
+    <string name="kore_not_found">找不到 Kore 應用程式，您要安裝 Kore 嗎？</string>
+    <string name="show_play_with_kodi_title">顯示「用 Kodi 播放」的選項</string>
+    <string name="default_audio_format_title">預設聲音檔案格式</string>
+    <string name="webm_description">WebM — 開放格式</string>
+    <string name="m4a_description">m4a — 更佳畫質</string>
+    <string name="theme_title">主題</string>
+    <string name="dark_theme_title">暗色系</string>
+    <string name="light_theme_title">明亮色系</string>
+
+    <string name="download_dialog_title">下載</string>
+    <string name="next_video_title">下一部影片</string>
+    <string name="show_next_and_similar_title">顯示下一部和相關的影片</string>
+    <string name="url_not_supported_toast">不支援此網址</string>
+    <string name="similar_videos_btn_text">相關影片</string>
+    <string name="search_language_title">內容位置</string>
+    <string name="settings_category_video_audio_title">影片和聲音</string>
+    <string name="settings_category_appearance_title">外觀</string>
+    <string name="settings_category_other_title">其他</string>
+    <string name="background_player_playing_toast">背景播放</string>
+    <string name="play_btn_text">播放</string>
+    <string name="network_error">網絡錯誤</string>
+
+    <string name="list_thumbnail_view_description">影片預覽縮圖</string>
+    <string name="detail_thumbnail_view_description">影片預覽縮圖</string>
+    <string name="detail_uploader_thumbnail_view_description">發佈者的個人頭像縮圖</string>
+    <string name="detail_likes_img_view_description">喜歡</string>
+    <string name="detail_dislikes_img_view_description">不喜歡</string>
+    <string name="use_tor_title">使用 Tor</string>
+    <string name="use_tor_summary">強迫下載流量通過 Tor 以加強隱私 (暫時不支援串流影片)</string>
+</resources>

app/src/main/res/values/colors.xml

@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primaryColorYoutube">#cd322e</color>
-    <color name="primaryColorDarkYoutube">#bc211d</color>
-    <color name="accentColorYoutube">#000000</color>
-    <color name="durationBackground">#aa000000</color>
-    <color name="durationText">#eeffffff</color>
-    <color name="black_overlay">#66000000</color>
-    <color name="background_gray">#EEEEEE</color>
+    <!-- Light Theme -->
+    <color name="light_background_color">#EEEEEE</color>
+    <color name="light_youtube_primary_color">#CD322E</color>
+    <color name="light_youtube_dark_color">#BC211D</color>
+    <color name="light_youtube_accent_color">#000000</color>
+
+    <!-- Dark Theme -->
+    <color name="dark_background_color">#222222</color>
+    <color name="dark_youtube_primary_color">#CD322E</color>
+    <color name="dark_youtube_dark_color">#BC211D</color>
+    <color name="dark_youtube_accent_color">#FFFFFF</color>
+
+    <!-- Miscellaneous -->
+    <color name="duration_dackground_color">#AA000000</color>
+    <color name="duration_text_color">#EEFFFFFF</color>
+    <color name="video_overlay_color">#66000000</color>
+    <color name="background_notification_color">#323232</color>
 </resources>

app/src/main/res/values/dimens.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Video Item Search View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_search_title_text_size">14sp</dimen>
+    <dimen name="video_item_search_duration_text_size">11sp</dimen>
+    <dimen name="video_item_search_uploader_text_size">12sp</dimen>
+    <dimen name="video_item_search_upload_date_text_size">12sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_search_thumbnail_image_width">140dp</dimen>
+    <dimen name="video_item_search_thumbnail_image_height">85dp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_search_card_vertical_margin">3dp</dimen>
+    <dimen name="video_item_search_card_horizontal_margin">6dp</dimen>
+    <dimen name="video_item_search_card_padding">6dp</dimen>
+    <dimen name="video_item_search_image_right_margin">6dp</dimen>
+    <dimen name="video_item_search_duration_vertical_padding">1sp</dimen>
+    <dimen name="video_item_search_duration_horizontal_padding">5sp</dimen>
+    <dimen name="video_item_search_duration_margin">2sp</dimen>
+    <!-- Miscellaneous -->
+    <dimen name="video_item_search_card_radius">4dp</dimen>
+
+    <!-- Video Item Detail View Dimensions-->
+    <!-- Text Size -->
+    <dimen name="video_item_detail_title_text_size">18sp</dimen>
+    <dimen name="video_item_detail_views_text_size">14sp</dimen>
+    <dimen name="video_item_detail_likes_text_size">12sp</dimen>
+    <dimen name="video_item_detail_uploader_text_size">14sp</dimen>
+    <dimen name="video_item_detail_upload_date_text_size">14sp</dimen>
+    <dimen name="video_item_detail_description_text_size">14sp</dimen>
+    <dimen name="video_item_detail_next_text_size">16sp</dimen>
+    <dimen name="video_item_detail_similar_text_size">16sp</dimen>
+    <!-- Elements Size -->
+    <dimen name="video_item_detail_thumbnail_image_height">200dp</dimen>
+    <dimen name="video_item_detail_uploader_image_size">80dp</dimen>
+    <dimen name="video_item_detail_like_image_height">18sp</dimen>
+    <dimen name="video_item_detail_like_image_width">18sp</dimen>
+    <!-- Paddings & Margins -->
+    <dimen name="video_item_detail_info_text_padding">6sp</dimen>
+    <dimen name="video_item_detail_like_margin">6sp</dimen>
+    <dimen name="video_item_detail_play_fab_margin">20dp</dimen>
+
+</resources>

app/src/main/res/values/dimentxt.xml

@@ -1,14 +0,0 @@
-<?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>
-
-    <dimen name="text_video_title_size">18sp</dimen>
-    <dimen name="text_video_views_size">14sp</dimen>
-    <dimen name="text_video_like_size">12sp</dimen>
-    <dimen name="text_video_uploader_size">14sp</dimen>
-    <dimen name="text_video_upload_date_size">14sp</dimen>
-    <dimen name="text_video_description_size">14sp</dimen>
-</resources>

app/src/main/res/values/settings_keys.xml

@@ -1,38 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Categories -->
-    <string name="settingsCategoryVideoAudio">settings_categoery_video_audio</string>
-    <string name="settingsCategoryVideoInfo">settings_category_video_info</string>
-    <string name="settingsCategoryEtc">settings_category_etc</string>
+    <string name="settings_category_video_audio">settings_category_video_audio</string>
+    <string name="settings_category_appearance">settings_category_appearance</string>
+    <string name="settings_category_other">settings_category_other</string>
     <!-- Key values -->
-    <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">
+    <string name="download_path_key">download_path</string>
+    <string name="download_path_audio_key">download_path_audio</string>
+    <string name="use_external_video_player_key">use_external_video_player</string>
+    <string name="use_external_audio_player_key">use_external_audio_player</string>
+    <string name="autoplay_through_intent_key">autoplay_through_intent</string>
+
+    <string name="default_resolution_key">default_resolution_preference</string>
+    <string name="default_resolution_value">360p</string>
+    <string-array name="resolution_list">
         <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 name="show_play_with_kodi_key">show_play_with_kodi</string>
+
+    <string name="theme_key">theme</string>
+    <string name="default_theme_value">0</string>
+    <string-array name="theme_description_list">
+        <item>@string/dark_theme_title</item>
+        <item>@string/light_theme_title</item>
     </string-array>
-    <string-array name="audioFormatList">
+    <string-array name="theme_list">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string name="default_audio_format_key">default_audio_format</string>
+    <string name="default_audio_format_value">m4a</string>
+    <string-array name="audio_format_description_list">
+        <item>@string/webm_description</item>
+        <item>@string/m4a_description</item>
+    </string-array>
+    <string-array name="audio_format_list">
         <item>webm</item>
         <item>m4a</item>
     </string-array>
-    <string name="defaultAudioFormat">m4a</string>
-    <string name="showNextVideo">show_next_video</string>
-    <string name="searchLanguage">search_language</string>
+
+    <string name="show_next_video_key">show_next_video</string>
+    <string name="default_language_value">en</string>
+    <string name="search_language_key">search_language</string>
     <!-- TODO: scrape these programmatically, then store in a local cache -->
     <!-- alternatively, load these from some local android data store -->
-    <string-array name='languageCodes'>
+    <string-array name="language_codes">
         <item>af</item>
         <item>az</item>
         <item>id</item>
@@ -71,6 +88,7 @@
         <item>sl</item>
         <item>fi</item>
         <item>sv</item>
+        <item>bo</item>
         <item>vi</item>
         <item>tr</item>
         <item>bg</item>
@@ -110,7 +128,7 @@
         <item>ja</item>
         <item>ko</item>
     </string-array>
-    <string-array name='languageNames'>
+    <string-array name="language_names">
         <item>Afrikaans</item>
         <item>Azərbaycan</item>
         <item>Bahasa Indonesia</item>
@@ -149,6 +167,7 @@
         <item>Slovenščina</item>
         <item>Suomi</item>
         <item>Svenska</item>
+        <item>Tibetan བོད་སྐད།</item>
         <item>Tiếng Việt</item>
         <item>Türkçe</item>
         <item>Български</item>
@@ -188,4 +207,5 @@
         <item>日本語</item>
         <item>한국어</item>
     </string-array>
+    <string name="use_tor_key">use_tor</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,60 +1,81 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="app_name" translatable="false">NewPipe</string>
+    <string name="background_player_name">NewPipe Background Player</string>
     <string name="title_videoitem_detail" translatable="false">NewPipe</string>
-    <string name="viewCountText">%1$s views</string>
-    <string name="uploadDateText">Uploaded on %1$s</string>
-    <string name="noPlayerFound">No stream player found. You may want to install one.</string>
-    <string name="installStreamPlayer">Install</string>
+    <string name="view_count_text">%1$s views</string>
+    <string name="upload_date_text">Uploaded on %1$s</string>
+    <string name="no_player_found">No stream player found. Install VLC?</string>
+    <string name="install">Install</string>
     <string name="cancel">Cancel</string>
-    <string name="fdroidVLCurl" translatable="false">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
+    <string name="fdroid_vlc_url" translatable="false">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">Share</string>
+    <string name="loading">Loading</string>
     <string name="download">Download</string>
     <string name="search">Search</string>
     <string name="settings">Settings</string>
-    <string name="didYouMean">Did you mean: </string>
-    <string name="searchPage">Search page: </string>
-    <string name="shareDialogTitle">Share with:</string>
-    <string name="chooseBrowser">Choose browser:</string>
-    <string name="screenRotation">rotation</string>
-    <string name="title_activity_settings">Settings</string>
-    <string name="useExternalPlayerTitle">Use external player</string>
-    <string name="downloadLocation">Download location</string>
-    <string name="downloadLocationSummary">Path to store downloaded videos in.</string>
-    <string name="downloadLocationDialogTitle">Enter download path</string>
-    <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" translatable="false">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">
+    <string name="did_you_mean">Did you mean: </string>
+    <string name="search_page">Search page: </string>
+    <string name="share_dialog_title">Share with:</string>
+    <string name="choose_browser">Choose browser:</string>
+    <string name="screen_rotation">rotation</string>
+    <string name="settings_activity_title">Settings</string>
+    <string name="use_external_video_player_title">Use external video player</string>
+    <string name="use_external_audio_player_title">Use external audio player</string>
+
+    <string name="download_path_title">Download path video</string>
+    <string name="download_path_summary">Path to store downloaded videos in</string>
+    <string name="download_path_dialog_title">Enter download path for videos</string>
+
+    <string name="download_path_audio_title">Download path audio</string>
+    <string name="download_path_audio_summary">Path to store downloaded audio in</string>
+    <string name="download_path_audio_dialog_title">Enter download path for audios</string>
+
+    <string name="autoplay_through_intent_title">Autoplay through Intent</string>
+    <string name="autoplay_through_intent_summary">Automatically play a video when it\'s called from another app</string>
+    <string name="default_resolution_title">Default Resolution</string>
+    <string name="play_with_kodi_title">Play with Kodi</string>
+    <string name="kore_not_found">Kore app not found. Install Kore?</string>
+    <string name="fdroid_kore_url" translatable="false">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="show_play_with_kodi_title">Show \"Play with Kodi\" option</string>
+    <string name="show_play_with_kodi_summary">Display an option to play a video via Kodi media center</string>
+    <string name="play_audio">Audio</string>
+    <string name="default_audio_format_title">Default audio format</string>
+    <string name="webm_description">WebM — free format</string>
+    <string name="m4a_description">m4a — better quality</string>
+    <string name="theme_title">Theme</string>
+    <string name="dark_theme_title">Dark</string>
+    <string name="light_theme_title">Light</string>
+
+    <string name="download_dialog_title">Download</string>
+    <string-array name="download_options">
         <item>Video</item>
         <item>Audio</item>
     </string-array>
-    <string name="nextVideoTitle">Next video</string>
-    <string name="showNextAndSimilarTitle">Show next and similar videos</string>
-    <string name="urlNotSupportedText">URL not supported.</string>
-    <string name="showSimilarVideosButtonText">Similar videos</string>
-    <string name="searchLanguageTitle">Preferable content language</string>
-    <string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
-    <string name="settingsCategoryVideoInfoTittle">INFO</string>
-    <string name="settingsCategoryEtcTitle">ETC</string>
+    <string name="next_video_title">Next video</string>
+    <string name="show_next_and_similar_title">Show next and similar videos</string>
+    <string name="url_not_supported_toast">URL not supported</string>
+    <string name="similar_videos_btn_text">Similar videos</string>
+    <string name="search_language_title">Preferable content language</string>
+    <string name="settings_category_video_audio_title">Video &amp; Audio</string>
+    <string name="settings_category_appearance_title">Appearance</string>
+    <string name="settings_category_other_title">Other</string>
+    <string name="background_player_time_text" translatable="false">%1$s - NewPipe</string>
+    <string name="background_player_playing_toast">Playing in background</string>
+    <string name="c3s_url" translatable="false">https://www.c3s.cc/</string>
+    <string name="play_btn_text">Play</string>
+    <string name="network_error">Network error</string>
 
     <!-- Content descriptions (for better accessibility) -->
-    <string name="itemThumbnailViewDescription">Video preview thumbnail</string>
-    <string name="detailThumbnailViewDescription">Video preview thumbnail</string>
-    <string name="detailUploaderThumbnailViewDescription">Uploader thumbnail</string>
-    <string name="detailThumbsDownImgViewDescription">Unlikes</string>
-    <string name="detailThumbsUpImgViewDescription">Likes</string>
+    <string name="list_thumbnail_view_description">Video preview thumbnail</string>
+    <string name="detail_thumbnail_view_description">Video preview thumbnail</string>
+    <string name="detail_uploader_thumbnail_view_description">Uploader\'s userpic thumbnail</string>
+    <string name="detail_likes_img_view_description">Likes</string>
+    <string name="detail_dislikes_img_view_description">Dislikes</string>
+    <string name="use_tor_title">Use Tor</string>
+    <string name="use_tor_summary">Force download traffic through Tor for increased privacy (streaming videos not yet supported)</string>
+
+    <string name="err_dir_create">Cannot create download directory \'%1$s\'</string>
+    <string name="info_dir_created">Created download directory \'%1$s\'</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -3,17 +3,17 @@
     <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>
-        <item name="android:windowBackground">@color/background_gray</item>
+        <item name="colorPrimary">@color/light_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/light_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/light_background_color</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>
+        <item name="android:background">@color/light_youtube_primary_color</item>
+        <item name="background">@color/light_youtube_primary_color</item>
     </style>
 
     <style name="VideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -22,14 +22,14 @@
         <item name="windowActionBarOverlay">true</item>
         <item name="android:actionBarStyle">@style/VideoPlayerActionBarTheme</item>
         <item name="actionBarStyle">@style/VideoPlayerActionBarTheme</item>
-        <item name="colorAccent">@color/primaryColorYoutube</item>
+        <item name="colorAccent">@color/light_youtube_primary_color</item>
         <item name="android:windowBackground">@android:color/black</item>
     </style>
 
     <style name="VideoPlayerActionBarTheme" 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>
+        <item name="android:background">@color/video_overlay_color</item>
+        <item name="background">@color/video_overlay_color</item>
     </style>
 </resources>