From 754bd826990bff86106e453931ed0202fc81e535 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Fri, 30 Dec 2016 00:49:39 +0530
Subject: [PATCH 01/30] Added dark theme

---
 app/src/main/java/org/schabi/newpipe/App.java  |  1 +
 .../org/schabi/newpipe/ChannelActivity.java    |  8 +++++++-
 .../java/org/schabi/newpipe/MainActivity.java  |  9 ++++++++-
 .../detail/VideoItemDetailActivity.java        |  3 ++-
 .../newpipe/download/DownloadActivity.java     |  6 +++---
 .../newpipe/info_list/InfoItemHolder.java      |  2 ++
 .../schabi/newpipe/report/ErrorActivity.java   |  3 ++-
 .../newpipe/settings/SettingsActivity.java     |  7 +++++++
 .../newpipe/settings/SettingsFragment.java     | 18 +++++++++++++++---
 .../layout-v18/fragment_videoitem_detail.xml   |  2 +-
 .../res/layout/fragment_videoitem_detail.xml   |  3 ++-
 app/src/main/res/values-v21/styles.xml         | 10 ++++++++++
 app/src/main/res/values/styles.xml             | 15 +++++++++++++++
 app/src/main/res/xml/settings.xml              |  2 --
 14 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index f9b95c457..cb4dce3ea 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -48,6 +48,7 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+
         // init crashreport
         try {
             final ACRAConfiguration acraConfig = new ConfigurationBuilder(this)
diff --git a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
index 83936475c..c8beb31f1 100644
--- a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
@@ -31,6 +32,7 @@ import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.report.ErrorActivity;
 
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -71,6 +73,10 @@ public class ChannelActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", "1"), "0")) {
+            setTheme(R.style.DarkTheme_NoActionBar);
+        }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_channel);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -128,7 +134,7 @@ public class ChannelActivity extends AppCompatActivity {
         CollapsingToolbarLayout ctl = (CollapsingToolbarLayout) findViewById(R.id.channel_toolbar_layout);
         ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar);
         ImageView channelBanner = (ImageView) findViewById(R.id.channel_banner_image);
-        FloatingActionButton feedButton = (FloatingActionButton) findViewById(R.id.channel_rss_fab);
+        final FloatingActionButton feedButton = (FloatingActionButton) findViewById(R.id.channel_rss_fab);
         ImageView avatarView = (ImageView) findViewById(R.id.channel_avatar_view);
         ImageView haloView = (ImageView) findViewById(R.id.channel_avatar_halo);
 
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index bfeb74287..2e94443f9 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -1,7 +1,9 @@
 package org.schabi.newpipe;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.media.AudioManager;
+import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
@@ -9,9 +11,14 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.Toast;
 
+import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.settings.SettingsActivity;
 
+import java.util.Objects;
+import java.util.prefs.Preferences;
+
 /**
  * Created by Christian Schabesberger on 02.08.16.
  *
@@ -32,7 +39,7 @@ import org.schabi.newpipe.settings.SettingsActivity;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends Themer {
 
     private Fragment mainFragment = null;
 
diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
index 591017a92..f47e726df 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
@@ -14,6 +14,7 @@ import android.widget.Toast;
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.Themer;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 
@@ -39,7 +40,7 @@ import java.util.HashSet;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class VideoItemDetailActivity extends AppCompatActivity {
+public class VideoItemDetailActivity extends Themer {
 
     /**
      * Removes invisible separators (\p{Z}) and punctuation characters including
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index a7e52c486..98e4eddd7 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -13,7 +13,6 @@ import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -28,8 +27,9 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.Themer;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.settings.SettingsActivity;
 
 import java.io.File;
@@ -42,7 +42,7 @@ import us.shandian.giga.ui.fragment.MissionsFragment;
 import us.shandian.giga.util.CrashHandler;
 import us.shandian.giga.util.Utility;
 
-public class DownloadActivity extends AppCompatActivity implements AdapterView.OnItemClickListener{
+public class DownloadActivity extends Themer implements AdapterView.OnItemClickListener{
 
     public static final String INTENT_DOWNLOAD = "us.shandian.giga.intent.DOWNLOAD";
 
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
index dbba4ac5f..a2b000e2b 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
@@ -36,6 +36,7 @@ public class InfoItemHolder extends RecyclerView.ViewHolder {
             itemDurationView,
             itemUploadDateView,
             itemViewCountView;
+
     public Button itemButton;
 
     public InfoItemHolder(View v) {
@@ -48,4 +49,5 @@ public class InfoItemHolder extends RecyclerView.ViewHolder {
         itemViewCountView = (TextView) v.findViewById(R.id.itemViewCountView);
         itemButton = (Button) v.findViewById(R.id.item_button);
     }
+
 }
diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index 8ebb9b155..b87fa8af8 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -35,6 +35,7 @@ import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.Themer;
 import org.schabi.newpipe.extractor.Parser;
 
 import java.io.PrintWriter;
@@ -65,7 +66,7 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ErrorActivity extends AppCompatActivity {
+public class ErrorActivity extends Themer {
     public static class ErrorInfo implements Parcelable {
         public int userAction;
         public String request;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index e62f90c45..9ca0490d4 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
@@ -16,6 +17,8 @@ import android.view.ViewGroup;
 
 import org.schabi.newpipe.R;
 
+import java.util.Objects;
+
 
 /**
  * Created by Christian Schabesberger on 31.08.15.
@@ -43,6 +46,10 @@ public class SettingsActivity extends PreferenceActivity  {
 
     @Override
     protected void onCreate(Bundle savedInstanceBundle) {
+        if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", "1"), "0")) {
+            setTheme(R.style.DarkTheme);
+        }
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceBundle);
         super.onCreate(savedInstanceBundle);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
index a5521dfc5..c9c7fe134 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.settings;
 
 import android.app.Activity;
+import android.app.ListActivity;
 import android.content.ClipData;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -55,6 +56,7 @@ public class SettingsFragment  extends PreferenceFragment
     String DOWNLOAD_PATH_PREFERENCE;
     String DOWNLOAD_PATH_AUDIO_PREFERENCE;
     String USE_TOR_KEY;
+    String THEME;
 
     public static final int REQUEST_INSTALL_ORBOT = 0x1234;
 
@@ -63,11 +65,12 @@ public class SettingsFragment  extends PreferenceFragment
     private ListPreference searchLanguagePreference;
     private Preference downloadPathPreference;
     private Preference downloadPathAudioPreference;
+    private Preference themePreference;
     private SharedPreferences defaultPreferences;
 
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.settings);
 
@@ -81,6 +84,7 @@ public class SettingsFragment  extends PreferenceFragment
         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);
+        THEME = getString(R.string.theme_key);
         USE_TOR_KEY = getString(R.string.use_tor_key);
 
         // get pref objects
@@ -92,6 +96,7 @@ public class SettingsFragment  extends PreferenceFragment
                 (ListPreference) findPreference(SEARCH_LANGUAGE_PREFERENCE);
         downloadPathPreference = findPreference(DOWNLOAD_PATH_PREFERENCE);
         downloadPathAudioPreference = findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+        themePreference = findPreference(THEME);
 
         prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
@@ -132,6 +137,11 @@ public class SettingsFragment  extends PreferenceFragment
                     downloadPathAudioPreference
                             .setSummary(downloadPath);
                 }
+                else if (key == THEME)
+                {
+                    String theme = sharedPreferences.getString(THEME, "Light");
+                    themePreference.setSummary(theme);
+                }
                 updateSummary();
             }
         };
@@ -161,7 +171,6 @@ public class SettingsFragment  extends PreferenceFragment
                 activity.startActivityForResult(i, R.string.download_path_audio_key);
             }
         }
-
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
@@ -216,8 +225,8 @@ public class SettingsFragment  extends PreferenceFragment
             // installing the app does not necessarily return RESULT_OK
             App.configureTor(requestCode == REQUEST_INSTALL_ORBOT
                     && OrbotHelper.requestStartTor(a));
-
         }
+
         updateSummary();
         super.onActivityResult(requestCode, resultCode, data);
     }
@@ -239,6 +248,9 @@ public class SettingsFragment  extends PreferenceFragment
         downloadPathAudioPreference.setSummary(
                 defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
                         getString(R.string.download_path_audio_summary)));
+        themePreference.setSummary(
+                defaultPreferences.getString(THEME,
+                        getString(R.string.light_theme_title)));
     }
 
     @Override
diff --git a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
index 003bb393e..82abd39fe 100644
--- a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
@@ -66,7 +66,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/light_background_color"
+                android:background="@color/dark_background_color"
                 android:visibility="gone">
 
                 <LinearLayout
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 526840311..6b5545872 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -14,6 +14,7 @@
         android:id="@+id/detail_main_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/dark_youtube_primary_color"
         android:visibility="visible"
         app:parallax_factor="1.9"
         tools:ignore="UselessParent">
@@ -68,7 +69,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/light_background_color"
+                android:background="@color/dark_background_color"
                 android:visibility="gone">
 
                 <LinearLayout
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index ab385422f..8690652be 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -10,6 +10,16 @@
         <item name="android:windowBackground">@color/light_background_color</item>
     </style>
 
+    <!-- Dark Theme-->
+    <style name="DarkTheme" parent="Theme.AppCompat">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/dark_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/dark_background_color</item>
+    </style>
+
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5007e394b..dbb073b9e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,6 +23,16 @@
         <item name="android:windowBackground">@color/light_background_color</item>
     </style>
 
+    <!-- Dark Theme-->
+    <style name="DarkTheme" parent="Theme.AppCompat">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/dark_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/dark_background_color</item>
+    </style>
+
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
@@ -76,6 +86,11 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="DarkTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 0904315d0..cc42de70a 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -44,7 +44,6 @@
         android:title="@string/settings_category_appearance_title"
         android:textAllCaps="true">
 
-        <!-- Not yet working.
         <ListPreference
             android:key="@string/theme_key"
             android:title="@string/theme_title"
@@ -52,7 +51,6 @@
             android:entries="@array/theme_description_list"
             android:entryValues="@array/theme_list"
             android:defaultValue="@string/default_theme_value"/>
-            -->
 
         <CheckBoxPreference
             android:key="@string/show_play_with_kodi_key"

From 141278e668ff26646fc7aff2503e779b34fcb6c7 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Sat, 31 Dec 2016 13:46:52 +0530
Subject: [PATCH 02/30] Added dark theme

---
 .../main/java/org/schabi/newpipe/Themer.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 app/src/main/java/org/schabi/newpipe/Themer.java

diff --git a/app/src/main/java/org/schabi/newpipe/Themer.java b/app/src/main/java/org/schabi/newpipe/Themer.java
new file mode 100644
index 000000000..07a9f89a4
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/Themer.java
@@ -0,0 +1,20 @@
+package org.schabi.newpipe;
+
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import java.util.Objects;
+
+public class Themer extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", "1"), "0")) {
+            setTheme(R.style.DarkTheme);
+        }
+    }
+}

From 1708a401cf7bb0013ede8b390e048bd0286d62fe Mon Sep 17 00:00:00 2001
From: ksyko <lord.kratos.kb19@gmail.com>
Date: Sat, 31 Dec 2016 21:42:04 +0530
Subject: [PATCH 03/30] Update fragment_videoitem_detail.xml

---
 app/src/main/res/layout-v18/fragment_videoitem_detail.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
index 82abd39fe..41ec45cee 100644
--- a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
@@ -66,7 +66,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/dark_background_color"
                 android:visibility="gone">
 
                 <LinearLayout
@@ -276,4 +275,4 @@
             </RelativeLayout>
         </RelativeLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>

From 175d8ce572e09f5bb01babcba98665bf03973d6f Mon Sep 17 00:00:00 2001
From: ksyko <lord.kratos.kb19@gmail.com>
Date: Sat, 31 Dec 2016 21:43:01 +0530
Subject: [PATCH 04/30] Update fragment_videoitem_detail.xml

---
 app/src/main/res/layout/fragment_videoitem_detail.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 6b5545872..c6047903b 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -14,7 +14,6 @@
         android:id="@+id/detail_main_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/dark_youtube_primary_color"
         android:visibility="visible"
         app:parallax_factor="1.9"
         tools:ignore="UselessParent">
@@ -279,4 +278,4 @@
             </RelativeLayout>
         </RelativeLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>

From c7abf377ebd2d56be4ab80609a3b71abd6c9795b Mon Sep 17 00:00:00 2001
From: ksyko <lord.kratos.kb19@gmail.com>
Date: Sat, 31 Dec 2016 21:51:41 +0530
Subject: [PATCH 05/30] Update fragment_videoitem_detail.xml

---
 app/src/main/res/layout/fragment_videoitem_detail.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index c6047903b..0bb0420d0 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -68,7 +68,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/dark_background_color"
                 android:visibility="gone">
 
                 <LinearLayout

From 1b9a6e53ced47042150115673fdfa53473d66600 Mon Sep 17 00:00:00 2001
From: ksyko <lord.kratos.kb19@gmail.com>
Date: Sat, 31 Dec 2016 22:32:16 +0530
Subject: [PATCH 06/30] Update InfoItemHolder.java

---
 .../main/java/org/schabi/newpipe/info_list/InfoItemHolder.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
index a2b000e2b..a5e73470e 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
@@ -36,7 +36,6 @@ public class InfoItemHolder extends RecyclerView.ViewHolder {
             itemDurationView,
             itemUploadDateView,
             itemViewCountView;
-
     public Button itemButton;
 
     public InfoItemHolder(View v) {

From 53ff58daa390ee6d68fe94ebd525d9a65435071d Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Tue, 10 Jan 2017 13:35:16 +0100
Subject: [PATCH 07/30] DownloadManagerService: Don't bind if no permissions

---
 .../giga/service/DownloadManagerService.java  | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index 930075e0b..84ae7e63c 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -1,5 +1,6 @@
 package us.shandian.giga.service;
 
+import android.Manifest;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -12,7 +13,10 @@ import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.Message;
 import android.support.v4.app.NotificationCompat.Builder;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.content.PermissionChecker;
 import android.util.Log;
+import android.widget.Toast;
 
 import org.schabi.newpipe.download.DownloadActivity;
 import org.schabi.newpipe.settings.NewPipeSettings;
@@ -36,7 +40,7 @@ public class DownloadManagerService extends Service implements DownloadMission.M
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		
+
 		if (DEBUG) {
 			Log.d(TAG, "onCreate");
 		}
@@ -50,7 +54,7 @@ public class DownloadManagerService extends Service implements DownloadMission.M
 				Log.d(TAG, "Download directory: " + path);
 			}
 		}
-		
+
 		Intent i = new Intent();
 		i.setAction(Intent.ACTION_MAIN);
 		i.setClass(this, DownloadActivity.class);
@@ -104,7 +108,7 @@ public class DownloadManagerService extends Service implements DownloadMission.M
 		if (DEBUG) {
 			Log.d(TAG, "Starting");
 		}
-		
+
 		return START_NOT_STICKY;
 	}
 
@@ -125,6 +129,19 @@ public class DownloadManagerService extends Service implements DownloadMission.M
 	
 	@Override
 	public IBinder onBind(Intent intent) {
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
+			int permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
+			if(permissionCheck == PermissionChecker.PERMISSION_DENIED) {
+				Toast.makeText(this, "Permission denied (read)", Toast.LENGTH_SHORT).show();
+				return null;
+			}
+			permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+			if(permissionCheck == PermissionChecker.PERMISSION_DENIED) {
+				Toast.makeText(this, "Permission denied (write)", Toast.LENGTH_SHORT).show();
+				return null;
+			}
+		}
+
 		return mBinder;
 	}
 	

From ea76f1d6e2ca48f5efff13d1ad0133f0ca03e363 Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Tue, 10 Jan 2017 11:41:24 +0100
Subject: [PATCH 08/30] Improve DownloadManager and -Service

 * Fix permission at some places
 * Fix access problem for downloaded files with external player
 * Store finished Downloads
 * Remove binding to DownloadService just to download a file
 * Javadoc
 * Code improvements
---
 app/build.gradle                              |   1 +
 app/src/main/AndroidManifest.xml              |  10 +
 .../java/org/schabi/newpipe/MainActivity.java |   4 +
 .../detail/VideoItemDetailFragment.java       |   5 +
 .../newpipe/download/DownloadActivity.java    |  47 ++--
 .../newpipe/download/DownloadDialog.java      |  66 +----
 .../newpipe/download/DownloadListener.java    |  62 ----
 .../newpipe/download/FileDownloader.java      |   2 +-
 .../youtube/YoutubeStreamExtractor.java       |   2 +-
 .../schabi/newpipe/util/PermissionHelper.java |  68 +++++
 .../shandian/giga/get/DownloadDataSource.java |  36 +++
 .../us/shandian/giga/get/DownloadManager.java |  40 ++-
 .../giga/get/DownloadManagerImpl.java         | 265 ++++++++++++++----
 .../us/shandian/giga/get/DownloadMission.java | 159 +++++++++--
 .../shandian/giga/get/DownloadRunnable.java   |  13 +-
 .../giga/get/DownloadRunnableFallback.java    |   5 +-
 .../sqlite/DownloadMissionSQLiteHelper.java   | 102 +++++++
 .../get/sqlite/SQLiteDownloadDataSource.java  |  79 ++++++
 .../giga/service/DownloadManagerService.java  | 183 ++++++++----
 .../giga/ui/adapter/MissionAdapter.java       |  69 +++--
 .../giga/ui/fragment/MissionsFragment.java    |  11 +-
 app/src/main/res/xml/provider_paths.xml       |   4 +
 .../giga/get/get/DownloadManagerImplTest.java | 156 +++++++++++
 23 files changed, 1066 insertions(+), 323 deletions(-)
 delete mode 100644 app/src/main/java/org/schabi/newpipe/download/DownloadListener.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java
 create mode 100644 app/src/main/java/us/shandian/giga/get/DownloadDataSource.java
 create mode 100644 app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
 create mode 100644 app/src/main/java/us/shandian/giga/get/sqlite/SQLiteDownloadDataSource.java
 create mode 100644 app/src/main/res/xml/provider_paths.xml
 create mode 100644 app/src/test/java/us/shandian/giga/get/get/DownloadManagerImplTest.java

diff --git a/app/build.gradle b/app/build.gradle
index 266f7fadb..9500c0a32 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,5 +46,6 @@ dependencies {
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.nononsenseapps:filepicker:3.0.0'
     testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
     compile 'ch.acra:acra:4.9.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9c5ea2381..2b44f0b53 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -161,6 +161,16 @@
         <activity
             android:name=".ReCaptchaActivity"
             android:label="@string/reCaptchaActivity" />
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index bfeb74287..1a6305d28 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -11,6 +11,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 
 import org.schabi.newpipe.settings.SettingsActivity;
+import org.schabi.newpipe.util.PermissionHelper;
 
 /**
  * Created by Christian Schabesberger on 02.08.16.
@@ -74,6 +75,9 @@ public class MainActivity extends AppCompatActivity {
                 return true;
             }
             case R.id.action_show_downloads: {
+                if(!PermissionHelper.checkStoragePermissions(this)) {
+                    return false;
+                }
                 Intent intent = new Intent(this, org.schabi.newpipe.download.DownloadActivity.class);
                 startActivity(intent);
                 return true;
diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
index 2c6e4b55a..c507a07d3 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
@@ -59,6 +59,7 @@ import org.schabi.newpipe.extractor.stream_info.VideoStream;
 import org.schabi.newpipe.player.BackgroundPlayer;
 import org.schabi.newpipe.player.PlayVideoActivity;
 import org.schabi.newpipe.player.ExoPlayerActivity;
+import org.schabi.newpipe.util.PermissionHelper;
 
 import static android.app.Activity.RESULT_OK;
 import static org.schabi.newpipe.ReCaptchaActivity.RECAPTCHA_REQUEST;
@@ -393,6 +394,10 @@ public class VideoItemDetailFragment extends Fragment {
         actionBarHandler.setOnDownloadListener(new ActionBarHandler.OnActionListener() {
             @Override
             public void onActionSelected(int selectedStreamId) {
+                if(!PermissionHelper.checkStoragePermissions(getActivity())) {
+                    return;
+                }
+
                 try {
                     Bundle args = new Bundle();
 
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index a7e52c486..ab833be0e 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -15,6 +15,7 @@ import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -30,6 +31,7 @@ import android.widget.Toast;
 
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.settings.SettingsActivity;
 
 import java.io.File;
@@ -53,26 +55,11 @@ public class DownloadActivity extends AppCompatActivity implements AdapterView.O
 
 
     private MissionsFragment mFragment;
-    private DownloadManager mManager;
-    private DownloadManagerService.DMBinder mBinder;
+
 
     private String mPendingUrl;
     private SharedPreferences mPrefs;
 
-    private ServiceConnection mConnection = new ServiceConnection() {
-
-        @Override
-        public void onServiceConnected(ComponentName p1, IBinder binder) {
-            mBinder = (DownloadManagerService.DMBinder) binder;
-            mManager = mBinder.getDownloadManager();
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName p1) {
-
-        }
-    };
-
     @Override
     @TargetApi(21)
     protected void onCreate(Bundle savedInstanceState) {
@@ -83,7 +70,6 @@ public class DownloadActivity extends AppCompatActivity implements AdapterView.O
         Intent i = new Intent();
         i.setClass(this, DownloadManagerService.class);
         startService(i);
-        bindService(i, mConnection, Context.BIND_AUTO_CREATE);
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_downloader);
@@ -91,7 +77,7 @@ public class DownloadActivity extends AppCompatActivity implements AdapterView.O
 
         //noinspection ConstantConditions
 
-        // its ok if this failes, we will catch that error later, and send it as report
+        // its ok if this fails, we will catch that error later, and send it as report
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setTitle(R.string.downloads_title);
@@ -202,22 +188,24 @@ public class DownloadActivity extends AppCompatActivity implements AdapterView.O
             @Override
             public boolean onMenuItemClick(MenuItem item) {
                 if (item.getItemId() == R.id.okay) {
+
+                    String location;
+                    if(audioButton.isChecked()) {
+                        location = NewPipeSettings.getAudioDownloadPath(DownloadActivity.this);
+                    } else {
+                        location = NewPipeSettings.getVideoDownloadPath(DownloadActivity.this);
+                    }
+
                     String fName = name.getText().toString().trim();
 
-                    File f = new File(mManager.getLocation() + "/" + fName);
-
+                    File f = new File(location, fName);
                     if (f.exists()) {
                         Toast.makeText(DownloadActivity.this, R.string.msg_exists, Toast.LENGTH_SHORT).show();
                     } else {
-
-                        while (mBinder == null);
-
-                        int res = mManager.startMission(
-                                getIntent().getData().toString(),
-                                fName,
-                                audioButton.isChecked(),
-                                threads.getProgress() + 1);
-                        mBinder.onMissionAdded(mManager.getMission(res));
+                        DownloadManagerService.startMission(
+                                DownloadActivity.this,
+                                getIntent().getData().toString(), location, fName,
+                                audioButton.isChecked(), threads.getProgress() + 1);
                         mFragment.notifyChange();
 
                         mPrefs.edit().putInt(THREADS, threads.getProgress() + 1).commit();
@@ -277,4 +265,5 @@ public class DownloadActivity extends AppCompatActivity implements AdapterView.O
                         super.onOptionsItemSelected(item);
         }
     }
+
 }
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 2d2159768..22911fc19 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -26,6 +26,8 @@ import android.widget.TextView;
 
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.settings.NewPipeSettings;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -65,24 +67,6 @@ public class DownloadDialog extends DialogFragment {
     public static final String AUDIO_URL = "audio_url";
     public static final String VIDEO_URL = "video_url";
 
-    private DownloadManager mManager;
-    private DownloadManagerService.DMBinder mBinder;
-
-    private ServiceConnection mConnection = new ServiceConnection() {
-
-        @Override
-        public void onServiceConnected(ComponentName p1, IBinder binder) {
-            mBinder = (DownloadManagerService.DMBinder) binder;
-            mManager = mBinder.getDownloadManager();
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName p1) {
-
-        }
-    };
-
-
     public DownloadDialog() {
 
     }
@@ -102,12 +86,6 @@ public class DownloadDialog extends DialogFragment {
         if(ContextCompat.checkSelfPermission(this.getContext(),Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED)
             ActivityCompat.requestPermissions(getActivity(),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},0);
 
-        Intent i = new Intent();
-        i.setClass(getContext(), DownloadManagerService.class);
-        getContext().startService(i);
-        getContext().bindService(i, mConnection, Context.BIND_AUTO_CREATE);
-
-
         return inflater.inflate(R.layout.dialog_url, container);
     }
 
@@ -219,36 +197,22 @@ public class DownloadDialog extends DialogFragment {
 
         String fName = name.getText().toString().trim();
 
-        // todo: add timeout? would be bad if the thread gets locked dueto this.
-        while (mBinder == null);
-
-        if(audioButton.isChecked()){
-            int res = mManager.startMission(
-                    arguments.getString(AUDIO_URL),
-                    fName + arguments.getString(FILE_SUFFIX_AUDIO),
-                    audioButton.isChecked(),
-                    threads.getProgress() + 1);
-            DownloadMission mission = mManager.getMission(res);
-            mBinder.onMissionAdded(mission);
-            // add download listener to allow media scan notification
-            DownloadListener listener = new DownloadListener(getContext(), mission);
-            mission.addListener(listener);
+        boolean isAudio = audioButton.isChecked();
+        String url, location, filename;
+        if(isAudio) {
+            url = arguments.getString(AUDIO_URL);
+            location = NewPipeSettings.getAudioDownloadPath(getContext());
+            filename = fName + arguments.getString(FILE_SUFFIX_AUDIO);
+        } else {
+            url = arguments.getString(VIDEO_URL);
+            location = NewPipeSettings.getVideoDownloadPath(getContext());
+            filename = fName + arguments.getString(FILE_SUFFIX_VIDEO);
         }
 
-        if(videoButton.isChecked()){
-            int res = mManager.startMission(
-                    arguments.getString(VIDEO_URL),
-                    fName + arguments.getString(FILE_SUFFIX_VIDEO),
-                    audioButton.isChecked(),
-                    threads.getProgress() + 1);
-            DownloadMission mission = mManager.getMission(res);
-            mBinder.onMissionAdded(mission);
-            // add download listener to allow media scan notification
-            DownloadListener listener = new DownloadListener(getContext(), mission);
-            mission.addListener(listener);
-        }
+        DownloadManagerService.startMission(getContext(), url, location, filename, isAudio,
+                threads.getProgress() + 1);
+
         getDialog().dismiss();
-
     }
 
     private void download(String url, String title,
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadListener.java b/app/src/main/java/org/schabi/newpipe/download/DownloadListener.java
deleted file mode 100644
index eab30fddd..000000000
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadListener.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.schabi.newpipe.download;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-
-import us.shandian.giga.get.DownloadMission;
-import us.shandian.giga.get.DownloadMission.MissionListener;
-
-/**
- * Created by erwin on 06.11.16.
- *
- * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * DownloadListener.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-class DownloadListener implements MissionListener
-{
-    DownloadMission mMission;
-    Context mContext;
-
-    public DownloadListener(Context context, DownloadMission mission)
-    {
-        super();
-        mMission = mission;
-        mContext = context;
-    }
-
-    @Override
-    public void onProgressUpdate(long done, long total)
-    {
-        // do nothing special ...
-    }
-
-    @Override
-    public void onFinish()
-    {
-        // notify media scanner on downloaded media file ...
-        mContext.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE,
-                                          Uri.parse( "file://" + mMission.location
-                                                     + "/" + mMission.name)));
-    }
-
-    @Override
-    public void onError(int errCode)
-    {
-        // do nothing special ...
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/download/FileDownloader.java b/app/src/main/java/org/schabi/newpipe/download/FileDownloader.java
index 1da8d0182..b097a035a 100644
--- a/app/src/main/java/org/schabi/newpipe/download/FileDownloader.java
+++ b/app/src/main/java/org/schabi/newpipe/download/FileDownloader.java
@@ -42,7 +42,7 @@ import info.guardianproject.netcipher.NetCipher;
  */
 
 
-// TODO: FOR HEVEN SAKE !!! DO NOT SIMPLY USE ASYNCTASK. MAKE THIS A PROPER SERVICE !!!
+// TODO: FOR HEAVEN SAKE !!! DO NOT SIMPLY USE ASYNCTASK. MAKE THIS A PROPER SERVICE !!!
 public class FileDownloader extends AsyncTask<Void, Integer, Void> {
     public static final String TAG = "FileDownloader";
 
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
index 5910a1efb..78db5d36a 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -88,7 +88,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     // $$el_type$$ will be replaced by the actual el_type (se the declarations below)
     private static final String GET_VIDEO_INFO_URL =
             "https://www.youtube.com/get_video_info?video_id=%%video_id%%$$el_type$$&ps=default&eurl=&gl=US&hl=en";
-    // eltype is nececeary for the url aboth
+    // eltype is necessary for the url above
     private static final String EL_INFO = "el=info";
 
     public enum ItagType {
diff --git a/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java b/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java
new file mode 100644
index 000000000..4c43426c5
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java
@@ -0,0 +1,68 @@
+package org.schabi.newpipe.util;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+
+public class PermissionHelper {
+    public static final int PERMISSION_WRITE_STORAGE = 778;
+    public static final int PERMISSION_READ_STORAGE = 777;
+
+
+
+    public static boolean checkStoragePermissions(Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            if(!checkReadStoragePermissions(activity)) return false;
+        }
+        return checkWriteStoragePermissions(activity);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
+    public static boolean checkReadStoragePermissions(Activity activity) {
+        if (ContextCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(activity,
+                    new String[]{
+                            Manifest.permission.READ_EXTERNAL_STORAGE,
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                    PERMISSION_READ_STORAGE);
+
+            return false;
+        }
+        return true;
+    }
+
+
+    public static boolean checkWriteStoragePermissions(Activity activity) {
+        // Here, thisActivity is the current activity
+        if (ContextCompat.checkSelfPermission(activity,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+
+            // Should we show an explanation?
+            /*if (ActivityCompat.shouldShowRequestPermissionRationale(activity,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+
+                // Show an explanation to the user *asynchronously* -- don't block
+                // this thread waiting for the user's response! After the user
+                // sees the explanation, try again to request the permission.
+            } else {*/
+
+            // No explanation needed, we can request the permission.
+            ActivityCompat.requestPermissions(activity,
+                    new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                    PERMISSION_WRITE_STORAGE);
+
+            // PERMISSION_WRITE_STORAGE is an
+            // app-defined int constant. The callback method gets the
+            // result of the request.
+            /*}*/
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadDataSource.java b/app/src/main/java/us/shandian/giga/get/DownloadDataSource.java
new file mode 100644
index 000000000..87f550cc4
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/get/DownloadDataSource.java
@@ -0,0 +1,36 @@
+package us.shandian.giga.get;
+
+import java.util.List;
+
+/**
+ * Provides access to the storage of {@link DownloadMission}s
+ */
+public interface DownloadDataSource {
+
+    /**
+     * Load all missions
+     * @return a list of download missions
+     */
+    List<DownloadMission> loadMissions();
+
+    /**
+     * Add a downlaod mission to the storage
+     * @param downloadMission the download mission to add
+     * @return the identifier of the mission
+     */
+    void addMission(DownloadMission downloadMission);
+
+    /**
+     * Update a download mission which exists in the storage
+     * @param downloadMission the download mission to update
+     * @throws IllegalArgumentException if the mission was not added to storage
+     */
+    void updateMission(DownloadMission downloadMission);
+
+
+    /**
+     * Delete a download mission
+     * @param downloadMission the mission to delete
+     */
+    void deleteMission(DownloadMission downloadMission);
+}
\ No newline at end of file
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadManager.java b/app/src/main/java/us/shandian/giga/get/DownloadManager.java
index 44eb0bb8e..b6579c86d 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadManager.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadManager.java
@@ -3,12 +3,46 @@ package us.shandian.giga.get;
 public interface DownloadManager
 {
 	int BLOCK_SIZE = 512 * 1024;
-	
-	int startMission(String url, String name, boolean isAudio, int threads);
+
+	/**
+	 * Start a new download mission
+	 * @param url the url to download
+	 * @param location the location
+	 * @param name the name of the file to create
+	 * @param isAudio true if the download is an audio file
+	 * @param threads the number of threads maximal used to download chunks of the file.    @return the identifier of the mission.
+     */
+	int startMission(String url, String location, String name, boolean isAudio, int threads);
+
+	/**
+	 * Resume the execution of a download mission.
+	 * @param id the identifier of the mission to resume.
+	 */
 	void resumeMission(int id);
+
+	/**
+	 * Pause the execution of a download mission.
+	 * @param id the identifier of the mission to pause.
+     */
 	void pauseMission(int id);
+
+	/**
+	 * Deletes the mission from the downloaded list but keeps the downloaded file.
+	 * @param id The mission identifier
+     */
 	void deleteMission(int id);
+
+	/**
+	 * Get the download mission by its identifier
+	 * @param id the identifier of the download mission
+	 * @return the download mission or null if the mission doesn't exist
+     */
 	DownloadMission getMission(int id);
+
+	/**
+	 * Get the number of download missions.
+	 * @return the number of download missions.
+     */
 	int getCount();
-	String getLocation();
+
 }
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java b/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
index 498b9a079..3c37ac7d4 100755
--- a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
@@ -1,17 +1,21 @@
 package us.shandian.giga.get;
 
-import android.content.Context;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.google.gson.Gson;
 
-import org.schabi.newpipe.settings.NewPipeSettings;
-
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.RandomAccessFile;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 import us.shandian.giga.util.Utility;
 import static org.schabi.newpipe.BuildConfig.DEBUG;
@@ -19,33 +23,48 @@ import static org.schabi.newpipe.BuildConfig.DEBUG;
 public class DownloadManagerImpl implements DownloadManager
 {
 	private static final String TAG = DownloadManagerImpl.class.getSimpleName();
-	
-	private Context mContext;
-	private String mLocation;
-	protected ArrayList<DownloadMission> mMissions = new ArrayList<DownloadMission>();
-	
-	public DownloadManagerImpl(Context context, String location) {
-		mContext = context;
-		mLocation = location;
-		loadMissions();
+	private final DownloadDataSource mDownloadDataSource;
+
+	private final ArrayList<DownloadMission> mMissions = new ArrayList<DownloadMission>();
+
+    /**
+     * Create a new instance
+     * @param searchLocations the directories to search for unfinished downloads
+     * @param downloadDataSource the data source for finished downloads
+     */
+	public DownloadManagerImpl(Collection<String> searchLocations, DownloadDataSource downloadDataSource) {
+		mDownloadDataSource = downloadDataSource;
+		loadMissions(searchLocations);
 	}
-	
+
 	@Override
-	public int startMission(String url, String name, boolean isAudio, int threads) {
-		DownloadMission mission = new DownloadMission();
-		mission.url = url;
-		mission.name = name;
-		if(isAudio) {
-			mission.location = NewPipeSettings.getAudioDownloadPath(mContext);
-		} else {
-			mission.location = NewPipeSettings.getVideoDownloadPath(mContext);
+	public int startMission(String url, String location, String name, boolean isAudio, int threads) {
+		DownloadMission existingMission = getMissionByLocation(location, name);
+		if(existingMission != null) {
+			// Already downloaded or downloading
+			if(existingMission.finished) {
+				// Overwrite mission
+                deleteMission(mMissions.indexOf(existingMission));
+			} else {
+				// Rename file (?)
+                try {
+                    name = generateUniqueName(location, name);
+                }catch (Exception e) {
+                    Log.e(TAG, "Unable to generate unique name", e);
+                    name = System.currentTimeMillis() + name ;
+                    Log.i(TAG, "Using " + name);
+                }
+			}
 		}
+
+		DownloadMission mission = new DownloadMission(name, url, location);
 		mission.timestamp = System.currentTimeMillis();
 		mission.threadCount = threads;
-		new Initializer(mContext, mission).start();
+		mission.addListener(new MissionListener(mission));
+		new Initializer(mission).start();
 		return insertMission(mission);
 	}
-	
+
 	@Override
 	public void resumeMission(int i) {
 		DownloadMission d = getMission(i);
@@ -53,7 +72,7 @@ public class DownloadManagerImpl implements DownloadManager
 			d.start();
 		}
 	}
-	
+
 	@Override
 	public void pauseMission(int i) {
 		DownloadMission d = getMission(i);
@@ -61,55 +80,94 @@ public class DownloadManagerImpl implements DownloadManager
 			d.pause();
 		}
 	}
-	
+
 	@Override
 	public void deleteMission(int i) {
-		getMission(i).delete();
+		DownloadMission mission = getMission(i);
+		if(mission.finished) {
+			mDownloadDataSource.deleteMission(mission);
+		}
+		mission.delete();
 		mMissions.remove(i);
 	}
-	
-	private void loadMissions() {
-		File f = new File(mLocation);
+
+	private void loadMissions(Iterable<String> searchLocations) {
+		mMissions.clear();
+		loadFinishedMissions();
+		for(String location: searchLocations) {
+			loadMissions(location);
+		}
+
+	}
+
+
+	/**
+	 * Loads finished missions from the data source
+	 */
+	private void loadFinishedMissions() {
+		List<DownloadMission> finishedMissions = mDownloadDataSource.loadMissions();
+        if(finishedMissions == null) {
+            finishedMissions = new ArrayList<>();
+        }
+        // Ensure its sorted
+        Collections.sort(finishedMissions, new Comparator<DownloadMission>() {
+            @Override
+            public int compare(DownloadMission o1, DownloadMission o2) {
+                return (int) (o1.timestamp - o2.timestamp);
+            }
+        });
+        mMissions.ensureCapacity(mMissions.size() + finishedMissions.size());
+		for(DownloadMission mission: finishedMissions) {
+			File downloadedFile = mission.getDownloadedFile();
+			if(!downloadedFile.isFile()) {
+				if(DEBUG) {
+					Log.d(TAG, "downloaded file removed: " + downloadedFile.getAbsolutePath());
+				}
+				mDownloadDataSource.deleteMission(mission);
+			} else {
+				mission.length = downloadedFile.length();
+				mission.finished = true;
+				mission.running = false;
+				mMissions.add(mission);
+			}
+		}
+	}
+
+	private void loadMissions(String location) {
+
+		File f = new File(location);
 
 		if (f.exists() && f.isDirectory()) {
 			File[] subs = f.listFiles();
-			
+
+            if(subs == null) {
+                Log.e(TAG, "listFiles() returned null");
+                return;
+            }
+
 			for (File sub : subs) {
-				if (sub.isDirectory()) {
-					continue;
-				}
-				
-				if (sub.getName().endsWith(".giga")) {
+				if (sub.isFile() && sub.getName().endsWith(".giga")) {
 					String str = Utility.readFromFile(sub.getAbsolutePath());
 					if (str != null && !str.trim().equals("")) {
-						
+
 						if (DEBUG) {
 							Log.d(TAG, "loading mission " + sub.getName());
 							Log.d(TAG, str);
 						}
-						
+
 						DownloadMission mis = new Gson().fromJson(str, DownloadMission.class);
-						
+
 						if (mis.finished) {
-							sub.delete();
+							if(!sub.delete()) {
+                                Log.w(TAG, "Unable to delete .giga file: " + sub.getPath());
+                            }
 							continue;
 						}
-						
+
 						mis.running = false;
 						mis.recovered = true;
 						insertMission(mis);
 					}
-				} else if (!sub.getName().startsWith(".") && !new File(sub.getPath() + ".giga").exists()) {
-					// Add a dummy mission for downloaded files
-					DownloadMission mis = new DownloadMission();
-					mis.length = sub.length();
-					mis.done = mis.length;
-					mis.finished = true;
-					mis.running = false;
-					mis.name = sub.getName();
-					mis.location = mLocation;
-					mis.timestamp = sub.lastModified();
-					insertMission(mis);
 				}
 			}
 		}
@@ -144,18 +202,81 @@ public class DownloadManagerImpl implements DownloadManager
 		
 		return i;
 	}
-	
-	@Override
-	public String getLocation() {
-		return mLocation;
+
+    /**
+	 * Get a mission by its location and name
+	 * @param location the location
+	 * @param name the name
+	 * @return the mission or null if no such mission exists
+	 */
+	private @Nullable DownloadMission getMissionByLocation(String location, String name) {
+		for(DownloadMission mission: mMissions) {
+			if(location.equals(mission.location) && name.equals(mission.name)) {
+				return mission;
+			}
+		}
+		return null;
 	}
-	
+
+	/**
+	 * Splits the filename into name and extension
+	 *
+	 * Dots are ignored if they appear: not at all, at the beginning of the file,
+	 * at the end of the file
+	 *
+	 * @param name the name to split
+	 * @return a string array with a length of 2 containing the name and the extension
+     */
+	private static String[] splitName(String name) {
+		int dotIndex = name.lastIndexOf('.');
+		if(dotIndex <= 0 || (dotIndex  == name.length() - 1)) {
+			return new String[]{name, ""};
+		} else {
+			return new String[]{name.substring(0, dotIndex), name.substring(dotIndex + 1)};
+		}
+	}
+
+	/**
+	 * Generates a unique file name.
+	 *
+	 * e.g. "myname (1).txt" if the name "myname.txt" exists.
+	 * @param location the location (to check for existing files)
+	 * @param name the name of the file
+     * @return the unique file name
+	 * @throws IllegalArgumentException if the location is not a directory
+	 * @throws SecurityException if the location is not readable
+     */
+	private static String generateUniqueName(String location, String name) {
+		if(location == null) throw new NullPointerException("location is null");
+		if(name == null) throw new NullPointerException("name is null");
+		File destination = new File(location);
+		if(!destination.isDirectory()) {
+			throw new IllegalArgumentException("location is not a directory: " + location);
+		}
+		final String[] nameParts = splitName(name);
+		String[] existingName = destination.list(new FilenameFilter() {
+			@Override
+			public boolean accept(File dir, String name) {
+				return name.startsWith(nameParts[0]);
+			}
+		});
+		Arrays.sort(existingName);
+		String newName;
+		int downloadIndex = 0;
+		do {
+			newName = nameParts[0] + " (" + downloadIndex + ")." + nameParts[1];
+			++downloadIndex;
+			if(downloadIndex == 1000) {  // Probably an error on our side
+				throw new RuntimeException("Too many existing files");
+			}
+		} while (Arrays.binarySearch(existingName, newName) >= 0);
+		return newName;
+	}
+
 	private class Initializer extends Thread {
-		private Context context;
 		private DownloadMission mission;
 		
-		public Initializer(Context context, DownloadMission mission) {
-			this.context = context;
+		public Initializer(DownloadMission mission) {
 			this.mission = mission;
 		}
 		
@@ -217,4 +338,30 @@ public class DownloadManagerImpl implements DownloadManager
 			}
 		}
 	}
+
+	/**
+	 * Waits for mission to finish to add it to the {@link #mDownloadDataSource}
+	 */
+	private class MissionListener implements DownloadMission.MissionListener {
+		private final DownloadMission mMission;
+
+		private MissionListener(DownloadMission mission) {
+			if(mission == null) throw new NullPointerException("mission is null");
+			// Could the mission be passed in onFinish()?
+			mMission = mission;
+		}
+
+		@Override
+		public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
+		}
+
+		@Override
+		public void onFinish(DownloadMission downloadMission) {
+			mDownloadDataSource.addMission(mMission);
+		}
+
+		@Override
+		public void onError(DownloadMission downloadMission, int errCode) {
+		}
+	}
 }
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index 1cdef125f..54e84c5ab 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -1,6 +1,5 @@
 package us.shandian.giga.get;
 
-import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
@@ -10,39 +9,63 @@ import com.google.gson.Gson;
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import us.shandian.giga.util.Utility;
+
 import static org.schabi.newpipe.BuildConfig.DEBUG;
 
 public class DownloadMission
 {
 	private static final String TAG = DownloadMission.class.getSimpleName();
-	
+
 	public interface MissionListener {
 		HashMap<MissionListener, Handler> handlerStore = new HashMap<>();
 		
-		void onProgressUpdate(long done, long total);
-		void onFinish();
-		void onError(int errCode);
+		void onProgressUpdate(DownloadMission downloadMission, long done, long total);
+		void onFinish(DownloadMission downloadMission);
+		void onError(DownloadMission downloadMission, int errCode);
 	}
 	
 	public static final int ERROR_SERVER_UNSUPPORTED = 206;
 	public static final int ERROR_UNKNOWN = 233;
-	
-	public String name = "";
-	public String url = "";
-	public String location = "";
+
+	/**
+	 * The filename
+	 */
+	public String name;
+
+	/**
+	 * The url of the file to download
+	 */
+	public String url;
+
+	/**
+	 * The directory to store the download
+	 */
+	public String location;
+
+	/**
+	 * Number of blocks the size of {@link DownloadManager#BLOCK_SIZE}
+	 */
 	public long blocks;
+
+	/**
+	 * Number of bytes
+	 */
 	public long length;
+
+	/**
+	 * Number of bytes downloaded
+	 */
 	public long done;
 	public int threadCount = 3;
 	public int finishCount;
-	public List<Long> threadPositions = new ArrayList<Long>();
-	public Map<Long, Boolean> blockState = new HashMap<Long, Boolean>();
+	private List<Long> threadPositions = new ArrayList<Long>();
+	public final Map<Long, Boolean> blockState = new HashMap<Long, Boolean>();
 	public boolean running;
 	public boolean finished;
 	public boolean fallback;
@@ -53,23 +76,65 @@ public class DownloadMission
 	
 	private transient ArrayList<WeakReference<MissionListener>> mListeners = new ArrayList<WeakReference<MissionListener>>();
 	private transient boolean mWritingToFile;
-	
+
+	private static final int NO_IDENTIFIER = -1;
+	private long db_identifier = NO_IDENTIFIER;
+
+	public DownloadMission() {
+	}
+
+	public DownloadMission(String name, String url, String location) {
+		if(name == null) throw new NullPointerException("name is null");
+		if(name.isEmpty()) throw new IllegalArgumentException("name is empty");
+		if(url == null) throw new NullPointerException("url is null");
+		if(url.isEmpty()) throw new IllegalArgumentException("url is empty");
+		if(location == null) throw new NullPointerException("location is null");
+		if(location.isEmpty()) throw new IllegalArgumentException("location is empty");
+		this.url = url;
+		this.name = name;
+		this.location = location;
+	}
+
+
+	private void checkBlock(long block) {
+		if(block < 0 || block >= blocks) {
+			throw new IllegalArgumentException("illegal block identifier");
+		}
+	}
+
+	/**
+	 * Check if a block is reserved
+	 * @param block the block identifier
+	 * @return true if the block is reserved and false if otherwise
+     */
 	public boolean isBlockPreserved(long block) {
+		checkBlock(block);
 		return blockState.containsKey(block) ? blockState.get(block) : false;
 	}
 	
 	public void preserveBlock(long block) {
+		checkBlock(block);
 		synchronized (blockState) {
 			blockState.put(block, true);
 		}
 	}
-	
-	public void setPosition(int id, long position) {
-		threadPositions.set(id, position);
+
+	/**
+	 * Set the download position of the file
+	 * @param threadId the identifier of the thread
+	 * @param position the download position of the thread
+     */
+	public void setPosition(int threadId, long position) {
+		threadPositions.set(threadId, position);
 	}
-	
-	public long getPosition(int id) {
-		return threadPositions.get(id);
+
+	/**
+	 * Get the position of a thread
+	 * @param threadId the identifier of the thread
+	 * @return the position for the thread
+     */
+	public long getPosition(int threadId) {
+		return threadPositions.get(threadId);
 	}
 	
 	public synchronized void notifyProgress(long deltaLen) {
@@ -95,13 +160,16 @@ public class DownloadMission
 				MissionListener.handlerStore.get(listener).post(new Runnable() {
 					@Override
 					public void run() {
-						listener.onProgressUpdate(done, length);
+						listener.onProgressUpdate(DownloadMission.this, done, length);
 					}
 				});
 			}
 		}
 	}
-	
+
+	/**
+	 * Called by a download thread when it finished.
+	 */
 	public synchronized void notifyFinished() {
 		if (errCode > 0) return;
 		
@@ -111,7 +179,10 @@ public class DownloadMission
 			onFinish();
 		}
 	}
-	
+
+	/**
+	 * Called when all parts are downloaded
+	 */
 	private void onFinish() {
 		if (errCode > 0) return;
 		
@@ -130,7 +201,7 @@ public class DownloadMission
 				MissionListener.handlerStore.get(listener).post(new Runnable() {
 					@Override
 					public void run() {
-						listener.onFinish();
+						listener.onFinish(DownloadMission.this);
 					}
 				});
 			}
@@ -147,7 +218,7 @@ public class DownloadMission
 			MissionListener.handlerStore.get(listener).post(new Runnable() {
 				@Override
 				public void run() {
-					listener.onError(errCode);
+					listener.onError(DownloadMission.this, errCode);
 				}
 			});
 		}
@@ -169,7 +240,10 @@ public class DownloadMission
 			}
 		}
 	}
-	
+
+	/**
+	 * Start downloading with multiple threads.
+	 */
 	public void start() {
 		if (!running && !finished) {
 			running = true;
@@ -200,12 +274,19 @@ public class DownloadMission
 			// if (err)
 		}
 	}
-	
+
+	/**
+	 * Removes the file and the meta file
+	 */
 	public void delete() {
 		deleteThisFromFile();
-		new File(location + "/" + name).delete();
+		new File(location, name).delete();
 	}
-	
+
+	/**
+	 * Write this {@link DownloadMission} to the meta file asynchronously
+	 * if no thread is already running.
+	 */
 	public void writeThisToFile() {
 		if (!mWritingToFile) {
 			mWritingToFile = true;
@@ -218,14 +299,30 @@ public class DownloadMission
 			}.start();
 		}
 	}
-	
+
+	/**
+	 * Write this {@link DownloadMission} to the meta file.
+	 */
 	private void doWriteThisToFile() {
 		synchronized (blockState) {
-			Utility.writeToFile(location + "/" + name + ".giga", new Gson().toJson(this));
+			Utility.writeToFile(getMetaFilename(), new Gson().toJson(this));
 		}
 	}
 	
 	private void deleteThisFromFile() {
-		new File(location + "/" + name + ".giga").delete();
+		new File(getMetaFilename()).delete();
 	}
+
+	/**
+	 * Get the path of the meta file
+	 * @return the path to the meta file
+     */
+	private String getMetaFilename() {
+		return location + "/" + name + ".giga";
+	}
+
+	public File getDownloadedFile() {
+		return new File(location, name);
+	}
+
 }
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index 1db03c4be..1df5e716f 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -9,14 +9,19 @@ import java.net.URL;
 
 import static org.schabi.newpipe.BuildConfig.DEBUG;
 
+/**
+ * Runnable to download blocks of a file until the file is completely downloaded,
+ * an error occurs or the process is stopped.
+ */
 public class DownloadRunnable implements Runnable
 {
 	private static final String TAG = DownloadRunnable.class.getSimpleName();
 	
-	private DownloadMission mMission;
-	private int mId;
+	private final DownloadMission mMission;
+	private final int mId;
 	
 	public DownloadRunnable(DownloadMission mission, int id) {
+		if(mission == null) throw new NullPointerException("mission is null");
 		mMission = mission;
 		mId = id;
 	}
@@ -86,7 +91,7 @@ public class DownloadRunnable implements Runnable
 					Log.d(TAG, mId + ":Content-Length=" + conn.getContentLength() + " Code:" + conn.getResponseCode());
 				}
 				
-				// A server may be ignoring the range requet
+				// A server may be ignoring the range request
 				if (conn.getResponseCode() != 206) {
 					mMission.errCode = DownloadMission.ERROR_SERVER_UNSUPPORTED;
 					notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
@@ -131,7 +136,7 @@ public class DownloadRunnable implements Runnable
 				notifyProgress(-total);
 				
 				if (DEBUG) {
-					Log.d(TAG, mId + ":position " + position + " retrying");
+					Log.d(TAG, mId + ":position " + position + " retrying", e);
 				}
 			}
 		}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
index 50bdce858..e0a737024 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
@@ -8,10 +8,11 @@ import java.net.URL;
 // Single-threaded fallback mode
 public class DownloadRunnableFallback implements Runnable
 {
-	private DownloadMission mMission;
+	private final DownloadMission mMission;
 	//private int mId;
 	
 	public DownloadRunnableFallback(DownloadMission mission) {
+		if(mission == null) throw new NullPointerException("mission is null");
 		//mId = id;
 		mMission = mission;
 	}
@@ -35,7 +36,7 @@ public class DownloadRunnableFallback implements Runnable
 					f.write(buf, 0, len);
 					notifyProgress(len);
 					
-					if (Thread.currentThread().interrupted()) {
+					if (Thread.interrupted()) {
 						break;
 					}
 					
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
new file mode 100644
index 000000000..7b86f7dc4
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
@@ -0,0 +1,102 @@
+package us.shandian.giga.get.sqlite;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+import us.shandian.giga.get.DownloadMission;
+
+/**
+ * SqliteHelper to store {@link us.shandian.giga.get.DownloadMission}
+ */
+public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
+
+
+    private final String TAG = "DownloadMissionHelper";
+
+    // TODO: use NewPipeSQLiteHelper ('s constants) when playlist branch is merged (?)
+    private static final String DATABASE_NAME = "newpipe.db";
+
+    private static final int DATABASE_VERSION = 2;
+    /**
+     * The table name of download missions
+     */
+    static final String MISSIONS_TABLE_NAME = "download_missions";
+
+    /**
+     * The key to the directory location of the mission
+     */
+    static final String KEY_LOCATION = "location";
+    /**
+     * The key to the url of a mission
+     */
+    static final String KEY_URL = "url";
+    /**
+     * The key to the name of a mission
+     */
+    static final String KEY_NAME = "name";
+
+    /**
+     * The key to the done.
+     */
+    static final String KEY_DONE = "bytes_downloaded";
+
+    static final String KEY_TIMESTAMP = "timestamp";
+
+    /**
+     * The statement to create the table
+     */
+    private static final String MISSIONS_CREATE_TABLE =
+            "CREATE TABLE " + MISSIONS_TABLE_NAME + " (" +
+                    KEY_LOCATION + " TEXT NOT NULL, " +
+                    KEY_NAME + " TEXT NOT NULL, " +
+                    KEY_URL + " TEXT NOT NULL, " +
+                    KEY_DONE + " INTEGER NOT NULL, " +
+                    KEY_TIMESTAMP + " INTEGER NOT NULL, " +
+                    " UNIQUE(" + KEY_LOCATION + ", " + KEY_NAME + "));";
+
+
+    DownloadMissionSQLiteHelper(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+    }
+
+    /**
+     * Returns all values of the download mission as ContentValues.
+     * @param downloadMission the download mission
+     * @return the content values
+     */
+    public static ContentValues getValuesOfMission(DownloadMission downloadMission) {
+        ContentValues values = new ContentValues();
+        values.put(KEY_URL, downloadMission.url);
+        values.put(KEY_LOCATION, downloadMission.location);
+        values.put(KEY_NAME, downloadMission.name);
+        values.put(KEY_DONE, downloadMission.done);
+        values.put(KEY_TIMESTAMP, downloadMission.timestamp);
+        return values;
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(MISSIONS_CREATE_TABLE);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        // Currently nothing to do
+    }
+
+    public static DownloadMission getMissionFromCursor(Cursor cursor) {
+        if(cursor == null) throw new NullPointerException("cursor is null");
+        int pos;
+        String name = cursor.getString(cursor.getColumnIndexOrThrow(KEY_NAME));
+        String location = cursor.getString(cursor.getColumnIndexOrThrow(KEY_LOCATION));
+        String url = cursor.getString(cursor.getColumnIndexOrThrow(KEY_URL));
+        DownloadMission mission = new DownloadMission(name, url, location);
+        mission.done = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_DONE));
+        mission.timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_TIMESTAMP));
+        mission.finished = true;
+        return mission;
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/SQLiteDownloadDataSource.java b/app/src/main/java/us/shandian/giga/get/sqlite/SQLiteDownloadDataSource.java
new file mode 100644
index 000000000..556e26a39
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/SQLiteDownloadDataSource.java
@@ -0,0 +1,79 @@
+package us.shandian.giga.get.sqlite;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import us.shandian.giga.get.DownloadDataSource;
+import us.shandian.giga.get.DownloadMission;
+
+import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.KEY_LOCATION;
+import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.KEY_NAME;
+import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.MISSIONS_TABLE_NAME;
+
+
+/**
+ * Non-thread-safe implementation of {@link DownloadDataSource}
+ */
+public class SQLiteDownloadDataSource implements DownloadDataSource {
+
+    private static final String TAG = "DownloadDataSourceImpl";
+    private final DownloadMissionSQLiteHelper downloadMissionSQLiteHelper;
+
+    public SQLiteDownloadDataSource(Context context) {
+        downloadMissionSQLiteHelper = new DownloadMissionSQLiteHelper(context);
+    }
+
+    @Override
+    public List<DownloadMission> loadMissions() {
+        ArrayList<DownloadMission> result;
+        SQLiteDatabase database = downloadMissionSQLiteHelper.getReadableDatabase();
+        Cursor cursor = database.query(MISSIONS_TABLE_NAME, null, null,
+                null, null, null, DownloadMissionSQLiteHelper.KEY_TIMESTAMP);
+
+        int count = cursor.getCount();
+        if(count == 0) return new ArrayList<>();
+        result = new ArrayList<>(count);
+        while (cursor.moveToNext()) {
+            result.add(DownloadMissionSQLiteHelper.getMissionFromCursor(cursor));
+        }
+        return result;
+    }
+
+    @Override
+    public void addMission(DownloadMission downloadMission) {
+        if(downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
+        ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
+        database.insert(MISSIONS_TABLE_NAME, null, values);
+    }
+
+    @Override
+    public void updateMission(DownloadMission downloadMission) {
+        if(downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
+        ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
+        String whereClause = KEY_LOCATION+ " = ? AND " +
+                KEY_NAME + " = ?";
+        int rowsAffected = database.update(MISSIONS_TABLE_NAME, values,
+                whereClause, new String[]{downloadMission.location, downloadMission.name});
+        if(rowsAffected != 1) {
+            Log.e(TAG, "Expected 1 row to be affected by update but got " + rowsAffected);
+        }
+    }
+
+    @Override
+    public void deleteMission(DownloadMission downloadMission) {
+        if(downloadMission == null) throw new NullPointerException("downloadMission is null");
+        SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
+        database.delete(MISSIONS_TABLE_NAME,
+                KEY_LOCATION + " = ? AND " +
+                KEY_NAME + " = ?",
+                new String[]{downloadMission.location, downloadMission.name});
+    }
+}
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index 84ae7e63c..d83ed6dc8 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -4,38 +4,69 @@ import android.Manifest;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.Message;
 import android.support.v4.app.NotificationCompat.Builder;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.content.PermissionChecker;
 import android.util.Log;
 import android.widget.Toast;
 
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.download.DownloadActivity;
 import org.schabi.newpipe.settings.NewPipeSettings;
-import org.schabi.newpipe.R;
+
+import java.util.ArrayList;
+
+import us.shandian.giga.get.DownloadDataSource;
 import us.shandian.giga.get.DownloadManager;
 import us.shandian.giga.get.DownloadManagerImpl;
 import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.sqlite.SQLiteDownloadDataSource;
+
 import static org.schabi.newpipe.BuildConfig.DEBUG;
 
-public class DownloadManagerService extends Service implements DownloadMission.MissionListener
+public class DownloadManagerService extends Service
 {
-	
+
 	private static final String TAG = DownloadManagerService.class.getSimpleName();
-	
+
+	/**
+	 * Message code of update messages stored as {@link Message#what}.
+	 */
+	private static final int UPDATE_MESSAGE = 0;
+	private static final int NOTIFICATION_ID = 1000;
+	private static final String EXTRA_NAME = "DownloadManagerService.extra.name";
+	private static final String EXTRA_LOCATION = "DownloadManagerService.extra.location";
+	private static final String EXTRA_IS_AUDIO = "DownloadManagerService.extra.is_audio";
+	private static final String EXTRA_THREADS = "DownloadManagerService.extra.threads";
+
+
 	private DMBinder mBinder;
 	private DownloadManager mManager;
 	private Notification mNotification;
 	private Handler mHandler;
 	private long mLastTimeStamp = System.currentTimeMillis();
+	private DownloadDataSource mDataSource;
+
+
+
+	private MissionListener missionListener = new MissionListener();
+
+
+	private void notifyMediaScanner(DownloadMission mission) {
+		Uri uri = Uri.parse("file://" + mission.location + "/" + mission.name);
+		// notify media scanner on downloaded media file ...
+		sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri));
+	}
 
 	@Override
 	public void onCreate() {
@@ -44,14 +75,19 @@ public class DownloadManagerService extends Service implements DownloadMission.M
 		if (DEBUG) {
 			Log.d(TAG, "onCreate");
 		}
-		
+
 		mBinder = new DMBinder();
+		if(mDataSource == null) {
+			mDataSource = new SQLiteDownloadDataSource(this);
+		}
 		if (mManager == null) {
-			String path = NewPipeSettings.getVideoDownloadPath(this);
-			mManager = new DownloadManagerImpl(this, path);
+			ArrayList<String> paths = new ArrayList<>(2);
+			paths.add(NewPipeSettings.getVideoDownloadPath(this));
+			paths.add(NewPipeSettings.getAudioDownloadPath(this));
+			mManager = new DownloadManagerImpl(paths, mDataSource);
 			if (DEBUG) {
 				Log.d(TAG, "mManager == null");
-				Log.d(TAG, "Download directory: " + path);
+				Log.d(TAG, "Download directory: " + paths);
 			}
 		}
 
@@ -87,28 +123,50 @@ public class DownloadManagerService extends Service implements DownloadMission.M
 		mHandler = new Handler(thread.getLooper()) {
 			@Override
 			public void handleMessage(Message msg) {
-				if (msg.what == 0) {
-					int runningCount = 0;
-					
-					for (int i = 0; i < mManager.getCount(); i++) {
-						if (mManager.getMission(i).running) {
-							runningCount++;
+				switch (msg.what) {
+					case UPDATE_MESSAGE: {
+						int runningCount = 0;
+
+						for (int i = 0; i < mManager.getCount(); i++) {
+							if (mManager.getMission(i).running) {
+								runningCount++;
+							}
 						}
+						updateState(runningCount);
+						break;
 					}
-					
-					updateState(runningCount);
 				}
 			}
 		};
 		
 	}
 
+	private void startMissionAsync(final String url, final String location, final String name,
+								   final boolean isAudio, final int threads) {
+		mHandler.post(new Runnable() {
+			@Override
+			public void run() {
+				int missionId = mManager.startMission(url, location, name, isAudio, threads);
+				mBinder.onMissionAdded(mManager.getMission(missionId));
+			}
+		});
+	}
+
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		if (DEBUG) {
 			Log.d(TAG, "Starting");
 		}
-
+		Log.i(TAG, "Got intent: " + intent);
+		String action = intent.getAction();
+		if(action != null && action.equals(Intent.ACTION_RUN)) {
+			String name = intent.getStringExtra(EXTRA_NAME);
+			String location = intent.getStringExtra(EXTRA_LOCATION);
+			int threads = intent.getIntExtra(EXTRA_THREADS, 1);
+			boolean isAudio = intent.getBooleanExtra(EXTRA_IS_AUDIO, false);
+			String url = intent.getDataString();
+			startMissionAsync(url, location, name, isAudio, threads);
+		}
 		return START_NOT_STICKY;
 	}
 
@@ -123,65 +181,76 @@ public class DownloadManagerService extends Service implements DownloadMission.M
 		for (int i = 0; i < mManager.getCount(); i++) {
 			mManager.pauseMission(i);
 		}
-		
+
 		stopForeground(true);
 	}
 	
 	@Override
 	public IBinder onBind(Intent intent) {
+		int permissionCheck;
 		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
-			int permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
+			permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
 			if(permissionCheck == PermissionChecker.PERMISSION_DENIED) {
 				Toast.makeText(this, "Permission denied (read)", Toast.LENGTH_SHORT).show();
-				return null;
-			}
-			permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
-			if(permissionCheck == PermissionChecker.PERMISSION_DENIED) {
-				Toast.makeText(this, "Permission denied (write)", Toast.LENGTH_SHORT).show();
-				return null;
 			}
 		}
 
+		permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+		if(permissionCheck == PermissionChecker.PERMISSION_DENIED) {
+			Toast.makeText(this, "Permission denied (write)", Toast.LENGTH_SHORT).show();
+		}
+
 		return mBinder;
 	}
-	
 
-	@Override
-	public void onProgressUpdate(long done, long total) {
-
-		long now = System.currentTimeMillis();
-
-		long delta = now - mLastTimeStamp;
-
-		if (delta > 2000) {
-			postUpdateMessage();
-			mLastTimeStamp = now;
-		}
-	}
-
-	@Override
-	public void onFinish() {
-		postUpdateMessage();
-	}
-
-	@Override
-	public void onError(int errCode) {
-		postUpdateMessage();
-	}
-	
 	private void postUpdateMessage() {
-		mHandler.sendEmptyMessage(0);
+		mHandler.sendEmptyMessage(UPDATE_MESSAGE);
 	}
 	
 	private void updateState(int runningCount) {
 		if (runningCount == 0) {
 			stopForeground(true);
 		} else {
-			startForeground(1000, mNotification);
+			startForeground(NOTIFICATION_ID, mNotification);
 		}
 	}
-	
-	
+
+	public static void startMission(Context context, String url, String location, String name, boolean isAudio, int threads) {
+		Intent intent = new Intent(context, DownloadManagerService.class);
+		intent.setAction(Intent.ACTION_RUN);
+		intent.setData(Uri.parse(url));
+		intent.putExtra(EXTRA_NAME, name);
+		intent.putExtra(EXTRA_LOCATION, location);
+		intent.putExtra(EXTRA_IS_AUDIO, isAudio);
+		intent.putExtra(EXTRA_THREADS, threads);
+		context.startService(intent);
+	}
+
+
+	class MissionListener implements DownloadMission.MissionListener {
+		@Override
+		public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
+			long now = System.currentTimeMillis();
+			long delta = now - mLastTimeStamp;
+			if (delta > 2000) {
+				postUpdateMessage();
+				mLastTimeStamp = now;
+			}
+		}
+
+		@Override
+		public void onFinish(DownloadMission downloadMission) {
+			postUpdateMessage();
+			notifyMediaScanner(downloadMission);
+		}
+
+		@Override
+		public void onError(DownloadMission downloadMission, int errCode) {
+			postUpdateMessage();
+		}
+	}
+
+
 	// Wrapper of DownloadManager
 	public class DMBinder extends Binder {
 		public DownloadManager getDownloadManager() {
@@ -189,15 +258,13 @@ public class DownloadManagerService extends Service implements DownloadMission.M
 		}
 		
 		public void onMissionAdded(DownloadMission mission) {
-			mission.addListener(DownloadManagerService.this);
+			mission.addListener(missionListener);
 			postUpdateMessage();
 		}
 		
 		public void onMissionRemoved(DownloadMission mission) {
-			mission.removeListener(DownloadManagerService.this);
+			mission.removeListener(missionListener);
 			postUpdateMessage();
 		}
-		
 	}
-
 }
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index 050b4edf4..094ddf3b3 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -5,6 +5,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
+import android.support.v4.content.FileProvider;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -28,10 +31,14 @@ import us.shandian.giga.service.DownloadManagerService;
 import us.shandian.giga.ui.common.ProgressDrawable;
 import us.shandian.giga.util.Utility;
 
+import static android.content.Intent.FLAG_GRANT_PREFIX_URI_PERMISSION;
+import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION;
+
 public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHolder>
 {
 	private static final Map<Integer, String> ALGORITHMS = new HashMap<>();
-	
+	private static final String TAG = "MissionAdapter";
+
 	static {
 		ALGORITHMS.put(R.id.md5, "MD5");
 		ALGORITHMS.put(R.id.sha1, "SHA1");
@@ -212,23 +219,23 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 						h.lastDone = -1;
 						return true;
 					case R.id.view:
-						Intent i = new Intent();
-						i.setAction(Intent.ACTION_VIEW);
-						File f = new File(h.mission.location + "/" + h.mission.name);
+						File f = new File(h.mission.location, h.mission.name);
 						String ext = Utility.getFileExt(h.mission.name);
-						
-						if (ext == null) return false;
+
+						Log.d(TAG, "Viewing file: " + f.getAbsolutePath() + " ext: " + ext);
+
+						if (ext == null) {
+							Log.w(TAG, "Can't view file because it has no extension: " +
+									h.mission.name);
+							return false;
+						}
 						
 						String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext.substring(1));
-						
+						Log.v(TAG, "Mime: " + mime + " package: " + mContext.getApplicationContext().getPackageName() + ".provider");
 						if (f.exists()) {
-							i.setDataAndType(Uri.fromFile(f), mime);
-							
-							try {
-								mContext.startActivity(i);
-							} catch (Exception e) {
-								
-							}
+							viewFileWithFileProvider(f, mime);
+						} else {
+							Log.w(TAG, "File doesn't exist");
 						}
 						
 						return true;
@@ -249,6 +256,34 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 		
 		popup.show();
 	}
+
+	private void viewFile(File file, String mimetype) {
+		Intent intent = new Intent();
+		intent.setAction(Intent.ACTION_VIEW);
+		intent.setDataAndType(Uri.fromFile(file), mimetype);
+		intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			intent.addFlags(FLAG_GRANT_PREFIX_URI_PERMISSION);
+		}
+		//mContext.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+		Log.v(TAG, "Starting intent: " + intent);
+		mContext.startActivity(intent);
+	}
+
+	private void viewFileWithFileProvider(File file, String mimetype) {
+		String ourPackage = mContext.getApplicationContext().getPackageName();
+		Uri uri = FileProvider.getUriForFile(mContext,  ourPackage + ".provider", file);
+		Intent intent = new Intent();
+		intent.setAction(Intent.ACTION_VIEW);
+		intent.setDataAndType(uri, mimetype);
+		intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			intent.addFlags(FLAG_GRANT_PREFIX_URI_PERMISSION);
+		}
+		//mContext.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+		Log.v(TAG, "Starting intent: " + intent);
+		mContext.startActivity(intent);
+	}
 	
 	private class ChecksumTask extends AsyncTask<String, Void, String> {
 		ProgressDialog prog;
@@ -316,12 +351,12 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 		}
 		
 		@Override
-		public void onProgressUpdate(long done, long total) {
+		public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
 			mAdapter.updateProgress(mHolder);
 		}
 
 		@Override
-		public void onFinish() {
+		public void onFinish(DownloadMission downloadMission) {
 			//mAdapter.mManager.deleteMission(mHolder.position);
 			// TODO Notification
 			//mAdapter.notifyDataSetChanged();
@@ -332,7 +367,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 		}
 
 		@Override
-		public void onError(int errCode) {
+		public void onError(DownloadMission downloadMission, int errCode) {
 			mAdapter.updateProgress(mHolder);
 		}
 		
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index d25f12d65..43b85a2b5 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -40,7 +40,7 @@ public abstract class MissionsFragment extends Fragment
 	private MissionAdapter mAdapter;
 	private GridLayoutManager mGridManager;
 	private LinearLayoutManager mLinearManager;
-	private Activity mActivity;
+	private Context mActivity;
 	
 	private ServiceConnection mConnection = new ServiceConnection() {
 
@@ -65,7 +65,7 @@ public abstract class MissionsFragment extends Fragment
 
 		mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
 		mLinear = mPrefs.getBoolean("linear", false);
-		
+
 		// Bind the service
 		Intent i = new Intent();
 		i.setClass(getActivity(), DownloadManagerService.class);
@@ -85,14 +85,15 @@ public abstract class MissionsFragment extends Fragment
 	}
 
 	@Override
-	public void onAttach(Activity activity) {
+	public void onAttach(Context activity) {
 		super.onAttach(activity);
 		mActivity = activity;
 	}
 
 	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-
+	public void onDestroyView() {
+		super.onDestroyView();
+		getActivity().unbindService(mConnection);
 	}
 
 	@Override
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 000000000..ffa74ab56
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="."/>
+</paths>
\ No newline at end of file
diff --git a/app/src/test/java/us/shandian/giga/get/get/DownloadManagerImplTest.java b/app/src/test/java/us/shandian/giga/get/get/DownloadManagerImplTest.java
new file mode 100644
index 000000000..8cef98cbe
--- /dev/null
+++ b/app/src/test/java/us/shandian/giga/get/get/DownloadManagerImplTest.java
@@ -0,0 +1,156 @@
+package us.shandian.giga.get.get;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+
+import us.shandian.giga.get.DownloadDataSource;
+import us.shandian.giga.get.DownloadManagerImpl;
+import us.shandian.giga.get.DownloadMission;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test for {@link DownloadManagerImpl}
+ *
+ * TODO: test loading from .giga files, startMission and improve tests
+ */
+public class DownloadManagerImplTest {
+
+    private DownloadManagerImpl downloadManager;
+    private DownloadDataSource dowloadDataSource;
+    private ArrayList<DownloadMission> missions;
+
+    @org.junit.Before
+    public void setUp() throws Exception {
+        dowloadDataSource = mock(DownloadDataSource.class);
+        missions = new ArrayList<>();
+        for(int i = 0; i < 50; ++i){
+            missions.add(generateFinishedDownloadMission());
+        }
+        when(dowloadDataSource.loadMissions()).thenReturn(new ArrayList<>(missions));
+        downloadManager = new DownloadManagerImpl(new ArrayList<String>(), dowloadDataSource);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testConstructorWithNullAsDownloadDataSource() {
+        new DownloadManagerImpl(new ArrayList<String>(), null);
+    }
+
+
+    private static DownloadMission generateFinishedDownloadMission() throws IOException {
+        File file = File.createTempFile("newpipetest", ".mp4");
+        file.deleteOnExit();
+        RandomAccessFile randomAccessFile = new RandomAccessFile(file, "rw");
+        randomAccessFile.setLength(1000);
+        randomAccessFile.close();
+        DownloadMission downloadMission = new DownloadMission(file.getName(),
+                "http://google.com/?q=how+to+google", file.getParent());
+        downloadMission.blocks = 1000;
+        downloadMission.done = 1000;
+        downloadMission.finished = true;
+        return spy(downloadMission);
+    }
+
+    private static void assertMissionEquals(String message, DownloadMission expected, DownloadMission actual) {
+        if(expected == actual) return;
+        assertEquals(message + ": Name", expected.name, actual.name);
+        assertEquals(message + ": Location", expected.location, actual.location);
+        assertEquals(message + ": Url", expected.url, actual.url);
+    }
+
+    @Test
+    public void testThatMissionsAreLoaded() throws IOException {
+        ArrayList<DownloadMission> missions = new ArrayList<>();
+        long millis = System.currentTimeMillis();
+        for(int i = 0; i < 50; ++i){
+            DownloadMission  mission = generateFinishedDownloadMission();
+            mission.timestamp = millis - i; // reverse order by timestamp
+            missions.add(mission);
+        }
+
+        dowloadDataSource = mock(DownloadDataSource.class);
+        when(dowloadDataSource.loadMissions()).thenReturn(new ArrayList<>(missions));
+        downloadManager = new DownloadManagerImpl(new ArrayList<String>(), dowloadDataSource);
+        verify(dowloadDataSource, times(1)).loadMissions();
+
+        assertEquals(50, downloadManager.getCount());
+
+        for(int i = 0; i < 50; ++i) {
+            assertMissionEquals("mission " + i, missions.get(50 - 1 - i), downloadManager.getMission(i));
+        }
+    }
+
+    @Ignore
+    @Test
+    public void startMission() throws Exception {
+        DownloadMission mission = missions.get(0);
+        mission = spy(mission);
+        missions.set(0, mission);
+        String url = "https://github.com/favicon.ico";
+        // create a temp file and delete it so we have a temp directory
+        File tempFile = File.createTempFile("favicon",".ico");
+        String name = tempFile.getName();
+        String location = tempFile.getParent();
+        assertTrue(tempFile.delete());
+        int id = downloadManager.startMission(url, location, name, true, 10);
+    }
+
+    @Test
+    public void resumeMission() throws Exception {
+        DownloadMission mission = missions.get(0);
+        mission.running = true;
+        verify(mission, never()).start();
+        downloadManager.resumeMission(0);
+        verify(mission, never()).start();
+        mission.running = false;
+        downloadManager.resumeMission(0);
+        verify(mission, times(1)).start();
+    }
+
+    @Test
+    public void pauseMission() throws Exception {
+        DownloadMission mission = missions.get(0);
+        mission.running = false;
+        downloadManager.pauseMission(0);
+        verify(mission, never()).pause();
+        mission.running = true;
+        downloadManager.pauseMission(0);
+        verify(mission, times(1)).pause();
+    }
+
+    @Test
+    public void deleteMission() throws Exception {
+        DownloadMission mission = missions.get(0);
+        assertEquals(mission, downloadManager.getMission(0));
+        downloadManager.deleteMission(0);
+        verify(mission, times(1)).delete();
+        assertNotEquals(mission, downloadManager.getMission(0));
+        assertEquals(49, downloadManager.getCount());
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void getMissionWithNegativeIndex() throws Exception {
+        downloadManager.getMission(-1);
+    }
+
+    @Test
+    public void getMission() throws Exception {
+        assertSame(missions.get(0), downloadManager.getMission(0));
+        assertSame(missions.get(1), downloadManager.getMission(1));
+    }
+
+}
\ No newline at end of file

From 2ded33110fe1fb11ac501d068b0e34f340446f93 Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Tue, 10 Jan 2017 21:10:41 +0100
Subject: [PATCH 09/30] Improve YoutubeStreamUrlIdHandler

 * Make it a singelton
 * Accept embed links
 * Accept share links (youtube.com/shared?ci=...)
 * Add tests
 * Accept host case insensititve
---
 .../services/youtube/YoutubeService.java      |   4 +-
 .../youtube/YoutubeStreamExtractor.java       |   2 +-
 .../youtube/YoutubeStreamUrlIdHandler.java    |  96 +++++++++++---
 .../StreamPreviewInfoCollector.java           |   3 +-
 .../YoutubeStreamUrlIdHandlerTest.java        | 119 ++++++++++++++++++
 5 files changed, 203 insertions(+), 21 deletions(-)
 create mode 100644 app/src/test/java/org/schabi/newpipe/extractor/services/youtube/youtube/YoutubeStreamUrlIdHandlerTest.java

diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
index b7cd33bc7..030878b03 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
@@ -46,7 +46,7 @@ public class YoutubeService extends StreamingService {
     @Override
     public StreamExtractor getExtractorInstance(String url)
             throws ExtractionException, IOException {
-        UrlIdHandler urlIdHandler = new YoutubeStreamUrlIdHandler();
+        UrlIdHandler urlIdHandler = YoutubeStreamUrlIdHandler.getInstance();
         if(urlIdHandler.acceptUrl(url)) {
             return new YoutubeStreamExtractor(urlIdHandler, url, getServiceId());
         }
@@ -61,7 +61,7 @@ public class YoutubeService extends StreamingService {
 
     @Override
     public UrlIdHandler getUrlIdHandlerInstance() {
-        return new YoutubeStreamUrlIdHandler();
+        return YoutubeStreamUrlIdHandler.getInstance();
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
index 5910a1efb..07a0e2ad9 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -184,7 +184,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     // cached values
     private static volatile String decryptionCode = "";
 
-    UrlIdHandler urlidhandler = new YoutubeStreamUrlIdHandler();
+    UrlIdHandler urlidhandler = YoutubeStreamUrlIdHandler.getInstance();
     String pageUrl = "";
 
     public YoutubeStreamExtractor(UrlIdHandler urlIdHandler, String pageUrl, int serviceId)
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java
index 2c3f76293..f2e7a0483 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java
@@ -1,12 +1,21 @@
 package org.schabi.newpipe.extractor.services.youtube;
 
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.Parser;
 import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLDecoder;
+import java.util.regex.Matcher;
 
 /**
  * Created by Christian Schabesberger on 02.02.16.
@@ -29,45 +38,55 @@ import java.net.URLDecoder;
  */
 
 public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
-    @SuppressWarnings("WeakerAccess")
+
+    private static final YoutubeStreamUrlIdHandler instance = new YoutubeStreamUrlIdHandler();
+    private static final String ID_PATTERN = "([\\-a-zA-Z0-9_]{11})";
+
+    private YoutubeStreamUrlIdHandler() {}
+
+    public static YoutubeStreamUrlIdHandler getInstance() {
+        return instance;
+    }
+
     @Override
     public String getUrl(String videoId) {
         return "https://www.youtube.com/watch?v=" + videoId;
     }
 
-    @SuppressWarnings("WeakerAccess")
     @Override
     public String getId(String url) throws ParsingException, IllegalArgumentException {
-        if(url.isEmpty())
-        {
+        if(url.isEmpty()) {
             throw new IllegalArgumentException("The url parameter should not be empty");
         }
-        String id;
 
-        if(url.contains("youtube")) {
-            if(url.contains("attribution_link")) {
+        String id;
+        String lowercaseUrl = url.toLowerCase();
+        if(lowercaseUrl.contains("youtube")) {
+            if (url.contains("attribution_link")) {
                 try {
                     String escapedQuery = Parser.matchGroup1("u=(.[^&|$]*)", url);
                     String query = URLDecoder.decode(escapedQuery, "UTF-8");
-                    id = Parser.matchGroup1("v=([\\-a-zA-Z0-9_]{11})", query);
-                } catch(UnsupportedEncodingException uee) {
+                    id = Parser.matchGroup1("v=" + ID_PATTERN, query);
+                } catch (UnsupportedEncodingException uee) {
                     throw new ParsingException("Could not parse attribution_link", uee);
                 }
-            }
-            else if(url.contains("vnd.youtube"))
-            {
-                id = Parser.matchGroup1("([\\-a-zA-Z0-9_]{11}).*", url);
+            } else if(lowercaseUrl.contains("youtube.com/shared?ci=")) {
+                return getRealIdFromSharedLink(url);
+            } else if (url.contains("vnd.youtube")) {
+                id = Parser.matchGroup1(ID_PATTERN, url);
+            } else if (url.contains("embed")) {
+                id = Parser.matchGroup1("embed/" + ID_PATTERN, url);
             } else if(url.contains("googleads")) {
                 throw new FoundAdException("Error found add: " + url);
             } else {
-                id = Parser.matchGroup1("[?&]v=([\\-a-zA-Z0-9_]{11})", url);
+                id = Parser.matchGroup1("[?&]v=" + ID_PATTERN, url);
             }
         }
-        else if(url.contains("youtu.be")) {
+        else if(lowercaseUrl.contains("youtu.be")) {
             if(url.contains("v=")) {
-                id = Parser.matchGroup1("v=([\\-a-zA-Z0-9_]{11})", url);
+                id = Parser.matchGroup1("v=" + ID_PATTERN, url);
             } else {
-                id = Parser.matchGroup1("youtu\\.be/([a-zA-Z0-9_-]{11})", url);
+                id = Parser.matchGroup1("[Yy][Oo][Uu][Tt][Uu]\\.[Bb][Ee]/" + ID_PATTERN, url);
             }
         }
         else {
@@ -82,12 +101,55 @@ public class YoutubeStreamUrlIdHandler implements UrlIdHandler {
         }
     }
 
+    /**
+     * Get the real url from a shared uri.
+     *
+     * Shared URI's look like this:
+     * <pre>
+     *     * https://www.youtube.com/shared?ci=PJICrTByb3E
+     *     * vnd.youtube://www.youtube.com/shared?ci=PJICrTByb3E&feature=twitter-deep-link
+     * </pre>
+     * @param url The shared url
+     * @return the id of the stream
+     * @throws ParsingException
+     */
+    private @NonNull String getRealIdFromSharedLink(String url) throws ParsingException {
+        URI uri;
+        try {
+            uri = new URI(url);
+        } catch (URISyntaxException e) {
+            throw new ParsingException("Invalid shared link", e);
+        }
+        String sharedId = getSharedId(uri);
+        Downloader downloader = NewPipe.getDownloader();
+        String content;
+        try {
+            content = downloader.download("https://www.youtube.com/shared?ci=" + sharedId);
+        } catch (IOException | ReCaptchaException e) {
+            throw new ParsingException("Unable to resolve shared link", e);
+        }
+        // is this bad? is this fragile?:
+        String realId = Parser.matchGroup1("rel=\"shortlink\" href=\"https://youtu.be/" + ID_PATTERN, content);
+        if(sharedId.equals(realId)) {
+            throw new ParsingException("Got same id for as shared id: " + sharedId);
+        }
+        return realId;
+    }
+
+    private @NonNull String getSharedId(URI uri) throws ParsingException {
+        if (!"/shared".equals(uri.getPath())) {
+            throw new ParsingException("Not a shared link: " + uri.toString() + " (path != " + uri.getPath() + ")");
+        }
+        return Parser.matchGroup1("ci=" + ID_PATTERN, uri.getQuery());
+    }
+
     public String cleanUrl(String complexUrl) throws ParsingException {
         return getUrl(getId(complexUrl));
     }
 
     @Override
     public boolean acceptUrl(String videoUrl) {
+        videoUrl = videoUrl.toLowerCase();
         return videoUrl.contains("youtube") ||
                 videoUrl.contains("youtu.be");
     }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfoCollector.java b/app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfoCollector.java
index ea978f730..20120fa2d 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfoCollector.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/stream_info/StreamPreviewInfoCollector.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe.extractor.stream_info;
 
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -60,7 +61,7 @@ public class StreamPreviewInfoCollector {
             if (urlIdHandler == null) {
                 throw new ParsingException("Error: UrlIdHandler not set");
             } else if(!resultItem.webpage_url.isEmpty()) {
-                resultItem.id = (new YoutubeStreamUrlIdHandler()).getId(resultItem.webpage_url);
+                resultItem.id = NewPipe.getService(serviceId).getUrlIdHandlerInstance().getId(resultItem.webpage_url);
             }
             resultItem.title = extractor.getTitle();
             resultItem.stream_type = extractor.getStreamType();
diff --git a/app/src/test/java/org/schabi/newpipe/extractor/services/youtube/youtube/YoutubeStreamUrlIdHandlerTest.java b/app/src/test/java/org/schabi/newpipe/extractor/services/youtube/youtube/YoutubeStreamUrlIdHandlerTest.java
new file mode 100644
index 000000000..79bb5d88e
--- /dev/null
+++ b/app/src/test/java/org/schabi/newpipe/extractor/services/youtube/youtube/YoutubeStreamUrlIdHandlerTest.java
@@ -0,0 +1,119 @@
+package org.schabi.newpipe.extractor.services.youtube.youtube;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.schabi.newpipe.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.FoundAdException;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamUrlIdHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test for {@link YoutubeStreamUrlIdHandler}
+ */
+public class YoutubeStreamUrlIdHandlerTest {
+    private static String AD_URL = "https://googleads.g.doubleclick.net/aclk?sa=l&ai=C-2IPgeVTWPf4GcOStgfOnIOADf78n61GvKmmobYDrgIQASDj-5MDKAJg9ZXOgeAEoAGgy_T-A8gBAakC2gkpmquIsT6oAwGqBJMBT9BgD5kVgbN0dX602bFFaDw9vsxq-We-S8VkrXVBi6W_e7brZ36GCz1WO3EPEeklYuJjXLUowwCOKsd-8xr1UlS_tusuFJv9iX35xoBHKTRvs8-0aDbfEIm6in37QDfFuZjqgEMB8-tg0Jn_Pf1RU5OzbuU40B4Gy25NUTnOxhDKthOhKBUSZEksCEerUV8GMu10iAXCxquwApIFBggDEAEYAaAGGsgGlIjthrUDgAfItIsBqAemvhvYBwHSCAUIgGEQAbgT6AE&num=1&sig=AOD64_1DybDd4qAm5O7o9UAbTNRdqXXHFQ&ctype=21&video_id=dMO_IXYPZew&client=ca-pub-6219811747049371&adurl=http://www.youtube.com/watch%3Fv%3DdMO_IXYPZew";
+    private YoutubeStreamUrlIdHandler urlIdHandler;
+
+    @Before
+    public void setUp() throws Exception {
+        urlIdHandler = YoutubeStreamUrlIdHandler.getInstance();
+        NewPipe.init(Downloader.getInstance());
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void getIdWithNullAsUrl() throws ParsingException {
+        urlIdHandler.getId(null);
+    }
+
+    @Test(expected = FoundAdException.class)
+    public void getIdForAd() throws ParsingException {
+        urlIdHandler.getId(AD_URL);
+    }
+
+    @Test
+    public void getIdForInvalidUrls() throws ParsingException {
+        List<String> invalidUrls = new ArrayList<>(50);
+        invalidUrls.add("https://www.youtube.com/watch?v=jZViOEv90d");
+        invalidUrls.add("https://www.youtube.com/watchjZViOEv90d");
+        invalidUrls.add("https://www.youtube.com/");
+        for(String invalidUrl: invalidUrls) {
+            Throwable exception = null;
+            try {
+                urlIdHandler.getId(invalidUrl);
+            } catch (ParsingException e) {
+                exception = e;
+            }
+            if(exception == null) {
+                fail("Expected ParsingException for url: " + invalidUrl);
+            }
+        }
+    }
+    @Test
+    public void getId() throws Exception {
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://www.youtube.com/watch?v=jZViOEv90dI"));
+        assertEquals("W-fFHeTX70Q", urlIdHandler.getId("https://www.youtube.com/watch?v=W-fFHeTX70Q"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://www.youtube.com/watch?v=jZViOEv90dI?t=100"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://WWW.YouTube.com/watch?v=jZViOEv90dI?t=100"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("HTTPS://www.youtube.com/watch?v=jZViOEv90dI?t=100"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://youtu.be/jZViOEv90dI?t=9s"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("HTTPS://Youtu.be/jZViOEv90dI?t=9s"));
+        assertEquals("uEJuoEs1UxY", urlIdHandler.getId("http://www.youtube.com/watch_popup?v=uEJuoEs1UxY"));
+        assertEquals("uEJuoEs1UxY", urlIdHandler.getId("http://www.Youtube.com/watch_popup?v=uEJuoEs1UxY"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://www.youtube.com/embed/jZViOEv90dI"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("https://www.youtube-nocookie.com/embed/jZViOEv90dI"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://www.youtube.com/watch?v=jZViOEv90dI"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://youtube.com/watch?v=jZViOEv90dI"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://youtu.be/jZViOEv90dI?t=9s"));
+        assertEquals("7_WWz2DSnT8", urlIdHandler.getId("https://youtu.be/7_WWz2DSnT8"));
+        assertEquals("oy6NvWeVruY", urlIdHandler.getId("https://m.youtube.com/watch?v=oy6NvWeVruY"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://www.youtube.com/embed/jZViOEv90dI"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://www.Youtube.com/embed/jZViOEv90dI"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("http://www.youtube-nocookie.com/embed/jZViOEv90dI"));
+        assertEquals("EhxJLojIE_o", urlIdHandler.getId("http://www.youtube.com/attribution_link?a=JdfC0C9V6ZI&u=%2Fwatch%3Fv%3DEhxJLojIE_o%26feature%3Dshare"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("vnd.youtube://www.youtube.com/watch?v=jZViOEv90dI"));
+        assertEquals("jZViOEv90dI", urlIdHandler.getId("vnd.youtube:jZViOEv90dI"));
+
+        // Shared links
+        String sharedId = "7JIArTByb3E";
+        String realId = "Q7JsK50NGaA";
+        assertEquals(realId, urlIdHandler.getId("vnd.youtube://www.YouTube.com/shared?ci=" + sharedId + "&feature=twitter-deep-link"));
+        assertEquals(realId, urlIdHandler.getId("vnd.youtube://www.youtube.com/shared?ci=" + sharedId ));
+        assertEquals(realId, urlIdHandler.getId("https://www.youtube.com/shared?ci=7JIArTByb3E"));
+
+    }
+
+
+    @Test
+    public void testAcceptUrl() {
+        assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/watch?v=jZViOEv90dI"));
+        assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/watch?v=jZViOEv90dI?t=100"));
+        assertTrue(urlIdHandler.acceptUrl("https://WWW.YouTube.com/watch?v=jZViOEv90dI?t=100"));
+        assertTrue(urlIdHandler.acceptUrl("HTTPS://www.youtube.com/watch?v=jZViOEv90dI?t=100"));
+        assertTrue(urlIdHandler.acceptUrl("https://youtu.be/jZViOEv90dI?t=9s"));
+        //assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/watch/jZViOEv90dI"));
+        assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/embed/jZViOEv90dI"));
+        assertTrue(urlIdHandler.acceptUrl("https://www.youtube-nocookie.com/embed/jZViOEv90dI"));
+        assertTrue(urlIdHandler.acceptUrl("http://www.youtube.com/watch?v=jZViOEv90dI"));
+        assertTrue(urlIdHandler.acceptUrl("http://youtu.be/jZViOEv90dI?t=9s"));
+        assertTrue(urlIdHandler.acceptUrl("http://www.youtube.com/embed/jZViOEv90dI"));
+        assertTrue(urlIdHandler.acceptUrl("http://www.youtube-nocookie.com/embed/jZViOEv90dI"));
+        assertTrue(urlIdHandler.acceptUrl("http://www.youtube.com/attribution_link?a=JdfC0C9V6ZI&u=%2Fwatch%3Fv%3DEhxJLojIE_o%26feature%3Dshare"));
+        assertTrue(urlIdHandler.acceptUrl("vnd.youtube://www.youtube.com/watch?v=jZViOEv90dI"));
+        assertTrue(urlIdHandler.acceptUrl("vnd.youtube:jZViOEv90dI"));
+
+        assertTrue(urlIdHandler.acceptUrl("vnd.youtube:jZViOEv90dI"));
+
+        String sharedId = "7JIArTByb3E";
+        assertTrue(urlIdHandler.acceptUrl("vnd.youtube://www.youtube.com/shared?ci=" + sharedId + "&feature=twitter-deep-link"));
+        assertTrue(urlIdHandler.acceptUrl("vnd.youtube://www.youtube.com/shared?ci=" + sharedId ));
+        assertTrue(urlIdHandler.acceptUrl("https://www.youtube.com/shared?ci=7JIArTByb3E"));
+    }
+}
\ No newline at end of file

From 7efd111d9c26ac2c91ccd48c77dd184d5646134f Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Wed, 11 Jan 2017 11:06:24 +0100
Subject: [PATCH 10/30] Improve Search fragment

 * Keep search query when fragment is restored
 * Simplify SuggestionListAdapter
   * Use ResourceCursorAdapter for view creation
 * Fix deprecation warning
 * Some clean code
---
 .../extractor/search/SearchEngine.java        |  2 -
 .../services/youtube/YoutubeSearchEngine.java |  6 +-
 .../newpipe/info_list/InfoItemHolder.java     |  6 +-
 .../newpipe/info_list/InfoListAdapter.java    |  7 +-
 .../SearchInfoItemFragment.java               | 91 ++++++++++++-------
 .../SearchSuggestionListener.java             |  4 +-
 .../newpipe/search_fragment/SearchWorker.java |  6 +-
 .../SuggestionListAdapter.java                | 62 +++++++------
 .../SuggestionSearchRunnable.java             | 17 ++--
 app/src/main/res/layout/activity_main.xml     |  2 -
 .../res/layout/fragment_searchinfoitem.xml    |  2 +
 11 files changed, 116 insertions(+), 89 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java
index f6e0434a6..b0dfbfc8a 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java
@@ -4,7 +4,6 @@ import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 
 import java.io.IOException;
-import java.util.List;
 
 /**
  * Created by Christian Schabesberger on 10.08.15.
@@ -26,7 +25,6 @@ import java.util.List;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@SuppressWarnings("ALL")
 public abstract class SearchEngine {
     public static class NothingFoundException extends ExtractionException {
         public NothingFoundException(String message) {
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
index ab815d9a1..55e05bb76 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
@@ -85,18 +85,18 @@ public class YoutubeSearchEngine extends SearchEngine {
             Element el;
 
             // both types of spell correction item
-            if (!((el = item.select("div[class*=\"spell-correction\"]").first()) == null)) {
+            if ((el = item.select("div[class*=\"spell-correction\"]").first()) != null) {
                 collector.setSuggestion(el.select("a").first().text());
                 if(list.children().size() == 1) {
                     throw new NothingFoundException("Did you mean: " + el.select("a").first().text());
                 }
                 // search message item
-            } else if (!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
+            } else if ((el = item.select("div[class*=\"search-message\"]").first()) != null) {
                 //result.errorMessage = el.text();
                 throw new NothingFoundException(el.text());
 
                 // video item type
-            } else if (!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
+            } else if ((el = item.select("div[class*=\"yt-lockup-video\"").first()) != null) {
                 collector.commit(extractPreviewInfo(el));
             } else {
                 //noinspection ConstantConditions
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
index dbba4ac5f..2428332ae 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
@@ -30,13 +30,13 @@ import org.schabi.newpipe.R;
 
 public class InfoItemHolder extends RecyclerView.ViewHolder {
 
-    public ImageView itemThumbnailView;
-    public TextView itemVideoTitleView,
+    public final ImageView itemThumbnailView;
+    public final TextView itemVideoTitleView,
             itemUploaderView,
             itemDurationView,
             itemUploadDateView,
             itemViewCountView;
-    public Button itemButton;
+    public final Button itemButton;
 
     public InfoItemHolder(View v) {
         super(v);
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index 30d3803ac..cc5a0f4bb 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -34,11 +34,12 @@ import java.util.Vector;
 
 public class InfoListAdapter extends RecyclerView.Adapter<InfoItemHolder> {
 
-    InfoItemBuilder infoItemBuilder = null;
-    List<StreamPreviewInfo> streamList = new Vector<>();
+    private final InfoItemBuilder infoItemBuilder;
+    private final List<StreamPreviewInfo> streamList;
 
     public InfoListAdapter(Activity a, View rootView) {
         infoItemBuilder = new InfoItemBuilder(a, rootView);
+        streamList = new Vector<>();
     }
 
     public void setOnItemSelectedListener
@@ -54,7 +55,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<InfoItemHolder> {
     }
 
     public void clearSteamItemList() {
-        streamList = new Vector<>();
+        streamList.clear();
         notifyDataSetChanged();
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
index 57b63c209..2afe149a8 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
@@ -56,13 +56,15 @@ public class SearchInfoItemFragment extends Fragment {
 
     private static final String TAG = SearchInfoItemFragment.class.toString();
 
+    /**
+     * Listener for search queries
+     */
     public class SearchQueryListener implements SearchView.OnQueryTextListener {
 
         @Override
         public boolean onQueryTextSubmit(String query) {
             Activity a = getActivity();
             try {
-                searchQuery = query;
                 search(query);
 
                 // hide virtual keyboard
@@ -89,8 +91,6 @@ public class SearchInfoItemFragment extends Fragment {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            View bg = a.findViewById(R.id.mainBG);
-            bg.setVisibility(View.GONE);
             return true;
         }
 
@@ -108,12 +108,10 @@ public class SearchInfoItemFragment extends Fragment {
     private boolean isLoading = false;
 
     private ProgressBar loadingIndicator = null;
-    private SearchView searchView = null;
     private int pageNumber = 0;
     private SuggestionListAdapter suggestionListAdapter = null;
     private InfoListAdapter infoListAdapter = null;
     private LinearLayoutManager streamInfoListLayoutManager = null;
-    private RecyclerView recyclerView = null;
 
     // savedInstanceBundle arguments
     private static final String QUERY = "query";
@@ -126,23 +124,32 @@ public class SearchInfoItemFragment extends Fragment {
     public SearchInfoItemFragment() {
     }
 
-    // TODO: Customize parameter initialization
     @SuppressWarnings("unused")
-    public static SearchInfoItemFragment newInstance(int columnCount) {
+    public static SearchInfoItemFragment newInstance(int streamingServiceId, String searchQuery) {
+        Bundle args = new Bundle();
+        args.putInt(STREAMING_SERVICE, streamingServiceId);
+        args.putString(QUERY, searchQuery);
         SearchInfoItemFragment fragment = new SearchInfoItemFragment();
+        fragment.setArguments(args);
         return fragment;
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        searchQuery = "";
         if (savedInstanceState != null) {
             searchQuery = savedInstanceState.getString(QUERY);
             streamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
         } else {
             try {
-                streamingServiceId = NewPipe.getIdOfService("Youtube");
+                Bundle args = getArguments();
+                if(args != null) {
+                    searchQuery = args.getString(QUERY);
+                    streamingServiceId = args.getInt(STREAMING_SERVICE);
+                } else {
+                    streamingServiceId = NewPipe.getIdOfService("Youtube");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 ErrorActivity.reportError(getActivity(), e, null,
@@ -158,8 +165,7 @@ public class SearchInfoItemFragment extends Fragment {
             @Override
             public void onResult(SearchResult result) {
                 infoListAdapter.addStreamItemList(result.resultList);
-                isLoading = false;
-                loadingIndicator.setVisibility(View.GONE);
+                setDoneLoading();
             }
 
             @Override
@@ -167,8 +173,7 @@ public class SearchInfoItemFragment extends Fragment {
                 //setListShown(true);
                 Toast.makeText(getActivity(), getString(stringResource),
                         Toast.LENGTH_SHORT).show();
-                isLoading = false;
-                loadingIndicator.setVisibility(View.GONE);
+                setDoneLoading();
             }
 
             @Override
@@ -176,8 +181,7 @@ public class SearchInfoItemFragment extends Fragment {
                 //setListShown(true);
                 Toast.makeText(getActivity(), message,
                         Toast.LENGTH_LONG).show();
-                isLoading = false;
-                loadingIndicator.setVisibility(View.GONE);
+                setDoneLoading();
             }
 
             @Override
@@ -191,6 +195,7 @@ public class SearchInfoItemFragment extends Fragment {
                         RECAPTCHA_REQUEST);
             }
         });
+
     }
 
     @Override
@@ -200,7 +205,7 @@ public class SearchInfoItemFragment extends Fragment {
 
         Context context = view.getContext();
         loadingIndicator = (ProgressBar) view.findViewById(R.id.progressBar);
-        recyclerView = (RecyclerView) view.findViewById(R.id.list);
+        RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.list);
         streamInfoListLayoutManager = new LinearLayoutManager(context);
         recyclerView.setLayoutManager(streamInfoListLayoutManager);
 
@@ -209,15 +214,12 @@ public class SearchInfoItemFragment extends Fragment {
         infoListAdapter.setOnItemSelectedListener(new InfoItemBuilder.OnItemSelectedListener() {
             @Override
             public void selected(String url) {
-                Intent i = new Intent(getActivity(), VideoItemDetailActivity.class);
-                i.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
-                i.putExtra(VideoItemDetailFragment.VIDEO_URL, url);
-                getActivity().startActivity(i);
+                startDetailActivity(url);
             }
         });
         recyclerView.setAdapter(infoListAdapter);
-
-        recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
+        recyclerView.clearOnScrollListeners();
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                 int pastVisiblesItems, visibleItemCount, totalItemCount;
@@ -239,14 +241,26 @@ public class SearchInfoItemFragment extends Fragment {
         return view;
     }
 
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
+    private void startDetailActivity(String url) {
+        Intent i = new Intent(getActivity(), VideoItemDetailActivity.class);
+        i.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, streamingServiceId);
+        i.putExtra(VideoItemDetailFragment.VIDEO_URL, url);
+        getActivity().startActivity(i);
     }
 
     @Override
-    public void onDetach() {
-        super.onDetach();
+    public void onStart() {
+        super.onStart();
+        if(!searchQuery.isEmpty()) {
+            search(searchQuery);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(QUERY, searchQuery);
+        outState.putInt(STREAMING_SERVICE, streamingServiceId);
     }
 
     @Override
@@ -255,15 +269,10 @@ public class SearchInfoItemFragment extends Fragment {
         inflater.inflate(R.menu.search_menu, menu);
 
         MenuItem searchItem = menu.findItem(R.id.action_search);
-        searchView = (SearchView) searchItem.getActionView();
+        SearchView searchView = (SearchView) searchItem.getActionView();
         setupSearchView(searchView);
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        return super.onOptionsItemSelected(item);
-    }
-
     private void setupSearchView(SearchView searchView) {
         suggestionListAdapter = new SuggestionListAdapter(getActivity());
         searchView.setSuggestionsAdapter(suggestionListAdapter);
@@ -278,7 +287,9 @@ public class SearchInfoItemFragment extends Fragment {
     private void search(String query) {
         infoListAdapter.clearSteamItemList();
         pageNumber = 0;
+        searchQuery = query;
         search(query, pageNumber);
+        hideBackground();
         loadingIndicator.setVisibility(View.VISIBLE);
     }
 
@@ -288,6 +299,20 @@ public class SearchInfoItemFragment extends Fragment {
         sw.search(streamingServiceId, query, page, getActivity());
     }
 
+    private void setDoneLoading() {
+        this.isLoading = false;
+        loadingIndicator.setVisibility(View.GONE);
+    }
+
+    /**
+     * Hides the "dummy" background when no results are shown
+     */
+    private void hideBackground() {
+        View view = getView();
+        if(view == null) return;
+        view.findViewById(R.id.mainBG).setVisibility(View.GONE);
+    }
+
     private void searchSuggestions(String query) {
         SuggestionSearchRunnable suggestionSearchRunnable =
                 new SuggestionSearchRunnable(streamingServiceId, query, getActivity(), suggestionListAdapter);
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchSuggestionListener.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchSuggestionListener.java
index df6aacd6b..a3d3c0e9b 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchSuggestionListener.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchSuggestionListener.java
@@ -25,8 +25,8 @@ import android.support.v7.widget.SearchView;
 
 public class SearchSuggestionListener implements SearchView.OnSuggestionListener{
 
-    private SearchView searchView;
-    private SuggestionListAdapter adapter;
+    private final SearchView searchView;
+    private final SuggestionListAdapter adapter;
 
     public SearchSuggestionListener(SearchView searchView, SuggestionListAdapter adapter) {
         this.searchView = searchView;
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
index 6156d356d..9b1e8d86e 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchWorker.java
@@ -82,6 +82,7 @@ public class SearchWorker {
         }
         @Override
         public void run() {
+            final String serviceName = NewPipe.getNameOfService(serviceId);
             SearchResult result = null;
             SearchEngine engine = null;
 
@@ -119,7 +120,7 @@ public class SearchWorker {
                     View rootView = a.findViewById(android.R.id.content);
                     ErrorActivity.reportError(h, a, result.errors, null, rootView,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                        /* todo: this shoudl not be assigned static */  YOUTUBE, query, R.string.light_parsing_error));
+                            serviceName, query, R.string.light_parsing_error));
 
                 }
                 // hard errors:
@@ -148,8 +149,7 @@ public class SearchWorker {
             } catch(ExtractionException e) {
                 ErrorActivity.reportError(h, a, e, null, null,
                         ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                        /* todo: this shoudl not be assigned static */
-                                YOUTUBE, query, R.string.parsing_error));
+                                serviceName, query, R.string.parsing_error));
                 //postNewErrorToast(h, R.string.parsing_error);
                 e.printStackTrace();
 
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionListAdapter.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionListAdapter.java
index dc085f685..c37a71895 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionListAdapter.java
@@ -3,10 +3,8 @@ package org.schabi.newpipe.search_fragment;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.support.v4.widget.CursorAdapter;
-import android.view.LayoutInflater;
+import android.support.v4.widget.ResourceCursorAdapter;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.TextView;
 
 import java.util.List;
@@ -31,52 +29,56 @@ import java.util.List;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class SuggestionListAdapter extends CursorAdapter {
+/**
+ * {@link ResourceCursorAdapter} to display suggestions.
+ */
+public class SuggestionListAdapter extends ResourceCursorAdapter {
+
+    private static final String[] columns = new String[]{"_id", "title"};
+    private static final int INDEX_ID = 0;
+    private static final int INDEX_TITLE = 1;
 
-    private String[] columns = new String[]{"_id", "title"};
 
     public SuggestionListAdapter(Context context) {
-        super(context, null, false);
-    }
-
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        ViewHolder viewHolder;
-
-        View view = LayoutInflater.from(context).inflate(android.R.layout.simple_list_item_1, parent, false);
-        viewHolder = new ViewHolder();
-        viewHolder.suggestionTitle = (TextView) view.findViewById(android.R.id.text1);
-        view.setTag(viewHolder);
-
-
-        return view;
+        super(context, android.R.layout.simple_list_item_1, null, 0);
     }
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
-        ViewHolder viewHolder = (ViewHolder) view.getTag();
-        viewHolder.suggestionTitle.setText(cursor.getString(1));
+        ViewHolder viewHolder = new ViewHolder(view);
+        viewHolder.suggestionTitle.setText(cursor.getString(INDEX_TITLE));
     }
 
-
+    /**
+     * Update the suggestion list
+     * @param suggestions the list of suggestions
+     */
     public void updateAdapter(List<String> suggestions) {
-        MatrixCursor cursor = new MatrixCursor(columns);
+        MatrixCursor cursor = new MatrixCursor(columns, suggestions.size());
         int i = 0;
-        for (String s : suggestions) {
-            String[] temp = new String[2];
-            temp[0] = Integer.toString(i);
-            temp[1] = s;
+        for (String suggestion : suggestions) {
+            String[] columnValues = new String[columns.length];
+            columnValues[INDEX_TITLE] = suggestion;
+            columnValues[INDEX_ID] = Integer.toString(i);
+            cursor.addRow(columnValues);
             i++;
-            cursor.addRow(temp);
         }
         changeCursor(cursor);
     }
 
+    /**
+     * Get the suggestion for a position
+     * @param position the position of the suggestion
+     * @return the suggestion
+     */
     public String getSuggestion(int position) {
-        return ((Cursor) getItem(position)).getString(1);
+        return ((Cursor) getItem(position)).getString(INDEX_TITLE);
     }
 
     private class ViewHolder {
-        public TextView suggestionTitle;
+        private final TextView suggestionTitle;
+        private ViewHolder(View view) {
+            this.suggestionTitle = (TextView) view.findViewById(android.R.id.text1);
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java
index ed090d230..0110052ec 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SuggestionSearchRunnable.java
@@ -37,14 +37,15 @@ import java.util.List;
 
 public class SuggestionSearchRunnable implements Runnable{
 
+    /**
+     * Runnable to update a {@link SuggestionListAdapter}
+     */
     private class SuggestionResultRunnable implements Runnable{
 
-        private List<String> suggestions;
-        private SuggestionListAdapter adapter;
+        private final List<String> suggestions;
 
-        private SuggestionResultRunnable(List<String> suggestions, SuggestionListAdapter adapter) {
+        private SuggestionResultRunnable(List<String> suggestions) {
             this.suggestions = suggestions;
-            this.adapter = adapter;
         }
 
         @Override
@@ -55,9 +56,9 @@ public class SuggestionSearchRunnable implements Runnable{
 
     private final int serviceId;
     private final String query;
-    final Handler h = new Handler();
-    private Activity a = null;
-    private SuggestionListAdapter adapter;
+    private final Handler h = new Handler();
+    private final Activity a;
+    private final SuggestionListAdapter adapter;
     public SuggestionSearchRunnable(int serviceId, String query,
                                      Activity activity, SuggestionListAdapter adapter) {
         this.serviceId = serviceId;
@@ -76,7 +77,7 @@ public class SuggestionSearchRunnable implements Runnable{
             String searchLanguage = sp.getString(searchLanguageKey,
                     a.getString(R.string.default_language_value));
             List<String> suggestions = se.suggestionList(query, searchLanguage);
-            h.post(new SuggestionResultRunnable(suggestions, adapter));
+            h.post(new SuggestionResultRunnable(suggestions));
         } catch (ExtractionException e) {
             ErrorActivity.reportError(h, a, e, null, a.findViewById(android.R.id.content),
                     ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f35477c49..31c1c587a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,8 +6,6 @@
     tools:context="org.schabi.newpipe.MainActivity"
     android:orientation="vertical">
 
-    <include layout="@layout/main_bg" />
-
     <fragment
         android:id="@+id/search_fragment"
         android:name="org.schabi.newpipe.search_fragment.SearchInfoItemFragment"
diff --git a/app/src/main/res/layout/fragment_searchinfoitem.xml b/app/src/main/res/layout/fragment_searchinfoitem.xml
index 50b8e7f17..7f81e0b46 100644
--- a/app/src/main/res/layout/fragment_searchinfoitem.xml
+++ b/app/src/main/res/layout/fragment_searchinfoitem.xml
@@ -7,6 +7,8 @@
     android:name="org.schabi.newpipe.SearchInfoItemFragment"
     tools:context=".search_fragment.SearchInfoItemFragment">
 
+    <include layout="@layout/main_bg" />
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"

From 68e80e60543a6a2719caa1c9ab6c91953819dd01 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Fri, 30 Dec 2016 00:49:39 +0530
Subject: [PATCH 11/30] Added dark theme

---
 app/src/main/java/org/schabi/newpipe/App.java  |  1 +
 .../org/schabi/newpipe/ChannelActivity.java    |  8 +++++++-
 .../java/org/schabi/newpipe/MainActivity.java  |  9 ++++++++-
 .../detail/VideoItemDetailActivity.java        |  3 ++-
 .../newpipe/download/DownloadActivity.java     |  6 +++---
 .../newpipe/info_list/InfoItemHolder.java      |  2 ++
 .../schabi/newpipe/report/ErrorActivity.java   |  3 ++-
 .../newpipe/settings/SettingsActivity.java     |  7 +++++++
 .../newpipe/settings/SettingsFragment.java     | 18 +++++++++++++++---
 .../layout-v18/fragment_videoitem_detail.xml   |  2 +-
 .../res/layout/fragment_videoitem_detail.xml   |  3 ++-
 app/src/main/res/values-v21/styles.xml         | 10 ++++++++++
 app/src/main/res/values/styles.xml             | 15 +++++++++++++++
 app/src/main/res/xml/settings.xml              |  2 --
 14 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index f9b95c457..cb4dce3ea 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -48,6 +48,7 @@ public class App extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+
         // init crashreport
         try {
             final ACRAConfiguration acraConfig = new ConfigurationBuilder(this)
diff --git a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
index 83936475c..c8beb31f1 100644
--- a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
@@ -31,6 +32,7 @@ import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.report.ErrorActivity;
 
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
@@ -71,6 +73,10 @@ public class ChannelActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", "1"), "0")) {
+            setTheme(R.style.DarkTheme_NoActionBar);
+        }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_channel);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -128,7 +134,7 @@ public class ChannelActivity extends AppCompatActivity {
         CollapsingToolbarLayout ctl = (CollapsingToolbarLayout) findViewById(R.id.channel_toolbar_layout);
         ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar);
         ImageView channelBanner = (ImageView) findViewById(R.id.channel_banner_image);
-        FloatingActionButton feedButton = (FloatingActionButton) findViewById(R.id.channel_rss_fab);
+        final FloatingActionButton feedButton = (FloatingActionButton) findViewById(R.id.channel_rss_fab);
         ImageView avatarView = (ImageView) findViewById(R.id.channel_avatar_view);
         ImageView haloView = (ImageView) findViewById(R.id.channel_avatar_halo);
 
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index bfeb74287..2e94443f9 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -1,7 +1,9 @@
 package org.schabi.newpipe;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.media.AudioManager;
+import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
@@ -9,9 +11,14 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.Toast;
 
+import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.settings.SettingsActivity;
 
+import java.util.Objects;
+import java.util.prefs.Preferences;
+
 /**
  * Created by Christian Schabesberger on 02.08.16.
  *
@@ -32,7 +39,7 @@ import org.schabi.newpipe.settings.SettingsActivity;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends Themer {
 
     private Fragment mainFragment = null;
 
diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
index 256547004..05895fef4 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
@@ -14,6 +14,7 @@ import android.widget.Toast;
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.Themer;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 
@@ -39,7 +40,7 @@ import java.util.HashSet;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class VideoItemDetailActivity extends AppCompatActivity {
+public class VideoItemDetailActivity extends Themer {
 
     /**
      * Removes invisible separators (\p{Z}) and punctuation characters including
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index a7e52c486..98e4eddd7 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -13,7 +13,6 @@ import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -28,8 +27,9 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.Themer;
+import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.settings.SettingsActivity;
 
 import java.io.File;
@@ -42,7 +42,7 @@ import us.shandian.giga.ui.fragment.MissionsFragment;
 import us.shandian.giga.util.CrashHandler;
 import us.shandian.giga.util.Utility;
 
-public class DownloadActivity extends AppCompatActivity implements AdapterView.OnItemClickListener{
+public class DownloadActivity extends Themer implements AdapterView.OnItemClickListener{
 
     public static final String INTENT_DOWNLOAD = "us.shandian.giga.intent.DOWNLOAD";
 
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
index dbba4ac5f..a2b000e2b 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
@@ -36,6 +36,7 @@ public class InfoItemHolder extends RecyclerView.ViewHolder {
             itemDurationView,
             itemUploadDateView,
             itemViewCountView;
+
     public Button itemButton;
 
     public InfoItemHolder(View v) {
@@ -48,4 +49,5 @@ public class InfoItemHolder extends RecyclerView.ViewHolder {
         itemViewCountView = (TextView) v.findViewById(R.id.itemViewCountView);
         itemButton = (Button) v.findViewById(R.id.item_button);
     }
+
 }
diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index 8ebb9b155..b87fa8af8 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -35,6 +35,7 @@ import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.Themer;
 import org.schabi.newpipe.extractor.Parser;
 
 import java.io.PrintWriter;
@@ -65,7 +66,7 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ErrorActivity extends AppCompatActivity {
+public class ErrorActivity extends Themer {
     public static class ErrorInfo implements Parcelable {
         public int userAction;
         public String request;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index e62f90c45..9ca0490d4 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
@@ -16,6 +17,8 @@ import android.view.ViewGroup;
 
 import org.schabi.newpipe.R;
 
+import java.util.Objects;
+
 
 /**
  * Created by Christian Schabesberger on 31.08.15.
@@ -43,6 +46,10 @@ public class SettingsActivity extends PreferenceActivity  {
 
     @Override
     protected void onCreate(Bundle savedInstanceBundle) {
+        if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", "1"), "0")) {
+            setTheme(R.style.DarkTheme);
+        }
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceBundle);
         super.onCreate(savedInstanceBundle);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
index a5521dfc5..c9c7fe134 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.settings;
 
 import android.app.Activity;
+import android.app.ListActivity;
 import android.content.ClipData;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -55,6 +56,7 @@ public class SettingsFragment  extends PreferenceFragment
     String DOWNLOAD_PATH_PREFERENCE;
     String DOWNLOAD_PATH_AUDIO_PREFERENCE;
     String USE_TOR_KEY;
+    String THEME;
 
     public static final int REQUEST_INSTALL_ORBOT = 0x1234;
 
@@ -63,11 +65,12 @@ public class SettingsFragment  extends PreferenceFragment
     private ListPreference searchLanguagePreference;
     private Preference downloadPathPreference;
     private Preference downloadPathAudioPreference;
+    private Preference themePreference;
     private SharedPreferences defaultPreferences;
 
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.settings);
 
@@ -81,6 +84,7 @@ public class SettingsFragment  extends PreferenceFragment
         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);
+        THEME = getString(R.string.theme_key);
         USE_TOR_KEY = getString(R.string.use_tor_key);
 
         // get pref objects
@@ -92,6 +96,7 @@ public class SettingsFragment  extends PreferenceFragment
                 (ListPreference) findPreference(SEARCH_LANGUAGE_PREFERENCE);
         downloadPathPreference = findPreference(DOWNLOAD_PATH_PREFERENCE);
         downloadPathAudioPreference = findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
+        themePreference = findPreference(THEME);
 
         prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
@@ -132,6 +137,11 @@ public class SettingsFragment  extends PreferenceFragment
                     downloadPathAudioPreference
                             .setSummary(downloadPath);
                 }
+                else if (key == THEME)
+                {
+                    String theme = sharedPreferences.getString(THEME, "Light");
+                    themePreference.setSummary(theme);
+                }
                 updateSummary();
             }
         };
@@ -161,7 +171,6 @@ public class SettingsFragment  extends PreferenceFragment
                 activity.startActivityForResult(i, R.string.download_path_audio_key);
             }
         }
-
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
@@ -216,8 +225,8 @@ public class SettingsFragment  extends PreferenceFragment
             // installing the app does not necessarily return RESULT_OK
             App.configureTor(requestCode == REQUEST_INSTALL_ORBOT
                     && OrbotHelper.requestStartTor(a));
-
         }
+
         updateSummary();
         super.onActivityResult(requestCode, resultCode, data);
     }
@@ -239,6 +248,9 @@ public class SettingsFragment  extends PreferenceFragment
         downloadPathAudioPreference.setSummary(
                 defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
                         getString(R.string.download_path_audio_summary)));
+        themePreference.setSummary(
+                defaultPreferences.getString(THEME,
+                        getString(R.string.light_theme_title)));
     }
 
     @Override
diff --git a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
index 003bb393e..82abd39fe 100644
--- a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
@@ -66,7 +66,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/light_background_color"
+                android:background="@color/dark_background_color"
                 android:visibility="gone">
 
                 <LinearLayout
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 526840311..6b5545872 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -14,6 +14,7 @@
         android:id="@+id/detail_main_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/dark_youtube_primary_color"
         android:visibility="visible"
         app:parallax_factor="1.9"
         tools:ignore="UselessParent">
@@ -68,7 +69,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/light_background_color"
+                android:background="@color/dark_background_color"
                 android:visibility="gone">
 
                 <LinearLayout
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index ab385422f..8690652be 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -10,6 +10,16 @@
         <item name="android:windowBackground">@color/light_background_color</item>
     </style>
 
+    <!-- Dark Theme-->
+    <style name="DarkTheme" parent="Theme.AppCompat">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/dark_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/dark_background_color</item>
+    </style>
+
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5007e394b..dbb073b9e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,6 +23,16 @@
         <item name="android:windowBackground">@color/light_background_color</item>
     </style>
 
+    <!-- Dark Theme-->
+    <style name="DarkTheme" parent="Theme.AppCompat">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/dark_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/dark_background_color</item>
+    </style>
+
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
@@ -76,6 +86,11 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="DarkTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 0904315d0..cc42de70a 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -44,7 +44,6 @@
         android:title="@string/settings_category_appearance_title"
         android:textAllCaps="true">
 
-        <!-- Not yet working.
         <ListPreference
             android:key="@string/theme_key"
             android:title="@string/theme_title"
@@ -52,7 +51,6 @@
             android:entries="@array/theme_description_list"
             android:entryValues="@array/theme_list"
             android:defaultValue="@string/default_theme_value"/>
-            -->
 
         <CheckBoxPreference
             android:key="@string/show_play_with_kodi_key"

From 5458acfcad29506eb5ac92ec429ee60fa858d7d1 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Sat, 31 Dec 2016 13:46:52 +0530
Subject: [PATCH 12/30] Added dark theme

---
 .../main/java/org/schabi/newpipe/Themer.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 app/src/main/java/org/schabi/newpipe/Themer.java

diff --git a/app/src/main/java/org/schabi/newpipe/Themer.java b/app/src/main/java/org/schabi/newpipe/Themer.java
new file mode 100644
index 000000000..07a9f89a4
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/Themer.java
@@ -0,0 +1,20 @@
+package org.schabi.newpipe;
+
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+import java.util.Objects;
+
+public class Themer extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
+                .getString("theme", "1"), "0")) {
+            setTheme(R.style.DarkTheme);
+        }
+    }
+}

From 3a9c95a9ae686eef023304bd4ccd07da6ad1eb66 Mon Sep 17 00:00:00 2001
From: ksyko <lord.kratos.kb19@gmail.com>
Date: Sat, 31 Dec 2016 21:42:04 +0530
Subject: [PATCH 13/30] Update fragment_videoitem_detail.xml

---
 app/src/main/res/layout-v18/fragment_videoitem_detail.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
index 82abd39fe..41ec45cee 100644
--- a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
@@ -66,7 +66,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/dark_background_color"
                 android:visibility="gone">
 
                 <LinearLayout
@@ -276,4 +275,4 @@
             </RelativeLayout>
         </RelativeLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>

From 650917f9f9f350e92fd757638d82fb4f1d56c1e9 Mon Sep 17 00:00:00 2001
From: ksyko <lord.kratos.kb19@gmail.com>
Date: Sat, 31 Dec 2016 21:43:01 +0530
Subject: [PATCH 14/30] Update fragment_videoitem_detail.xml

---
 app/src/main/res/layout/fragment_videoitem_detail.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 6b5545872..c6047903b 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -14,7 +14,6 @@
         android:id="@+id/detail_main_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/dark_youtube_primary_color"
         android:visibility="visible"
         app:parallax_factor="1.9"
         tools:ignore="UselessParent">
@@ -279,4 +278,4 @@
             </RelativeLayout>
         </RelativeLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>

From b5df281447fb3aa298aa86ee537ee242e6ed34d9 Mon Sep 17 00:00:00 2001
From: ksyko <lord.kratos.kb19@gmail.com>
Date: Sat, 31 Dec 2016 21:51:41 +0530
Subject: [PATCH 15/30] Update fragment_videoitem_detail.xml

---
 app/src/main/res/layout/fragment_videoitem_detail.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index c6047903b..0bb0420d0 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -68,7 +68,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:background="@color/dark_background_color"
                 android:visibility="gone">
 
                 <LinearLayout

From a2e4585fe8280e9bdc6256b1f9774f99a4257fc5 Mon Sep 17 00:00:00 2001
From: ksyko <lord.kratos.kb19@gmail.com>
Date: Sat, 31 Dec 2016 22:32:16 +0530
Subject: [PATCH 16/30] Update InfoItemHolder.java

---
 .../main/java/org/schabi/newpipe/info_list/InfoItemHolder.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
index a2b000e2b..a5e73470e 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemHolder.java
@@ -36,7 +36,6 @@ public class InfoItemHolder extends RecyclerView.ViewHolder {
             itemDurationView,
             itemUploadDateView,
             itemViewCountView;
-
     public Button itemButton;
 
     public InfoItemHolder(View v) {

From 60dc19d2bc7d5c1eff06959aa2a43c0af9165a27 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Tue, 17 Jan 2017 16:07:36 +0530
Subject: [PATCH 17/30] Added Dark Theme

---
 app/build.gradle                              |   8 +-
 .../java/org/schabi/newpipe/MainActivity.java |   1 -
 .../main/java/org/schabi/newpipe/Themer.java  |   9 +-
 .../detail/VideoItemDetailFragment.java       |  21 +-
 .../newpipe/download/DownloadActivity.java    |   3 +-
 .../newpipe/settings/SettingsActivity.java    |   4 +-
 .../newpipe/settings/SettingsFragment.java    |   4 +-
 .../main/res/drawable-nodpi/thumbs_down.png   | Bin 4161 -> 0 bytes
 app/src/main/res/drawable-nodpi/thumbs_up.png | Bin 3656 -> 0 bytes
 app/src/main/res/drawable/splash_screen.xml   |   2 +-
 .../layout-v18/fragment_videoitem_detail.xml  | 223 +++++++++---------
 app/src/main/res/layout/activity_channel.xml  |   1 +
 app/src/main/res/layout/activity_error.xml    |   4 +-
 .../res/layout/fragment_videoitem_detail.xml  | 211 ++++++++---------
 app/src/main/res/menu/videoitem_detail.xml    |   4 +-
 app/src/main/res/values-v21/styles.xml        |  25 +-
 app/src/main/res/values/attrs.xml             |   9 +
 app/src/main/res/values/settings_keys.xml     |  10 +-
 app/src/main/res/values/strings.xml           |   3 +-
 app/src/main/res/values/styles.xml            |  30 ++-
 app/src/main/res/xml/settings.xml             |   2 +-
 21 files changed, 318 insertions(+), 256 deletions(-)
 delete mode 100644 app/src/main/res/drawable-nodpi/thumbs_down.png
 delete mode 100644 app/src/main/res/drawable-nodpi/thumbs_up.png
 create mode 100644 app/src/main/res/values/attrs.xml

diff --git a/app/build.gradle b/app/build.gradle
index 266f7fadb..536d304c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,10 +32,10 @@ android {
 
 dependencies {
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:support-v4:25.1.0'
-    compile 'com.android.support:design:25.1.0'
-    compile 'com.android.support:recyclerview-v7:25.1.0'
+    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:support-v4:25.0.0'
+    compile 'com.android.support:design:25.0.0'
+    compile 'com.android.support:recyclerview-v7:25.0.0'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
     compile 'info.guardianproject.netcipher:netcipher:1.2'
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 2e94443f9..9472d5903 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -47,7 +47,6 @@ public class MainActivity extends Themer {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
         mainFragment = getSupportFragmentManager()
                 .findFragmentById(R.id.search_fragment);
diff --git a/app/src/main/java/org/schabi/newpipe/Themer.java b/app/src/main/java/org/schabi/newpipe/Themer.java
index 07a9f89a4..048837cec 100644
--- a/app/src/main/java/org/schabi/newpipe/Themer.java
+++ b/app/src/main/java/org/schabi/newpipe/Themer.java
@@ -2,19 +2,20 @@ package org.schabi.newpipe;
 
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
 import java.util.Objects;
 
+import static org.schabi.newpipe.R.attr.theme;
+
 public class Themer extends AppCompatActivity {
 
     @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
-                .getString("theme", "1"), "0")) {
+                .getString("theme", getResources().getString(R.string.light_theme_title)), getResources().getString(R.string.dark_theme_title))) {
             setTheme(R.style.DarkTheme);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
index a93f37654..98620b15d 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
@@ -21,6 +21,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,7 +31,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.view.MenuItem;
 import android.widget.Toast;
 
 import com.google.android.exoplayer.util.Util;
@@ -39,26 +39,26 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
-import java.util.Vector;
-
 import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.ChannelActivity;
-import org.schabi.newpipe.ReCaptchaActivity;
-import org.schabi.newpipe.extractor.stream_info.StreamInfo;
-import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
-import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.ImageErrorLoadingListener;
 import org.schabi.newpipe.Localization;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.ReCaptchaActivity;
 import org.schabi.newpipe.download.DownloadDialog;
-import org.schabi.newpipe.extractor.stream_info.AudioStream;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.stream_info.AudioStream;
+import org.schabi.newpipe.extractor.stream_info.StreamInfo;
+import org.schabi.newpipe.extractor.stream_info.StreamPreviewInfo;
 import org.schabi.newpipe.extractor.stream_info.VideoStream;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.player.BackgroundPlayer;
-import org.schabi.newpipe.player.PlayVideoActivity;
 import org.schabi.newpipe.player.ExoPlayerActivity;
+import org.schabi.newpipe.player.PlayVideoActivity;
+import org.schabi.newpipe.report.ErrorActivity;
+
+import java.util.Vector;
 
 import static android.app.Activity.RESULT_OK;
 import static org.schabi.newpipe.ReCaptchaActivity.RECAPTCHA_REQUEST;
@@ -650,7 +650,6 @@ public class VideoItemDetailFragment extends Fragment {
     public void onStart() {
         super.onStart();
         Activity a = getActivity();
-
         infoItemBuilder = new InfoItemBuilder(a, a.findViewById(android.R.id.content));
 
         if (android.os.Build.VERSION.SDK_INT < 18) {
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index 98e4eddd7..2f77cadb2 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -13,6 +13,7 @@ import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -27,9 +28,9 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.schabi.newpipe.R;
 import org.schabi.newpipe.Themer;
 import org.schabi.newpipe.report.ErrorActivity;
+import org.schabi.newpipe.R;
 import org.schabi.newpipe.settings.SettingsActivity;
 
 import java.io.File;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index 9ca0490d4..be4dbfc03 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -47,8 +47,8 @@ public class SettingsActivity extends PreferenceActivity  {
     @Override
     protected void onCreate(Bundle savedInstanceBundle) {
         if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
-                .getString("theme", "1"), "0")) {
-            setTheme(R.style.DarkTheme);
+                .getString("theme", getResources().getString(R.string.light_theme_title)), getResources().getString(R.string.dark_theme_title))) {
+                setTheme(R.style.DarkTheme);
         }
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceBundle);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
index c9c7fe134..0e7e6bb0a 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
@@ -21,6 +21,7 @@ import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 import info.guardianproject.netcipher.proxy.OrbotHelper;
 
@@ -67,7 +68,7 @@ public class SettingsFragment  extends PreferenceFragment
     private Preference downloadPathAudioPreference;
     private Preference themePreference;
     private SharedPreferences defaultPreferences;
-
+    private Preference themePreference;
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
@@ -86,6 +87,7 @@ public class SettingsFragment  extends PreferenceFragment
         DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
         THEME = getString(R.string.theme_key);
         USE_TOR_KEY = getString(R.string.use_tor_key);
+        THEME = getString(R.string.theme_key);
 
         // get pref objects
         defaultResolutionPreference =
diff --git a/app/src/main/res/drawable-nodpi/thumbs_down.png b/app/src/main/res/drawable-nodpi/thumbs_down.png
deleted file mode 100644
index 23c0f0487ad7726d8d52eddcf2bd33bbc94e55a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4161
zcmV-H5Weq;P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000GSNkl<Zc-rinYi|=*5Qg6~GiSZN#<!5ziJdq$B2kDVoV2tmazSm8a1Asey(uUm
z5yVOBQq;6Xl}c$*OR0JjX(`>`!7t$#(J#A}lg1`Dn>F@I@0ZnHJkQRVGiT-)&z?O)
zHw!%gJperbJperbJpemS?&Dx)hzOKYQ$%z{M3$I&g_&1GWR;meB%&fS=K%Pe`$Pos
zcpN^T4_>bqUauDbpp*hLLn*cG9n1_Os=ZG{004<Z0-;c7+jWirV0L!4wE&1niO6Tn
zY>9})%>Pr}`G?GWTPgLC)_OJ?jRt)_AN+nld_G^t0+?@P`12$pTUzUH48vIRcsy?r
z(TGxt_5&c9Oro!^uOWcbr%$&OfF`294q`krTSQb-ou@ot=9@&cNJQs}=v8J;Ftdk<
zOlCIf0Spcfjs%0jYXDZ6d6k*JVCGMlc^SZJp-_0Gl>mr{emf|DJ$Q%%<zHsLZ)?f%
z1lt?dn|YvN7*?x;;PqAkXrQm^0T9u3$AfkgfUTAQP)eO5qW78k`!)lp)&sC-oMzYm
zaijp0Qa%y6-DacR1AvIGA2jNB3;-h9Rm>cJfrhsafKqB#5mA_k{(k8JJZA`8?OFiL
zTw>;*x^V~ui0D%njQ{oksL!YEv~$fR#<zb6D5W4GzjQ4CJMewi)gC}ZGxma{`v8bY
zpVoSgh#q$x0DG~s<s$cQ8vv7tmRx3dTc^QyTxxvV0Bm$MfKVuOK}4)(m6n$pfMFP>
zU101^08R?P%xm2Yz)6H&W9A>bIu%w*5fSByXpxy;*t&p-ETz<DeS-u*MJd&+D*Vq;
z0H~J`(S)5O-ESuV5wWz^mHJMR*7~Z}y5T*hY5scD0Jgzk<~NwR!py(7qF5>-761!?
z6%L0hBO@a*dwl``n3|djCK8DY0Lpg3<{~q{%giMJ7b}&@a4P}S3Z{1USY+m}nfdWi
zx_uxJxGN&l;cysZV`EO54ge?=3K$w1YS<gx+}uRF0MwVx)(>N}Qpy70eEp9H1_s3I
z^&%7sVRUqK8-VHQX(W@$h5)M7YU=<v#@Bap0cd9a`7rLTwYCC*z%3$50YE$+hiRJb
z1F*wzD5d-&^6eqr{odf<;7lfysXf<q02;K+OcA+vm>>t>S}K(?Gnouhsg!#F?4eN#
z5xIGgS%8SFW5<rI`~ChAXU9i6o$f3E%)GH5<L!jTV&+ExPUZ7?3=9mQBLVDZ(d4W!
z0a%7%+)+x60>JqAIO6em=K)Yk&F<ITMPw_TPM^=^a<%7lDu56(|GC#7XV2~HrfK%)
z^LZRUe%!qP8nwrFw8}r&>sR;t{f|5zPZ0nN!@$JE1hUy|XL|rM-`V5Tww}#q6R}tf
z9RomX-BcoC*qa`kW^?`h{ci%m*w`343V>l4&r`Np9&Z?iwXw1BcClCl0Aw;5M5EEp
z0T78q8Y&ixAsh~m*Kcs#2|z^d7K_E&S5K$Y2nK_l10WWQHB>wvM<f!_N~wncb`5&W
ze5F2KWHOl=498$sPlJU*p{dTCIfGOx_2o_g04&oqt(BFPRJB^g+S(d!+_-^CrGjd;
ziiL#*oI7_8Cr_Tl@bIvE0X%u~q^X`heTv1!#n*QO5RFEExOC|fE?>Tka=DChxr|b&
zgi@)5g@pyo&(9;D&*Q|26SW`dIskKXb4|6pyo|}oNf6QJ4g{x&F*G#vUOt~kHk(B*
zm)lh{Gc!1Q_AC;KL`P?W&{_vf(|kZgme$%5k(*j;zt`)9X_^h?@pxdGCJe)HCxD#~
z+D$|R5kV@Ink1rI$z*al5{U$HfWvhFdViYg0q6nf0q6nf68$#-x$YRwH$xM000000
LNkvXXu0mjf*C?q`

diff --git a/app/src/main/res/drawable-nodpi/thumbs_up.png b/app/src/main/res/drawable-nodpi/thumbs_up.png
deleted file mode 100644
index 1fdd2293f633bc8f50fc4cf54d2eb826bc0efa2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3656
zcmV-O4!7}%P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z000AXNkl<Zc-rin@oUp)7{@=aNoKM{&3g7mbAgG4t)k#28H{mO1;HE2EP_+Pp_@a?
zHsy38=-sg!C@K@Z+wJa_pZ2HDA52CU+q7xzZ1(1bFT8D&ynQ}-^1RRcJ}o;tJIE|D
z02zP`Kn5TK&_LB{mAK}4-k#URVsW>h&*#5-e`si^;kij#sZ?44)`y3OhmxFk5CB-f
zQ(z15`}+Fc0d}eZxUS2@#6(MSUH1myNA#prDp9FanyP0#!1Fxv`8?%vIaZcst<?dr
zRjE|U+uPeTQ%?gJ92{hPe4MGNDQ0J9>&XpWKdM5Z@N8^sjArV20JUvoWCUH;ccrT8
z&3eWIzNTrLg+hU5N)>?coLnv!9=qBI0I+4-_6ggziBl>86pKZsr>8GBa{my3X_~HS
zn#3us9&jG`KgM_;*aVc+<^c@={0LN=-1$(efH+71E*OTf(SqTjZl*dDtN}2P;I4=I
z&}uf=%K(IBSyzC+6Br(<<(#@#0h|C{w_&&s%mHee0gM8FwQ2lgpf9bfLC0~N#e~oL
zo&``lOUYgUU;+1AnAhX<CvYTf090Vqw(U0^814fvfn)7%q<k*`gN9+ObZEFA#EKv2
zpzSvR1Gv+nyVq(7IFuFuXH3&v`$mRGAAw82;r#;e6EIbytH8CO|BL5&{Sg4UHZr+(
z^a)r7CX>KO3;<Yf@<r}O#(3Ce!|UliFar!XON!b7@NbjB7b0W)`W*n&>SJ(IPS^7c
z8305*V-nD01>gs<s0x^}0tht^9FiHpRxXz-%M8HRH0`O>9sqbU1DKOF2yOtk!l_Uu
z0Go=U%!JdQlzD)vs#jE1l{yprJz6Z04Zv&J*8-1Z2CxVml@Y)P;CiqxAY=qE7Z@&N
z-4NM`&i%3h_%E(#A_IU0nfC-=)r<TG9l+aQNBAtz-;HhYUI(xg7xni8z=Oyb*MJv6
zG~N#Y>q*LGi2-<DYF`UAS_Ym6{RfWYxOK)+fa5}lQ^2GU;<6Cp9<UN5D&M+7)Kvhn
z7jzt_;b%gKdVK|OEz7#7D9XH|D1QL|bO4~z)!JYe001yBFo33MXqtv$82!4gp95|K
zza;?jENPLnR{@~w`tG5DQ73_)gWvzn2eD=zxCh(_N?(G6E&I<<1|S2F0muMk05Sl3
a^mzbMddF~(YV2140000<MNUMnLSTaZa>Y6T

diff --git a/app/src/main/res/drawable/splash_screen.xml b/app/src/main/res/drawable/splash_screen.xml
index 96edac61b..e049c2941 100644
--- a/app/src/main/res/drawable/splash_screen.xml
+++ b/app/src/main/res/drawable/splash_screen.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:drawable="@color/light_background_color"/>
+        android:drawable="?android:attr/windowBackground"/>
 
     <item>
         <bitmap
diff --git a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
index 41ec45cee..6654f6c63 100644
--- a/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout-v18/fragment_videoitem_detail.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".detail.VideoItemDetailFragment"
-    android:textIsSelectable="true"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/video_item_detail">
+                xmlns:tools="http://schemas.android.com/tools"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                tools:context=".detail.VideoItemDetailFragment"
+                android:textIsSelectable="true"
+                style="?android:attr/textAppearanceLarge"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/video_item_detail">
 
     <ProgressBar android:id="@+id/detail_progress_bar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"/>
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_centerInParent="true"
+                 android:indeterminate="true"/>
 
     <com.nirhart.parallaxscroll.views.ParallaxScrollView
         android:id="@+id/detail_main_content"
@@ -35,24 +35,24 @@
                 android:background="?attr/selectableItemBackground">
 
                 <ImageView android:id="@+id/detail_thumbnail_view"
-                    android:contentDescription="@string/detail_thumbnail_view_description"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scaleType="fitCenter"
-                    android:adjustViewBounds="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:background="@android:color/black"
-                    android:src="@drawable/dummy_thumbnail_dark"/>
+                           android:contentDescription="@string/detail_thumbnail_view_description"
+                           android:layout_width="match_parent"
+                           android:layout_height="wrap_content"
+                           android:scaleType="fitCenter"
+                           android:adjustViewBounds="true"
+                           android:layout_alignParentLeft="true"
+                           android:layout_alignParentStart="true"
+                           android:layout_alignParentTop="true"
+                           android:background="@android:color/black"
+                           android:src="@drawable/dummy_thumbnail_dark"/>
 
                 <ImageView android:id="@+id/play_arrow_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:layout_centerInParent="true"
-                    android:src="@drawable/new_play_arrow"
-                    android:visibility="invisible"/>
+                           android:layout_width="wrap_content"
+                           android:layout_height="wrap_content"
+                           android:background="@android:color/transparent"
+                           android:layout_centerInParent="true"
+                           android:src="@drawable/new_play_arrow"
+                           android:visibility="invisible"/>
 
                 <Button
                     android:id="@+id/detail_stream_thumbnail_window_background_button"
@@ -63,10 +63,11 @@
             </RelativeLayout>
 
             <RelativeLayout android:id="@+id/detail_text_content_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:visibility="gone">
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_below="@id/detail_stream_thumbnail_window_layout"
+                            android:background="?android:windowBackground"
+                            android:visibility="gone">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -74,15 +75,15 @@
                     android:id="@+id/detailTopView">
 
                     <TextView android:id="@+id/detail_video_title_view"
-                        android:layout_width="0dp"
-                        android:layout_weight=".7"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_title_text_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginStart="12dp"
-                        android:text="Title"/>
+                              android:layout_width="0dp"
+                              android:layout_weight=".7"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_title_text_size"
+                              android:textAppearance="?android:attr/textAppearanceLarge"
+                              android:layout_marginTop="12dp"
+                              android:layout_marginLeft="12dp"
+                              android:layout_marginStart="12dp"
+                              android:text="Title"/>
 
                     <ImageView
                         android:layout_width="15dp"
@@ -98,17 +99,17 @@
                 </LinearLayout>
 
                 <TextView android:id="@+id/detail_view_count_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/video_item_detail_views_text_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginStart="12dp"
-                    android:text="10,069,948 views"
-                    android:layout_below="@id/detailTopView"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginTop="5dp" />
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:textSize="@dimen/video_item_detail_views_text_size"
+                          android:textAppearance="?android:attr/textAppearanceLarge"
+                          android:layout_marginLeft="12dp"
+                          android:layout_marginStart="12dp"
+                          android:text="10,069,948 views"
+                          android:layout_below="@id/detailTopView"
+                          android:layout_alignParentLeft="true"
+                          android:layout_alignParentStart="true"
+                          android:layout_marginTop="5dp" />
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -121,21 +122,21 @@
                     android:layout_marginEnd="12dp"
                     android:visibility="gone">
                     <TextView android:id="@+id/detail_upload_date_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="Upload date"
-                        android:layout_marginTop="3dp" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="Upload date"
+                              android:layout_marginTop="3dp" />
 
                     <TextView android:id="@+id/detail_description_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_description_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:layout_below="@id/detail_upload_date_view"
-                        android:text="Description............."
-                        android:layout_marginTop="3dp" />
+                              android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_description_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:layout_below="@id/detail_upload_date_view"
+                              android:text="Description............."
+                              android:layout_marginTop="3dp" />
                 </RelativeLayout>
 
                 <LinearLayout
@@ -149,32 +150,32 @@
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="5dp">
                     <ImageView android:id="@+id/detail_thumbs_up_img_view"
-                        android:contentDescription="@string/detail_likes_img_view_description"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:src="@drawable/thumbs_up" />
+                               android:contentDescription="@string/detail_likes_img_view_description"
+                               android:layout_width="@dimen/video_item_detail_like_image_width"
+                               android:layout_height="@dimen/video_item_detail_like_image_height"
+                               android:src="?attr/thumbs_up"/>
 
                     <TextView android:id="@+id/detail_thumbs_up_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="200" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_likes_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="200" />
 
                     <ImageView android:id="@+id/detail_thumbs_down_img_view"
-                        android:contentDescription="@string/detail_dislikes_img_view_description"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:src="@drawable/thumbs_down"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginStart="10dp"/>
+                               android:contentDescription="@string/detail_dislikes_img_view_description"
+                               android:layout_width="@dimen/video_item_detail_like_image_width"
+                               android:layout_height="@dimen/video_item_detail_like_image_height"
+                               android:src="?attr/thumbs_down"
+                               android:layout_marginLeft="10dp"
+                               android:layout_marginStart="10dp"/>
 
                     <TextView android:id="@+id/detail_thumbs_down_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="100" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_likes_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="100" />
                 </LinearLayout>
 
                 <FrameLayout
@@ -207,17 +208,17 @@
                             android:layout_marginBottom="5dp"/>
 
                         <TextView android:id="@+id/detail_uploader_view"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textStyle="bold"
-                            android:textSize="@dimen/video_item_detail_uploader_text_size"
-                            android:textAppearance="?android:attr/textAppearanceLarge"
-                            android:text="Uploader"
-                            android:layout_centerVertical="true"
-                            android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_marginLeft="15dp"
-                            android:layout_marginStart="28dp" />
+                                  android:layout_width="wrap_content"
+                                  android:layout_height="wrap_content"
+                                  android:textStyle="bold"
+                                  android:textSize="@dimen/video_item_detail_uploader_text_size"
+                                  android:textAppearance="?android:attr/textAppearanceLarge"
+                                  android:text="Uploader"
+                                  android:layout_centerVertical="true"
+                                  android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
+                                  android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
+                                  android:layout_marginLeft="15dp"
+                                  android:layout_marginStart="28dp" />
 
                         <View
                             android:background="#000"
@@ -234,12 +235,12 @@
                 </FrameLayout>
 
                 <RelativeLayout android:id="@+id/detail_next_stream_root_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:layout_below="@+id/detail_uploader_frame"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="10dp">
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center_horizontal|bottom"
+                                android:layout_below="@+id/detail_uploader_frame"
+                                android:layout_centerHorizontal="true"
+                                android:layout_marginTop="10dp">
 
                     <TextView
                         android:id="@+id/detail_next_stream_title"
@@ -256,14 +257,14 @@
                         android:layout_height="wrap_content"
                         android:id="@+id/detail_next_stream_content"/>
                     <TextView android:id="@+id/detail_similar_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:textSize="@dimen/video_item_detail_next_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="@string/similar_videos_btn_text"
-                        android:layout_below="@id/detail_next_stream_content"
-                        android:textAllCaps="true" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_centerHorizontal="true"
+                              android:textSize="@dimen/video_item_detail_next_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="@string/similar_videos_btn_text"
+                              android:layout_below="@id/detail_next_stream_content"
+                              android:textAllCaps="true" />
                     <LinearLayout
                         android:id="@+id/similar_streams_view"
                         android:orientation="vertical"
@@ -275,4 +276,4 @@
             </RelativeLayout>
         </RelativeLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index f87553882..e889ac3f8 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -91,6 +91,7 @@
         android:id="@+id/channel_streams_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="?android:windowBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:scrollbars="vertical"/>
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index ea6cb7792..478c5218c 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -42,7 +42,7 @@
                 android:id="@+id/errorMessageView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@android:color/black"
+                android:textColor="?android:attr/colorAccent"
                 android:text="@string/info_labels"/>
 
             <TextView
@@ -63,7 +63,7 @@
                     android:id="@+id/errorInfoLabelsView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@android:color/black"
+                    android:textColor="?android:attr/colorAccent"
                     android:text="@string/info_labels"/>
 
                 <HorizontalScrollView
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index 0bb0420d0..4ee883ae4 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".detail.VideoItemDetailFragment"
-    android:textIsSelectable="true"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/video_item_detail">
+             xmlns:tools="http://schemas.android.com/tools"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             tools:context=".detail.VideoItemDetailFragment"
+             android:textIsSelectable="true"
+             style="?android:attr/textAppearanceLarge"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:id="@+id/video_item_detail">
 
     <com.nirhart.parallaxscroll.views.ParallaxScrollView
         android:id="@+id/detail_main_content"
@@ -29,22 +29,22 @@
                 android:background="?attr/selectableItemBackground">
 
                 <ImageView android:id="@+id/detail_thumbnail_view"
-                    android:contentDescription="@string/detail_thumbnail_view_description"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scaleType="fitCenter"
-                    android:adjustViewBounds="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:background="@android:color/black"
-                    android:src="@drawable/dummy_thumbnail_dark"/>
+                           android:contentDescription="@string/detail_thumbnail_view_description"
+                           android:layout_width="match_parent"
+                           android:layout_height="wrap_content"
+                           android:scaleType="fitCenter"
+                           android:adjustViewBounds="true"
+                           android:layout_alignParentLeft="true"
+                           android:layout_alignParentStart="true"
+                           android:layout_alignParentTop="true"
+                           android:background="@android:color/black"
+                           android:src="@drawable/dummy_thumbnail_dark"/>
 
                 <ProgressBar android:id="@+id/detail_progress_bar"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:indeterminate="true"/>
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:layout_centerInParent="true"
+                             android:indeterminate="true"/>
 
                 <android.support.design.widget.FloatingActionButton
                     android:id="@+id/play_video_button"
@@ -65,10 +65,11 @@
             </RelativeLayout>
 
             <RelativeLayout android:id="@+id/detail_text_content_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@id/detail_stream_thumbnail_window_layout"
-                android:visibility="gone">
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_below="@id/detail_stream_thumbnail_window_layout"
+                            android:background="?android:windowBackground"
+                            android:visibility="gone">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -76,15 +77,15 @@
                     android:id="@+id/detailTopView">
 
                     <TextView android:id="@+id/detail_video_title_view"
-                        android:layout_width="0dp"
-                        android:layout_weight=".7"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_title_text_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginLeft="12dp"
-                        android:layout_marginStart="12dp"
-                        android:text="Title"/>
+                              android:layout_width="0dp"
+                              android:layout_weight=".7"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_title_text_size"
+                              android:textAppearance="?android:attr/textAppearanceLarge"
+                              android:layout_marginTop="12dp"
+                              android:layout_marginLeft="12dp"
+                              android:layout_marginStart="12dp"
+                              android:text="Title"/>
 
                     <ImageView
                         android:layout_width="15dp"
@@ -100,17 +101,17 @@
                 </LinearLayout>
 
                 <TextView android:id="@+id/detail_view_count_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/video_item_detail_views_text_size"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginStart="12dp"
-                    android:text="10,069,948 views"
-                    android:layout_below="@id/detailTopView"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginTop="5dp" />
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:textSize="@dimen/video_item_detail_views_text_size"
+                          android:textAppearance="?android:attr/textAppearanceLarge"
+                          android:layout_marginLeft="12dp"
+                          android:layout_marginStart="12dp"
+                          android:text="10,069,948 views"
+                          android:layout_below="@id/detailTopView"
+                          android:layout_alignParentLeft="true"
+                          android:layout_alignParentStart="true"
+                          android:layout_marginTop="5dp" />
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -123,21 +124,21 @@
                     android:layout_marginEnd="12dp"
                     android:visibility="gone">
                     <TextView android:id="@+id/detail_upload_date_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="Upload date"
-                        android:layout_marginTop="3dp" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_upload_date_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="Upload date"
+                              android:layout_marginTop="3dp" />
 
                     <TextView android:id="@+id/detail_description_view"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_description_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:layout_below="@id/detail_upload_date_view"
-                        android:text="Description............."
-                        android:layout_marginTop="3dp" />
+                              android:layout_width="match_parent"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_description_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:layout_below="@id/detail_upload_date_view"
+                              android:text="Description............."
+                              android:layout_marginTop="3dp" />
                 </RelativeLayout>
 
                 <LinearLayout
@@ -151,32 +152,32 @@
                     android:layout_alignParentEnd="true"
                     android:layout_marginTop="5dp">
                     <ImageView android:id="@+id/detail_thumbs_up_img_view"
-                        android:contentDescription="@string/detail_likes_img_view_description"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:src="@drawable/thumbs_up" />
+                               android:contentDescription="@string/detail_likes_img_view_description"
+                               android:layout_width="@dimen/video_item_detail_like_image_width"
+                               android:layout_height="@dimen/video_item_detail_like_image_height"
+                               android:src="?attr/thumbs_up" />
 
                     <TextView android:id="@+id/detail_thumbs_up_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="200" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_likes_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="200" />
 
                     <ImageView android:id="@+id/detail_thumbs_down_img_view"
-                        android:contentDescription="@string/detail_dislikes_img_view_description"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:src="@drawable/thumbs_down"
-                        android:layout_marginLeft="10dp"
-                        android:layout_marginStart="10dp"/>
+                               android:contentDescription="@string/detail_dislikes_img_view_description"
+                               android:layout_width="@dimen/video_item_detail_like_image_width"
+                               android:layout_height="@dimen/video_item_detail_like_image_height"
+                               android:src="?attr/thumbs_down"
+                               android:layout_marginLeft="10dp"
+                               android:layout_marginStart="10dp"/>
 
                     <TextView android:id="@+id/detail_thumbs_down_count_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="100" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:textSize="@dimen/video_item_detail_likes_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="100" />
                 </LinearLayout>
 
                 <FrameLayout
@@ -209,17 +210,17 @@
                             android:layout_marginBottom="5dp"/>
 
                         <TextView android:id="@+id/detail_uploader_view"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textStyle="bold"
-                            android:textSize="@dimen/video_item_detail_uploader_text_size"
-                            android:textAppearance="?android:attr/textAppearanceLarge"
-                            android:text="Uploader"
-                            android:layout_centerVertical="true"
-                            android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
-                            android:layout_marginLeft="15dp"
-                            android:layout_marginStart="28dp" />
+                                  android:layout_width="wrap_content"
+                                  android:layout_height="wrap_content"
+                                  android:textStyle="bold"
+                                  android:textSize="@dimen/video_item_detail_uploader_text_size"
+                                  android:textAppearance="?android:attr/textAppearanceLarge"
+                                  android:text="Uploader"
+                                  android:layout_centerVertical="true"
+                                  android:layout_toRightOf="@+id/detail_uploader_thumbnail_view"
+                                  android:layout_toEndOf="@+id/detail_uploader_thumbnail_view"
+                                  android:layout_marginLeft="15dp"
+                                  android:layout_marginStart="28dp" />
 
                         <View
                             android:background="#000"
@@ -236,12 +237,12 @@
                 </FrameLayout>
 
                 <RelativeLayout android:id="@+id/detail_next_stream_root_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:layout_below="@+id/detail_uploader_frame"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="10dp">
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center_horizontal|bottom"
+                                android:layout_below="@+id/detail_uploader_frame"
+                                android:layout_centerHorizontal="true"
+                                android:layout_marginTop="10dp">
 
                     <TextView
                         android:id="@+id/detail_next_stream_title"
@@ -258,14 +259,14 @@
                         android:layout_height="wrap_content"
                         android:id="@+id/detail_next_stream_content"/>
                     <TextView android:id="@+id/detail_similar_title"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:textSize="@dimen/video_item_detail_next_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
-                        android:text="@string/similar_videos_btn_text"
-                        android:layout_below="@id/detail_next_stream_content"
-                        android:textAllCaps="true" />
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_centerHorizontal="true"
+                              android:textSize="@dimen/video_item_detail_next_text_size"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:text="@string/similar_videos_btn_text"
+                              android:layout_below="@id/detail_next_stream_content"
+                              android:textAllCaps="true" />
                     <LinearLayout
                         android:id="@+id/similar_streams_view"
                         android:orientation="vertical"
@@ -277,4 +278,4 @@
             </RelativeLayout>
         </RelativeLayout>
     </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/videoitem_detail.xml b/app/src/main/res/menu/videoitem_detail.xml
index 0f2b01615..a2e93274a 100644
--- a/app/src/main/res/menu/videoitem_detail.xml
+++ b/app/src/main/res/menu/videoitem_detail.xml
@@ -5,12 +5,12 @@
     <item android:id="@+id/menu_item_play_audio"
         android:title="@string/play_audio"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_headset_black" />
+        android:icon="?attr/audio" />
 
     <item android:id="@+id/menu_item_download"
         app:showAsAction="ifRoom"
         android:title="@string/download"
-        android:icon="@drawable/ic_file_download_black"/>
+        android:icon="?attr/download"/>
 
     <item android:id="@+id/menu_item_share"
         android:title="@string/share"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 8690652be..05af4c91f 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,13 +1,30 @@
 <resources>
-    <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
         <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="android:colorPrimary">@color/light_youtube_primary_color</item>
-        <item name="android:colorPrimaryDark">@color/light_youtube_dark_color</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:colorAccent">@color/light_youtube_accent_color</item>
         <item name="android:windowBackground">@color/light_background_color</item>
+        <item name="thumbs_up">@drawable/ic_thumb_up_black_24dp</item>
+        <item name="thumbs_down">@drawable/ic_thumb_down_black_24dp</item>
+        <item name="audio">@drawable/ic_headset_black_24dp</item>
+        <item name="download">@drawable/ic_file_download_black_24dp</item>
+    </style>
+
+
+    <!-- Dark Theme-->
+    <style name="DarkTheme" parent="Theme.AppCompat">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/dark_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/dark_background_color</item>
+        <item name="thumbs_up">@drawable/ic_thumb_up_white_24dp</item>
+        <item name="thumbs_down">@drawable/ic_thumb_down_white_24dp</item>
+        <item name="audio">@drawable/ic_headset_white_24dp</item>
+        <item name="download">@drawable/ic_file_download_white_24dp</item>
     </style>
 
     <!-- Dark Theme-->
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..68928bdbc
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="thumbs_up" format="reference"/>
+    <attr name="thumbs_down" format="reference"/>
+    <attr name="audio" format="reference"/>
+    <attr name="download" format="reference"/>
+    <attr name="share" format="reference"/>
+    <attr name="cast" format="reference"/>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index e17179117..77d232ccb 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -25,14 +25,16 @@
     <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 name="default_theme_value">@string/light_theme_title</string>
     <string-array name="theme_description_list">
-        <item>@string/dark_theme_title</item>
         <item>@string/light_theme_title</item>
+        <item>@string/dark_theme_title</item>
+        <item>@string/black_theme_title</item>
     </string-array>
     <string-array name="theme_list">
-        <item>0</item>
-        <item>1</item>
+        <item>@string/light_theme_title</item>
+        <item>@string/dark_theme_title</item>
+        <item>@string/black_theme_title</item>
     </string-array>
 
     <string name="default_audio_format_key">default_audio_format</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 39532aefd..6fc947f54 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,8 +46,9 @@
     <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="dark_theme_title">Dark</string>
+    <string name="black_theme_title">Black</string>
 
     <string name="download_dialog_title">Download</string>
     <string-array name="download_options">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dbb073b9e..97040f014 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="RootTheme" parent="android:Theme.Holo"></style>
+    <style name="RootTheme" parent="android:Theme.Holo"/>
 
     <style name="PlayerTheme" parent="@style/RootTheme">
         <item name="android:windowNoTitle">true</item>
@@ -13,6 +13,7 @@
         <item name="android:minWidth">40dp</item>
     </style>
 
+
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
@@ -21,6 +22,33 @@
         <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>
+        <item name="thumbs_up">@drawable/ic_thumb_up_black_24dp</item>
+        <item name="thumbs_down">@drawable/ic_thumb_down_black_24dp</item>
+        <item name="audio">@drawable/ic_headset_black_24dp</item>
+        <item name="download">@drawable/ic_file_download_black_24dp</item>
+        <item name="share">@drawable/ic_share_black</item>
+        <item name="cast">@drawable/ic_cast_black_24dp</item>
+    </style>
+
+
+    <!-- Dark Theme-->
+    <style name="DarkTheme" parent="Theme.AppCompat">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
+        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
+        <item name="colorAccent">@color/dark_youtube_accent_color</item>
+        <item name="android:windowBackground">@color/dark_background_color</item>
+        <item name="thumbs_up">@drawable/ic_thumb_up_white_24dp</item>
+        <item name="thumbs_down">@drawable/ic_thumb_down_white_24dp</item>
+        <item name="audio">@drawable/ic_headset_white_24dp</item>
+        <item name="download">@drawable/ic_file_download_white_24dp</item>
+        <item name="share">@drawable/ic_share_white_24dp</item>
+        <item name="cast">@drawable/ic_cast_white_24dp</item>
+    </style>
+
+    <style name="BlackTheme" parent="DarkTheme">
+        <item name="android:windowBackground">@color/light_youtube_accent_color</item>
     </style>
 
     <!-- Dark Theme-->
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index cc42de70a..7330643ee 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -43,7 +43,7 @@
         android:key="@string/settings_category_appearance"
         android:title="@string/settings_category_appearance_title"
         android:textAllCaps="true">
-
+.
         <ListPreference
             android:key="@string/theme_key"
             android:title="@string/theme_title"

From 1e81f617606a178df49cdd46b76c28609dbb63c4 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Tue, 17 Jan 2017 20:31:14 +0530
Subject: [PATCH 18/30] Added dark theme

---
 .../newpipe/settings/SettingsFragment.java    |  1 -
 app/src/main/res/values-v21/styles.xml        | 20 -------------------
 app/src/main/res/values/settings_keys.xml     |  2 --
 app/src/main/res/values/styles.xml            | 20 -------------------
 4 files changed, 43 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
index 0e7e6bb0a..6f843d028 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
@@ -68,7 +68,6 @@ public class SettingsFragment  extends PreferenceFragment
     private Preference downloadPathAudioPreference;
     private Preference themePreference;
     private SharedPreferences defaultPreferences;
-    private Preference themePreference;
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index a1934ba07..89e8c0784 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -27,26 +27,6 @@
         <item name="download">@drawable/ic_file_download_white_24dp</item>
     </style>
 
-    <!-- Dark Theme-->
-    <style name="DarkTheme" parent="Theme.AppCompat">
-        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
-        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
-        <item name="colorAccent">@color/dark_youtube_accent_color</item>
-        <item name="android:windowBackground">@color/dark_background_color</item>
-    </style>
-
-    <!-- Dark Theme-->
-    <style name="DarkTheme" parent="Theme.AppCompat">
-        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
-        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
-        <item name="colorAccent">@color/dark_youtube_accent_color</item>
-        <item name="android:windowBackground">@color/dark_background_color</item>
-    </style>
-
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 77d232ccb..3312e6c8e 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -29,12 +29,10 @@
     <string-array name="theme_description_list">
         <item>@string/light_theme_title</item>
         <item>@string/dark_theme_title</item>
-        <item>@string/black_theme_title</item>
     </string-array>
     <string-array name="theme_list">
         <item>@string/light_theme_title</item>
         <item>@string/dark_theme_title</item>
-        <item>@string/black_theme_title</item>
     </string-array>
 
     <string name="default_audio_format_key">default_audio_format</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 65fecda26..11d7b25bd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -51,26 +51,6 @@
         <item name="android:windowBackground">@color/light_youtube_accent_color</item>
     </style>
 
-    <!-- Dark Theme-->
-    <style name="DarkTheme" parent="Theme.AppCompat">
-        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
-        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
-        <item name="colorAccent">@color/dark_youtube_accent_color</item>
-        <item name="android:windowBackground">@color/dark_background_color</item>
-    </style>
-
-    <!-- Dark Theme-->
-    <style name="DarkTheme" parent="Theme.AppCompat">
-        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
-        <item name="colorPrimary">@color/dark_youtube_primary_color</item>
-        <item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
-        <item name="colorAccent">@color/dark_youtube_accent_color</item>
-        <item name="android:windowBackground">@color/dark_background_color</item>
-    </style>
-
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>

From df516356747cebccb9ffd79cdb91b72c489f510d Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Tue, 17 Jan 2017 20:33:54 +0530
Subject: [PATCH 19/30] Added dark theme

---
 app/src/main/res/menu/error_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/menu/error_menu.xml b/app/src/main/res/menu/error_menu.xml
index 1af81f9fd..79c3f6393 100644
--- a/app/src/main/res/menu/error_menu.xml
+++ b/app/src/main/res/menu/error_menu.xml
@@ -5,5 +5,5 @@
     <item android:id="@+id/menu_item_share_error"
         android:title="@string/share"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_share_black"/>
+        android:icon="?attr/share"/>
 </menu>
\ No newline at end of file

From e3d59c3cff99a89b8ab24a3ca98f1e94c78b6715 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Tue, 17 Jan 2017 20:47:12 +0530
Subject: [PATCH 20/30] Added dark theme

---
 app/src/main/res/values-v21/styles.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 89e8c0784..358cb0fbe 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -10,6 +10,7 @@
         <item name="thumbs_down">@drawable/ic_thumb_down_black_24dp</item>
         <item name="audio">@drawable/ic_headset_black_24dp</item>
         <item name="download">@drawable/ic_file_download_black_24dp</item>
+        <item name="share">@drawable/ic_share_black</item>
     </style>
 
 
@@ -25,6 +26,7 @@
         <item name="thumbs_down">@drawable/ic_thumb_down_white_24dp</item>
         <item name="audio">@drawable/ic_headset_white_24dp</item>
         <item name="download">@drawable/ic_file_download_white_24dp</item>
+        <item name="share">@drawable/ic_share_white_24dp</item>
     </style>
 
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">

From c9aa553b32b7e8b2b66542854b01a1e45b948c53 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Tue, 17 Jan 2017 20:54:00 +0530
Subject: [PATCH 21/30] Added dark theme

---
 app/src/main/res/values-v21/styles.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 358cb0fbe..496c7ae71 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -11,6 +11,7 @@
         <item name="audio">@drawable/ic_headset_black_24dp</item>
         <item name="download">@drawable/ic_file_download_black_24dp</item>
         <item name="share">@drawable/ic_share_black</item>
+        <item name="cast">@drawable/ic_cast_black_24dp</item>
     </style>
 
 
@@ -27,6 +28,7 @@
         <item name="audio">@drawable/ic_headset_white_24dp</item>
         <item name="download">@drawable/ic_file_download_white_24dp</item>
         <item name="share">@drawable/ic_share_white_24dp</item>
+        <item name="cast">@drawable/ic_cast_white_24dp</item>
     </style>
 
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">

From 616a721bba57be64ebeaf0c37fd56a6faebaaeb2 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Tue, 17 Jan 2017 21:43:30 +0530
Subject: [PATCH 22/30] Added dark theme

---
 .../java/org/schabi/newpipe/ChannelActivity.java |   2 +-
 app/src/main/res/drawable-hdpi/Thumbs.db         | Bin 0 -> 4096 bytes
 .../res/drawable-hdpi/ic_cast_black_24dp.png     | Bin 0 -> 384 bytes
 .../res/drawable-hdpi/ic_cast_white_24dp.png     | Bin 0 -> 394 bytes
 .../ic_file_download_black_24dp.png              | Bin 0 -> 148 bytes
 .../ic_file_download_white_24dp.png              | Bin 0 -> 163 bytes
 .../res/drawable-hdpi/ic_headset_white_24dp.png  | Bin 0 -> 350 bytes
 .../res/drawable-hdpi/ic_share_white_24dp.png    | Bin 0 -> 397 bytes
 .../drawable-hdpi/ic_thumb_down_black_24dp.png   | Bin 0 -> 269 bytes
 .../drawable-hdpi/ic_thumb_down_white_24dp.png   | Bin 0 -> 280 bytes
 .../res/drawable-hdpi/ic_thumb_up_black_24dp.png | Bin 0 -> 262 bytes
 .../res/drawable-hdpi/ic_thumb_up_white_24dp.png | Bin 0 -> 277 bytes
 app/src/main/res/drawable-mdpi/Thumbs.db         | Bin 0 -> 3072 bytes
 .../res/drawable-mdpi/ic_cast_black_24dp.png     | Bin 0 -> 249 bytes
 .../res/drawable-mdpi/ic_cast_white_24dp.png     | Bin 0 -> 251 bytes
 .../ic_file_download_black_24dp.png              | Bin 0 -> 114 bytes
 .../ic_file_download_white_24dp.png              | Bin 0 -> 116 bytes
 .../res/drawable-mdpi/ic_headset_black_24dp.png  | Bin 0 -> 230 bytes
 .../res/drawable-mdpi/ic_headset_white_24dp.png  | Bin 0 -> 238 bytes
 .../res/drawable-mdpi/ic_share_white_24dp.png    | Bin 0 -> 268 bytes
 .../drawable-mdpi/ic_thumb_down_black_24dp.png   | Bin 0 -> 195 bytes
 .../drawable-mdpi/ic_thumb_down_white_24dp.png   | Bin 0 -> 202 bytes
 .../res/drawable-mdpi/ic_thumb_up_black_24dp.png | Bin 0 -> 181 bytes
 .../res/drawable-mdpi/ic_thumb_up_white_24dp.png | Bin 0 -> 188 bytes
 .../res/drawable-xhdpi/ic_cast_black_24dp.png    | Bin 0 -> 449 bytes
 .../res/drawable-xhdpi/ic_cast_white_24dp.png    | Bin 0 -> 460 bytes
 .../ic_file_download_black_24dp.png              | Bin 0 -> 144 bytes
 .../ic_file_download_white_24dp.png              | Bin 0 -> 157 bytes
 .../res/drawable-xhdpi/ic_headset_black_24dp.png | Bin 0 -> 412 bytes
 .../res/drawable-xhdpi/ic_headset_white_24dp.png | Bin 0 -> 433 bytes
 .../res/drawable-xhdpi/ic_share_white_24dp.png   | Bin 0 -> 496 bytes
 .../drawable-xhdpi/ic_thumb_down_black_24dp.png  | Bin 0 -> 281 bytes
 .../drawable-xhdpi/ic_thumb_down_white_24dp.png  | Bin 0 -> 296 bytes
 .../drawable-xhdpi/ic_thumb_up_black_24dp.png    | Bin 0 -> 291 bytes
 .../drawable-xhdpi/ic_thumb_up_white_24dp.png    | Bin 0 -> 307 bytes
 .../res/drawable-xxhdpi/ic_cast_black_24dp.png   | Bin 0 -> 649 bytes
 .../res/drawable-xxhdpi/ic_cast_white_24dp.png   | Bin 0 -> 666 bytes
 .../ic_file_download_black_24dp.png              | Bin 0 -> 173 bytes
 .../ic_file_download_white_24dp.png              | Bin 0 -> 197 bytes
 .../drawable-xxhdpi/ic_headset_black_24dp.png    | Bin 0 -> 586 bytes
 .../drawable-xxhdpi/ic_headset_white_24dp.png    | Bin 0 -> 610 bytes
 .../res/drawable-xxhdpi/ic_share_white_24dp.png  | Bin 0 -> 698 bytes
 .../drawable-xxhdpi/ic_thumb_down_black_24dp.png | Bin 0 -> 395 bytes
 .../drawable-xxhdpi/ic_thumb_down_white_24dp.png | Bin 0 -> 423 bytes
 .../drawable-xxhdpi/ic_thumb_up_black_24dp.png   | Bin 0 -> 410 bytes
 .../drawable-xxhdpi/ic_thumb_up_white_24dp.png   | Bin 0 -> 434 bytes
 app/src/main/res/drawable-xxxhdpi/Thumbs.db      | Bin 0 -> 3584 bytes
 .../res/drawable-xxxhdpi/ic_cast_black_24dp.png  | Bin 0 -> 869 bytes
 .../res/drawable-xxxhdpi/ic_cast_white_24dp.png  | Bin 0 -> 883 bytes
 .../ic_file_download_black_24dp.png              | Bin 0 -> 209 bytes
 .../ic_file_download_white_24dp.png              | Bin 0 -> 233 bytes
 .../drawable-xxxhdpi/ic_headset_black_24dp.png   | Bin 0 -> 786 bytes
 .../drawable-xxxhdpi/ic_headset_white_24dp.png   | Bin 0 -> 838 bytes
 .../res/drawable-xxxhdpi/ic_share_white_24dp.png | Bin 0 -> 938 bytes
 .../ic_thumb_down_black_24dp.png                 | Bin 0 -> 496 bytes
 .../ic_thumb_down_white_24dp.png                 | Bin 0 -> 533 bytes
 .../drawable-xxxhdpi/ic_thumb_up_black_24dp.png  | Bin 0 -> 510 bytes
 .../drawable-xxxhdpi/ic_thumb_up_white_24dp.png  | Bin 0 -> 542 bytes
 58 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable-hdpi/Thumbs.db
 create mode 100644 app/src/main/res/drawable-hdpi/ic_cast_black_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_cast_white_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_file_download_black_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_headset_white_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_share_white_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_thumb_down_black_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_thumb_down_white_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_thumb_up_black_24dp.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_thumb_up_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/Thumbs.db
 create mode 100644 app/src/main/res/drawable-mdpi/ic_cast_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_cast_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_file_download_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_headset_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_headset_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_share_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_thumb_down_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_thumb_down_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_thumb_up_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_thumb_up_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_cast_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_cast_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_file_download_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_headset_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_thumb_down_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_thumb_down_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_thumb_up_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_thumb_up_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_cast_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_cast_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_headset_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_thumb_down_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_thumb_down_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_thumb_up_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_thumb_up_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/Thumbs.db
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_cast_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_cast_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_file_download_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_headset_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_thumb_down_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_thumb_down_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_thumb_up_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_thumb_up_white_24dp.png

diff --git a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
index c8beb31f1..71e02c197 100644
--- a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
@@ -74,7 +74,7 @@ public class ChannelActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this)
-                .getString("theme", "1"), "0")) {
+                .getString("theme", getResources().getString(R.string.light_theme_title)), getResources().getString(R.string.dark_theme_title))) {
             setTheme(R.style.DarkTheme_NoActionBar);
         }
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/res/drawable-hdpi/Thumbs.db b/app/src/main/res/drawable-hdpi/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..aa501b8625b11caca2de09a05ba07f5b85be43b2
GIT binary patch
literal 4096
zcmeH|c~FyA5Wqi(C}$EN9HvM>;}}w~hBFX`LJl#4K_W#wk$@OckyELt1vSAykz)!%
z0lDP{ArxWMP%s=-F0DnVj*z5?RY0Sq1xrZZS7D~ZwA1U49^+<y-`jn8U-rG-eVc)P
z-O<8&tOQyjE)W8mS871Ze=)BDbeNw74MD0vf$e#vQu$^Qf`Ix~{zDN^fW5-`gINZW
zs0M&@4%=_#{~rN1bQFA|ATx*og@Q2x`f%|o|Dn+kRLo+O5Wn-r3q)Lhe%M_VcwO8=
zW3h(pAbZFkJOdyb$N>t3I1m}=!C+<s(Ds8lTky?q2@!OmMgQ>lTkDq2qZb<4qW>VU
z3)rtUU_bC20BjDh$V*>bV&ngUfB24_gqtUjMgOp067WU>Cx?9p{v44&aCTVdyjlD!
zPjG&f#XkH;&yNDXlfK{|4g;*hIf3s#eDC4ZtN^G3Gys|aEr2#a2Y>{?>%d<Cqzljk
z=mRhS1ArmG2w)6Y33%H};LQ9x1<nzi`xyW%NMg$#*+I>0!B&>LjwTjPy$*8|oef4j
zj5=H#5-2MR3@VXqcPdodXYwsDmK|{0;s!zWDOz&@aDf*w>25xL?vsPJb>hs>4DUug
z${n_42iuZCsn_Ryj?Xf?>9tSJvX18^T{F{HbG_V_TW@INl8{ZbcXY6Mn!_!2ycTbU
zJVREOh9!lk3!gqq+L<U6opu^)Hk7R&zkA=-++#yjdS<DIpqxX(ud9sFW(r<g@x^q7
zDUDiG*@5==nKqUth8WT&${&;HyeNIdo_gHj3c1K`u0X|g7uDH1C?P-Klx85<EyQH7
z=(W^+XJGx$$YT707VcB<SZ~8_w{fq(8$VU#Li{o*9wy$HxZ^&JcM1$eXbnxR!R1md
z$~%l|x~l#Ba=U$2LqmRRdv}WG;>~6_+sX!f(fM5Sp_TdPQ>sUX9Vx8N@MCSUE6yoK
zWskD+BKz}hq_hZDGgO1Dvt8zr9YV0N)8jGba-)-CGZeWpr30aHNKS2NZFd}eA~RjP
z^Xq-aRS!c5xUlXTmp~z{cjv}CMWqQDND>Cg$cr`jqCWHc0-HU}g4vm*udu<U*rV<F
zGpNY!64CK0rFqq1I<1#_(}0|OF^lH(S==;1IpnlgW>6b&m7l}oCxqh^b8TL)&+p*+
zJqlHAE&9Rt-UIJPU-xTVDD>nC2e@{%9CV9A%KV4nNkYF0$>T!#mA-Rwtp~O}NPKF*
ztuFiT51sdJx9_C-y50)UZ5&M28!Tj76?bzF;`l}DD1<u`qjCJ9grK&y3heEydmCa?
z>6tes%H1-<kk1>ouV-J3jmW*C#SH4$BE=kgdZZ;^Z17!VqKtbw&=Ql5lCFO}>{|D#
zp7t{06R#v?GZA;6aae5cDKWjpNj*`;e{dGBGlNicp&V7t<yDP2D|XN(R|~fCt#A>W
z2|@j_6nsS3#)ij*UNq<G+=|)iZr151dl`ED=KdDnKp&Nqo-)2*?c9y@BsWN<*)+#Z
z1pVE<KB+bn16@*{7$>KMR*bypcxdsG#l&BNK1-^ts%iX$3D@Q?Yjv^yPAt^l@@=i@
zETfEpzg>U$h5EaA?GVNrlTfE?D{@`-AZ`><uTJ2u;j-y&$=o%>Sp=0+Rw^Inm2A>y
zm$2V8_okoa737(ToN#WI8MaJ}uDI)moScz}aJ%8&DHgkD#mH2)@Y=+1Y+uhq9W^z(
z2F}zDf(yT<nJqAx;nlq`o%d}o&kFa6u()@;EJ@!<?tiprTXdPvSB&e}n=h8(x~@n}
z#0Zl1sTeE1`R<L|E6MNO5?y7YZVQSE##kiU2eLC!Ix~s5FxB@YE<LM^O2(s`)lkK+
zXE7r($K7XJu57*CBt?tbWSecVMp0@Gqb%p-Vsi3jwdbSiwQP<Bw=;C^oQvJq8Xx&|
zLFJe86r>D!y+Uj<8Dq5lfO~YO+P9WDZR6zgu>*t=p3&A;dShX5RX~Zy0i5)hXSjFM
zpj%z#{#7%oUcv5Zr>`5_)UHVnu9@N%H))_GI&<;0bL%d-3U%Kv_J7{d!ET}|Y40em
zK5_V{?Fje8K;4aPoHU<@4fmUI(WQpZNUJz|%4{d7ys6}X$&v%Z?$<9I%80XY=7nSr
zSnWTqE%a#j)3&ia8r_z2(&}PpxpZa7D}@y$@qU4jq>YGi;Y+kne2yDUGY;;dpfn7Q
zyew75tJi$|ia0ny9bcERDNKY-;Rsr_?%InFZyf*f$DB}HUq3Nz^knIy&gxyE*_kY?
zqGOtPu&*(9b?-A_Xym6x8BLzAX7!#IYrab;Peac`u0)CDWGa@pv?~8h2YtKtpNzmy
DSduX3

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_cast_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a35e1c67252bcfaa95f62844c2276274d1073c20
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003;Nkl<ZcmeIz
zKM#vh7zOa(HBgO)Ncs_o#2`pmZ4A|hNqhsr#^$X?jAECFr8Yw+X$+(@@d1=HY)p!7
z{#5ehE(Xo}XKQ-Sa-Ms0Px73TyssTfBIzrPYH+A80VEUa2AoJh-?||$0!0k7TC2_C
zZ2^p87^#E&cI%A*+h{bjvM_bmS<S=FeD9|Hjg2xt8PqdM4mjqD$G*yD9@*O@?3Qaj
zXRDVw&00HXoULBjSGBco-g@XXfLs3L1#5==!coBOd@`up+RA0X)7)UIN^6ImH}*3Q
zf4c+@`4aPu>S3SoE{=aV0<On2uhUxBJT9i7Wf{|%@~wSzUmKkCE3Qs~C!z0D3;VS;
za>yQltD&C*r9S?_d*DLoH{f{a4}kT5+56XM0lJ}=pcDH0W+Tre;GF#X1$(lFB=m;W
e3O&gVrSKP|Ls9B@&sxR+0000<MNUMnLSTXsc(Jnp

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_cast_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..60d3915ed46a952ce7197b056b663eaec7d8a095
GIT binary patch
literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003|Nkl<ZcmeH|
zzb`{k6vy8)P@*9ce*%#h1PQB+q1rHs|3I*@dDVzf>=LomX6Pi1fpjMR03{6@lcJj+
zA367)yf8HS?%f)nvz(Kj`%Uim`_db<#y^B)i6}T!o-82&L4e4V@S#L#g|hfEZ-pX+
ziqq992$2;kAQT83O3${vkXAbi<!Ml(%r?{BX2;yJPPey^@<7f_D5RGWmN?`Ylmj|_
z%ucbwBbIa0eyR0Q#BxDb($rqKW}nIU=MBE}f{tdNF{}%lSaPnZHCWV@V@)uXB((u%
zDe{i+$%0ww=Lumgx!GgfAiObT=2e8MOKO8u5z6{8)DfmyPwk#vdXRpc4}=Lb9U*Kb
zGy77dtjT+(Uq(39LoNRK!wxddAzYb$6yZ*Vnv?l0R8yaXy6MvhuYU-g=mW`2{QSz)
o@uLs5Z+^9iO#Ec~SDOoc17a%6s4F~6hX4Qo07*qoM6N<$f~$+LX#fBK

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_download_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9aacea4c67e78f5e6d75b133befa380f6d849c2
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8w5N+>NCo5DOB;Ea6-1Z=`wwaK
zlr7#Ec`0zmrbkLnzs~>VT)6(!jYHeM3V+#XxRBFz+79ba7X-_-E8Go47Mzgi>REWg
wMe|>k`#dLBo!|pTtSxP|xh8TPw&^vD-tvEwul@ZBw1t7e)78&qol`;+0AD0DVgLXD

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8a2039c583803eab552eb2ad15248ad4f306b14
GIT binary patch
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8mZytjh{y4_Q*ZMgP~c#YJsK$U
z)~(q1m-m)lF^^vy&zFBx;@>#sNTW$&#91{bH;=%sZG7QZ>uQBcw?@Ce|ClF7G156^
z#Rt_}Q9HRs{l8sYa>)1&$3+cMLFMTJXY2PZ*sH$V@BeR?lj;@>g(qYZ*L3k@0BvRP
MboFyt=akR{0D4_J0ssI2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d25d3888e1a31b389b8d3d47da45045511e54a95
GIT binary patch
literal 350
zcmV-k0iphhP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003cNkl<ZcmeIz
z&#F>U6u{wqFExpTXqxsMVGg4E1clKkXcRs|iijYcdC*iEMQ;!~kmv#I557p4qddp2
zaV-yR9Y}=hH(ZMk_GqV*jD{;c0|Pw|-IVI9TU_dz+X8^Cna3^;fjU;|=9_jdG*kg9
zOH+ly)Mq<Dsh<PA0jy0lf7`UY@&oYtZ_p61a7Pkr`UrTb9@0^Pcdkh_UH2Z8?$tq;
zR$%cb6R1z%i;MkG7p%jhVl5l+Xg@Ru6Dgwtd=McGTU44^&|N$HbR$AnU@2wx6+DPg
z4@|S6x8OyD2B64>3eb<x7>qNSaR2W^fQZJMGxR?}qobfvgq|M-J&Vw7>w}^1Zbc}0
wsyqlPJ*oRe?wi|WK^rq|DMH70hE5Ot0svnshs5?PBme*a07*qoM6N<$f;$6_DgXcg

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b09a6926de5aa48dee59265aadac32da236f9e1c
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00040Nkl<ZNDb}5
zJ!_Lu7y!^GRCE!EE`AIm77ES^X=>>pxai;{B2*!N!D>LzNpR^R2)fik{R2|aH0bP5
z*MdarD7a}-Ez;H;8^R0acFB7?>Nyer70h^N-MY7?BcJR3C~UbFc^uKRQ`h0hp&@lM
za=0&bFUnK#Sn5WUrS5~&57j8c2`}{x^lU0@xf-K$z+Gzw`kpzeuI-nfmQ2OyT(N5C
zy>l@-b#t1gVw*GChQ69riBYL)DYQJYY2deq4n`STc6((!%2Aj4=wg&-PHHZ4XiD9R
z9L`I1T#6jpc6)6i%2KtYuxQ?fferHxMOo@@yJIr8nefKYHw~583zvN|v}`i=!hTIX
z1AQ+XH*Uda9ScrJS&n(GZ(vPNp{o|<sacj<H5TQmcpx<sIW(kZBZmu8(~-kIU+mN|
r7J1Zk6}~$g`JD39iWN_sjDN#l;H)=zHLhFs00000NkvXXu0mjfjk2u|

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7807e4d6848afbbb8576aafb0c54a172c110666
GIT binary patch
literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002gNkl<ZcmeIy
zA&$a89EI_(2?>HTkQEgu1d@b=8c>uIU@^D~WXUAp2`3?ho&kqs&w<$8q@tNME1ITd
zI>{4={hs@apPCH+dG|qrY21z_0RRw{?h%!yd}AFu|52uNGgNwDTP$`#Gi<A+F6i14
zGOwYKLIWMK3aH0Z18uMhDBx2A&9NFN(?B7G2HIjZ(BbW%y$VWHP@gX^C~f{BC)_=r
zzyi+(wakS8&sH@|Mi=i+8U}6}ro)edfsuxRwT6LI!@!VS!2rbM3I<^8X5{?>1Gij@
T5Tb(C00000NkvXXu0mjf{+DQ*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3be775a52e51afe3a689869c155f3a83a8a2f976
GIT binary patch
literal 280
zcmV+z0q6dSP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002rNkl<ZNXPBf
zu@1pd6vpv3kr+IK7z`$ZQ6kZWNj-tpV(Vb6G+`G{BBIY=Gx8h;BnJ7M6d_IP-V@(o
z@V{Gg?{B#`r;hVa87c@6<*o_(a34Fpx9?t>Y2yS_%R42<UqxwX2b+8YgbwTqP0-pB
ziatW9;>v;M00BY?2M#m>2oPNCIZzkiKrsbUT)Y7q0~~1fbI_Cp1uUqHqY4UhCnQ?f
zDxN@3JHKn0%<4I{?V&*i6QijAqbw+lKpPHIz?r}Z)Sxf|4JnL3A%zjBjthZFC|{`W
enS^Rm7+p7Y*$4{D-5G5F0000<MNUMnLSTZo<YyQF

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ffe4fa78cf715495031cb8fb34f61f47ca675ca
GIT binary patch
literal 262
zcmV+h0r~!kP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002ZNkl<ZcmeIy
zF)qV#7{>8WJ8_3HSUG@*&;uYgtHF%Xg8yi66k?KCU4XcUtp<|DE0!+Ow7=wu7(CzY
z9X{jh_qSj@!#sGmlVD2uu$ExHJIgTTFvFD93^USCFy%4Bl<N#r4m7UsUisOI#_g*)
z`}AZJV5plk1Q)8IHv^zkle)>JrIQqNnS#1M2OVdivE>YOO9tA`KrdvVqYU(FF#}zZ
zfX0?G&<)d}mN&9B3)-8Dd1e;Wb2pP2*#MaSA?ew5uAADafyVvs3+SC(FR20pmjD0&
M07*qoM6N<$f-lf<4gdfE

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c21a4643d7c46adc54a2c04b37bff2c5681abb5e
GIT binary patch
literal 277
zcmV+w0qXvVP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002oNkl<ZNXPBe
zF%AJy6ouhO#U4;-S%8RO0f<hkP@~jfN`<8ml|*X;#6ENsBon`aVa!O(a3Tulb~kxn
z_3km|+aX3y!z?&ZQ7`~UvI+*Er(vL}VIZSnc0?5nEHw;_H4HSuGEwF{OFAr6CumNr
zC^*l`Shpz~V+;erWKZG(S+1q!+XP8R1r1e@^>a{L1KFfB(A4=ypF$-Kw7DO|XHZK6
zZHa53k^9!)hisA>X!6)Tekf>-6kkELK+M|Phkhu+>?N}!?}dB~X$%pn^j&-Jbg!-W
bPl%iWyIBUW7DL9800000NkvXXu0mjfTZC!=

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/Thumbs.db b/app/src/main/res/drawable-mdpi/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..8c7eab93985b984667cc2a50251a067bec66e604
GIT binary patch
literal 3072
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt
z1pWfu3W`4vW`V}#5OV&gQz;CAAclM(EMZV!aAn8?(nSoFu&hiJEylnK&-3uI0f$Zn
z{#p&Wf=i6dK=}ip!UG757)%+=7~&bs8B7>b84?+c8Il;%7*c?IBcOOPkZl5l1`x$q
zNG%2?Mo<udj04eFlwcLAfjSmue=^WM6QJE7`xAlonE|m8&_%`!7GPIlH3TRKv>)z&
zV(kZ&sj`Fu3zvmh#6kAL02XPyLLg^=!VVNCp#0AY#GtZ(9Y}KkF((jnLB(KpjMBp=
z1SEiQ3yS*`XnL%B9(K`v8taSB06%wLE-6sd^Ll!?1OaJ~QV9-F;(btV`vXWZ76-XI
zF|0c$^AgBmNq6*hWMJ6X&;2J6n1~qpJY5_^JiOmd_4Q&llyF$Cw<f{1L*t%f%$5ok
z{YA$GY#akWs43Ytzx66y`GfhD+x^*U3L7)6*1C$<emIfxW0L;l8sp%<rn)vqxMd!)
z?|Uq8eq(#_=4R$UIu*UQZ*(x%II8bBnrxD2y`x*bqWzf7W4m)L!beZuo#lJx;z92o
z&o2K*^N!~h7X4Q3>GWK;$B>u*io^EQTc?7zeUOvA{naf+cgw`Z7v?>D{i8_jj@)sN
zImt@X7OnmuGiy_O-`<tgl52{a*GyTKvmp8Yt2j31lDN7a|ML&7d!9Df{wrpu*yHK{
zSXQ&RUSjcI7~69E!nGxwe>!!%?6(Mi<o!1Lk=7&c$=a?z<vuqo-_fW2k2mxytDK+n
zlZ&g2?SUc1;OXk;vd$@?3B-nlKPxo+FD%*O6D;i>h9&$JfXWrX;a^-;^##bm7yb<E
zLE#_a{&tEXUz34^n>0JSoBjfB@dG!dD;fBoJZY7=J5wUYx7Jj)OQ1fgUF!4RC#{!i
z{su8!;Z$tVI9PrEk>vKmtV5H01V!XNw3XjE`clx_=w`r`2b}CYKBsn?8@mQvdT45*
z)^kd7_RO4!J;#*4{W!N;=B&?})6K2Ydmb=9=Xm;X<=QjHdDlGpYM%K0Yn&sOYV{U7
yC*#keB3FO&25YP-7FZe(^<G2Fsl)#8PIawyuV>$p+z|)#7fJwu_@jVkApihykI&-(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_cast_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa5d6cd2ab220a45e34d288856b2286dea446096
GIT binary patch
literal 249
zcmV<V00#ewP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002MNkl<Zcmd7N
zJuXCX07da%<r$f3D$xy#5CuCB(M=&1Ky3vRu>jT~A`&WlV3O%4BJor{Ch<|YdXjnn
zhP->)dy1o-+g3{fkG6nX3aNpJl12VYz#j{r?p)Z{qr4$vYN%5p%vrYMQp8BVykXT?
z-0L?9??#R+q3c@Q>XbCR8lY<|hO>ov>rTa&0oKG+uesqsyjaAQ*qbFhJ5k|G9Aa0T
zH#Hn%L)>6ROhA6{07N`tLA;?7AMoqGsg3&v+!~e?(WxEG00000NkvXXu0mjf*)nE$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_cast_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d62923f1640aadcae21c628985318f24263c9fcd
GIT binary patch
literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002ONkl<Zcmd7N
zKQ4oD0LJlWQk71f#8wU=25ul?>mUxm>;!Mb0XT<<NSNG#Cf!9OeNFx}@n`TcN=W+t
z3>D8ae}-@V<!q{z?B0e%)Jj)N1f<~jD-fA7cz5f}u5Kv+7^}2Pz>Gy(&cQ&hykXf8
zcY00W)xd!T(Q%1u?UIIPebF&QH5trWb&L;vv4XK~bHg5<%!>=`OahONw8RPa#Wqfx
z8V<!8uEY{<M10@q3p|K9yoeUwegY%w62JWP!6ykfi#uC<{oeop002ovPDHLkV1k56
BX><Sp

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_download_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2c845e8494bcc13406458c6ed3b1f9fd8618a1d
GIT binary patch
literal 114
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1OHUWakP60R38@G6Onq4g7<dC*
zXKZLR(dAuoqba~Ig4@Z`QCH#=XSSn;dYt#+1zy)?Oeo<!3^dcVsbKo@Y5(^F4Po$f
L^>bP0l+XkK5V;_b

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d400472fd64b0a90998ce6c5eab813b7c8eeec12
GIT binary patch
literal 116
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Yfl%)5R22v2@+fn?1dz*HZ0um
z&|dF?!>nm+mvS-{o;0&fnzA@EQ^BmzWWo}eRZ9~msAiWq$nrXiF)+AFy^vQr>(2u;
OhQZU-&t;ucLK6V({vp)>

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_headset_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d872b05d5c54f5bab40e21c182bd41f2124e4dac
GIT binary patch
literal 230
zcmV<C02%*@P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco00023Nkl<ZcmdtZ
zK}teV0EOZ2O?rX05P8uaqCw$?j8-Ak2BHV<B*Hb6Bcq{(4$8@CSQorFaOQVr2Y!cY
zjP(|_e!O{dqYj<9l=EVw;>t!WO>|nVbGP2b+NB*j8_^s1Z)hggMwA+J(Q8m@%)~RL
zu~-_|<;;h;R_Mh<&7F8uScp!|g?LriidN03_*RIhBXVf)x5|Hn!PnkkrSPyfm@2gH
geO7~&sS`)z7w37E&qCDKX8-^I07*qoM6N<$f~VSMG5`Po

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..df063799d8e4686cb29fd00c94f587b938574796
GIT binary patch
literal 238
zcmV<K01^L*P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002BNkl<Zcmdtb
zF-ikL9L3?;#ue0qgca`~7Li;i;wb`p0dXNW5y=^JtB7Tkq|h{<o$$aRLK^Y?swuwt
zmp!L3(Hm@idUo$p$@1A*Aoplg0~a<}n(DM#r>?wU?ffUu*`Rk6H;>J+Hj+SNfnK9z
z8go2IV1i}-{@saJj1%;jDwVErmta6w1!s6luti%1hxkYUr5@}LfP?`56TI&Ps|2?@
o!7M@R##<Gv%p4^6b$<|i0Sh~{%>1z#mH+?%07*qoM6N<$g7g?+Pyhe`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e944fd70c428619696e7eb6fd8787959df32a774
GIT binary patch
literal 268
zcmV+n0rUQeP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002fNkl<ZI1$Cc
z&ng4~901_o?7{BApCj@bit;Q<$`i0*;~A`Wo12pIDvENo4mcvE-5m~FYCorGPCGLv
zzAxgRX-Q?q`kGOPRIV3w$mB**&5|FvVU*Lb=R=_zWo)^}*uHZkLtS$*i#6Any09Fx
zXh~%<eI4Jpu^wfl3a_>$QBEc|F(1{8<t7%Rn!dujT}hPF)H5=4rY*yr&8W+YOH)%<
zR--N(Zt>;NsTa>qG@_iujyHwlsAj>Z++)<?N$w%)(2+ZcIwXz^474TjM}7fRtp*rs
S<DfhM0000<MNUMnLSTZhZgNxr

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa4d6ff7ee6dd1ccbd55bbc101aedd60952f4e45
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iE>9Q7kP60Ri8Bfv4@D2xmvD%D
zX7@bwv*5td4`L^dvc)G|pTPFyLBkEx7&YH!;R&9T+IW{_1|<COp4BF&(5%9n?|JzE
z(-MzM2Ye>68C1BgVykbPUNOa9eGbogMa}<b1spsq*#iWfDmfBA>jq2}X0t4Ky6{Nq
tlFERmiASF8VGEk#tW?AqVEL7SL1q@un({BzXMwI_@O1TaS?83{1OW5sM%DlT

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccb7bb76b56cd3d679ce8e5081bb9f9a63afc7de
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iiJmTwAr_~T6D0OLsK4+({J-JB
z)&Kt`L~1x_Jpc9on|;{_q1|m;{#!7X@lN-=^x^)?|Mizlauhrd*SG$!_q=@J^MCtH
zse6-_JhVUk|NoNA1hqis37@+{c>n#6e-!wCPJxk4`;tH3|1&t9vTW!QIOWVSJKu3q
z(SkOa9iIXo8C|kj@yQ^mIF8x#)Iq_WEi6x47#X~uXwMFsU)~FJ9D}E;pUXO@geCxA
C+gaxT

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..04162adc81e61d87fd3fae5a55526447c9f42bc7
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i8c!F;kP61+1!^5>5oZqgbbYet
z`7fE}8N}CO>>0q<_R>YW-AVb<l>Z3{s!ME`mdNn=3!44sjWJZKIr@M<j9Iv0!^cC@
zmt_6$FXlb(dG&(VthW0+mzHEka86P8Y&Ol5I>(Uec}bu@_OSMx!ZUrb&GrFY!9Tg#
d<l7E%GqCIP)ODLKy9RUzgQu&X%Q~loCIBlfK4Aa=

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..10a6de71f3b22ebd318c8ded998652cb9a545ca5
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iW=|K#5R22v2@B+Y$p5YXSf3U&
z<^RwB|Lb)#PyPQt-*eWd|Nk$02LJoNUoi7j{hxHzB{oc+K>6hyv;RM{&-?IdzrBl~
zh{EQ=hUrVPe)t#jp7*?Z!E09A{r^inFK-YM`*tL2gPQMQNtZW5%N6Bzw}tO`^uyk|
mjQ5{|rq72*`}q$)U}XrHpqZZ<rgs4790pHUKbLh*2~7aElv4@-

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_cast_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fe4879df5e39609b72a6031b460a10232a599f0
GIT binary patch
literal 449
zcmV;y0Y3hTP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004qNkl<ZcmeH}
zyGsLM5X48p1hf;ohzNl*r4Sntu`}995LB#0u}Pu-gP@4DVz1((Nz}$ir=1aeG@_!d
zF9;!#yij5@E?+RB$?aj`%~mse+>iTi_c*w6rKSL4NTH}yuh>DL^!7;<l`Cl?VhnX_
z8={mWfHXv(k(PMBe+6&>)E@#|KmiF{V;6JiM}uQi#L8k5eGURx=LkCpU>(4(1@NE|
z?HIul?n)3T4C_x(C)V(0KxUj6(>ClIh(%}iU;-KQDeUgSBaX3v9@GG$AfDvXA+0I8
z#W-q>qk5Lt?bjRAI4tROAj@=5a}Ux8NpDipf$9NuXh9e&$VsbUAP$+G*`FdGwv4B+
zm<D7oLK<Tl!8_Y0^19cVZ0PJkL@pR((j{No`sx5VoMIYYP;yW=vKRMEdhJZnC4BVF
z$TRC^vP?f~Z%i-XVY13(o__SpA9JNYzpN=HgY-xALHer-0MT-QIFnZT2l^)ZmtO-C
ru*v~4OuY2@Z#;fDoG2`~a;2mXUz}J(S%hjs00000NkvXXu0mjfB_F>T

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_cast_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5f7c14b3245814354271d6ea983695d60e3b5a0
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004#Nkl<ZSi|j>
zIZH!96osQ;0@{gPM1(+0DQF`ic1Al1f{K+WHYxN!2#Q!M_9`xoQ5%;|J0rL>qN1%E
zgpf!!l+PkJlSv3@UglN4)15Pq`IvX_9meHy<j9Z+5FvpneR4pcbo)4_71t0%utWPr
zK*AP4vIr0vt7!Rt4&WaEjNc0mp!y=`h;h#$iwx0ZV;2FCW`{vL0eM{$vKIhwg3lDd
zO*5U0v&vHmBEgvPE~1A`zBI_Z4Q)yX#~NbAmN{UWl+{yInuAx)S*D*l?Xxc46k^m=
z7d<jXz4oi#Rk?lU+BAw^t#p%?^vL8KBnhgu8I=xO2Q<(|h;=e*vz&%FmF%kKF2c*M
zb_&0G_Z8+MXkyU9e9QVpq1<dqvTbAz2&+>}O46%t+D2<N$Z*LV9_0%^>Y*?fJWDcA
zOBdbZ72ir$vOY=H#4ps=rZ>1H*^p#O{6zVS+0x?|n3ZHi{F%Bo^17=6uvZBXm84z#
zi})7tAAbhKiuZy3aY_=8_-tkW3n0m!w!I@qHR=bdA@Ik|u{Q7k0000<MNUMnLSTaH
CqsTG<

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_download_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5afb24dc5724aefabc49520b22dfcb761e6dac2
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Da8DP<kP61P7YzB1IPe^Hu$^mP
z?j?TElx@bN1%>)a=3ghylE3c2%xjXsc0z{Fyzw{Joqi?vh|k>Fb%|&7*ZgcX-Cywh
rKBv-wx%XKF1wV;r<(2c81cdTS$sUS|W!^RgXa$3(tDnm{r-UW|Z<j6$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f53cc0c62c228828d73c90f681eda0835179b0b0
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D6i*k&kch)?FYe|&V8Fv1*n95m
zR5e$DAHp{l&A!8XfIV8!#r>2YP$7e#!c^^(-Y0%@RoZ*qi`F<)`EKq{{v+@Hw5*sR
zFA(}!c2Utj$B^^;IgbBnE;xI?rFh=CsojiM7+vgNGclA;TJ|n(&Igb&p00i_>zopr
E0CTxJ1ONa4

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_headset_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2664dcde2705ebf36252d28c5a116286b9fca14
GIT binary patch
literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004FNkl<ZcmeIx
z%}PQ+7{>8G96VOKO`}$sT|iMQYZrlc5P1WUNP$7ul0~cV4uVz{K@n<cE&B2j!mX5)
zr_JzgV$R2SXw&@O?em^TW*q*BIm*=O&||=W9&PGulOqNWC2sLFbHgSMBPi0v3z!$y
zF*3n1UdTCQoQSgA<H-y;r%HhgE-qPC*yEBRlAuK<+UMV7^^2P3I`bUyjT{w|;SWcC
zJx?s+XNgzIHW?!nIeSh?5hTr-<PQj;h<u&|VI+_W)(GIxmBUF9R$30~83$h_x!MJy
zSeEPFz>mDz8WG9OUE?D!|N9(K&C9!(MXRhL7nrzG+goVWRiuiEeYJgpR!2n&m{?WY
zcWCugB!h`5wf&CPKt)_kB-QpOTAmtHvTqB_3p8V%w*|Jq7W{p|M=S+>v|6zgG|<|O
zrJ#aVlE;w?+PL_b;bEkLHq!)1vO|-8<bpm8D!BY&S=J9j;#Vzf<Ys070000<MNUMn
GLSTZSj<f{;

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7a741b61245a862d82bec218e0fd907f087d1b1
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004aNkl<ZSi|j=
z%}N4M6o3VB`q6C~wW{m^idtE_2zrCa7l=d(40@I<T7_>Aw5kY-P;;zBe?CIEm6Gyn
zbG<V}cjnG@Xi;<4-#OoK&OLKtv40WFP@qDSHeI^3v8k}dbQq=M<hel=*K80Ur2HB!
z{NjmKv*M#1p&JK`1TCMT;VRJMj1oE0SXg9OVwVegE}~94Sos&3`a${UagybbPgkqP
z^qb>+{R8u!>;lh{tud@8aC(12(w9zgD*1iAm*bRAXnjz^rC9NQ_bu6+r1s2GvQdvd
zdqG}~b}rDXTa@Eo_Xhi0TMoQ8{mET<L0S3k1OI23m3uLzh6(~XH`@J6k-e!#Dgr4P
z3HC(xu^MR#BxfX87TLFIq%DxNkzib8zp9b0KrAD{kjQ>lBO;9NhhKgq&=!1;u=q$2
z2_nI-2;M>wbku@+D1xe5uoH@)=yj9s2Nu|#_mD~M1`^mz_+Qp-YIFh%I#el|UGpfS
b`0McnR+sXvad^(?00000NkvXXu0mjfxI)B+

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..22a8783e70f01488cb1396f18645fef00c7bb299
GIT binary patch
literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005ENkl<ZSPAXH
zJ7`m39LC`{Vsa9pIEfd$;Gp0p4jDuW1v3;EM<;P`YrtFT<mRN4v(i{fh}~Rt>F8i@
z;dr8?qTnEcf<v*fwJD+Jr^_*i@|`8$e^BW2NW1=fl(<WqK7Ar;6lIGOyeF;0G1;NS
z3Ol_ckQHjU+>#YSTw1b150_0@p@+*a+28_exGc&aM`@C!DnA6=W1TD^dHLWnpGa);
zm^Y+_9M<qS!yE&zI4e=0$^z?jdCdfQ4U7FeqEF%rSLBDB{$dZ;`A%Y!`|Q)OC^1Q!
zK7Ar?6G)t=#lUk;YIq!Hg|xRch)Hy~C?6E*kmUzA*(*QX!EKu-9FRXkTvj<J8}xA5
zkQI8kY{&{NTvjQ|1~+hvndXrE5zr<}mq`lp#StRXLY@+n_{b&sqCk~-y8L9G3GxzU
z78rQRX;~x3Rlbtg;vpll#t0ACBJquD<YbLgykKCFvi_h#gEkQjD)PrTA4tSZ^Nh4v
zit<IC8f#=}$^r+e6XP}}8<hEsOI=ooa9NfWB3zbag$6EDvO)!yQQ2XZon~Z-B2Cg}
m2xN^h>MXOw6r<Yp5Bd#B8_3vA-IkC50000<MNUMnLSTYTWZ97b

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5679f360dc993f511a8c118f4e317f4be404623
GIT binary patch
literal 281
zcmV+!0p|XRP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002sNkl<ZcmeIw
zp>D!Z6vpv?@eO!1<%Soi#SM$#E#L|8cz6-kCYx9$r}hNf3rydxo$Z-iCf4-s<_jV8
zJO2MOhhf7cTTs$qJ+7g|@iY5<f8{GI;5;r2c)$X$2mvzMV4w~GPFVQ$2U0$@zz$Oa
z3GZ59g=v9DEij|i0!K^<q*Pj9iz$JGH!X07X@OD=e5nB&fQtjo)xW93N91dI%u!JP
z6F3vSeMjDt5xx74d=ByZ(B`MwJgl{OIB4_mtj#BQWgh0*JZ!XiSZeby;zgMUnDDC1
f1B`hh=SKGpy6Q4wfPRKy00000NkvXXu0mjfi8Ofn

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..709b892915ab38b046041b1c57b8ff94e4e17afb
GIT binary patch
literal 296
zcmV+@0oVSCP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002*Nkl<ZSi|ks
zJq`g;7)Ift7kV`&HlWqfD(r$4==E&GPeLI|l@+i7^)RD#e9;g>=8kzoF>gK2(_G2t
zdD*fFMx8kkaTeK^{=+Yy_AY<KWx<_@2P|;i%mJXv#Tf`)fH4Uc8=$~R3-mz<kYld}
z+MorNQh-W=2kHcjKnU0aJ!*j-2myPbJ1x)xEihLDXEi_u{2YkXfc%;Ic6=mX80XmX
znGq%gCg0zBgAe(D>i59(L%xy5wR+Iz%hJ379ckWxp)_y6TAR<k{0Y;{8&H$x4d_bq
u1~jF41M+Ny`5RGUE6m@BA}eA3&vymfb&NpnHa4vQ0000<MNUMnLSTZXZG1@p

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..76ccf695a4a7c5bd01b517cdd99660a3be3b5bfb
GIT binary patch
literal 291
zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002$Nkl<ZcmeIw
zu`b6@9L4dkwF8?K1L@)g=)x-T7UB);R`DhzO`DLIO;(=3ETnoH6FH{8NF#FF+Y^JH
z-~Rn1H<y3A9d1~5=3B%aE6%(Sw=6OFc4^Vq72do!^ybCJwE57>KY8=w+M5@rOtj+1
zyg2aY#i}>|=*^1@lDGX!UYwA;D>UjlYH}j>hDKlWolx%<Q_@v#Ah-d|z@G!JZs5`l
z?0JEE@B&9(;F-(|oPiT~XUz+g;05-*zyo-JV=wSR<^|3n9_R+=KUg0E)JY#S0?26w
pzW-)CuplZzR6J0!#k_fjeF7@2G7rnz7Ulo|002ovPDHLkV1noof>i(j

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..75ae1f5f1eab0a2970c70408e43284311e62cff9
GIT binary patch
literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002`Nkl<ZSi|ks
zy^aA<0EXeCRnTcskZIfi8d{0Fki7%_wi|asA|xbgm6j_|3t>l8Ht%+R#_uubi^6>6
zO!7X-WO8PV`Or~hL_(SW1tuhwd4Mr7_xaKx4^Y<Tp{~tC)@|Mo<QLjJ47GXqc9kz*
z%|lI_hm<xy*XE%eK3}+#hh}(Sz-!ym$9o3Y@%q*$MDX6N>z3=O0bdOe0dEI3YM`SA
zDq3KAdL$@-h89>7*8)H1r>1LQPg)CfgXg|$psEFCmtQWoz?T+SoxPv}pmpuzehb)I
z=l{sq0R7M}=mWrGZTb9jR)8^h^zQ!M9p}>}Z=yvL>>t)ei17R0wxR$4002ovPDHLk
FV1mZqicbIl

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_cast_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..454b66b62cacc961f4552700e0623d7317dfd2da
GIT binary patch
literal 649
zcmV;40(Sk0P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006|Nkl<ZcmeI1
zKWI}?6o<b-U+kbzi3&#AYO&yC(4hrE&178*4!Vd4B5KsBYw09*@lTf$aS$WeMN~xG
z#6@gXl2*h)9fVT+Um+5jCR)eCkJn@{efKW+JKH%8@8iDverG6wKp+rkPDGw5Dl9v!
zMP6}{6vW9;X4zBCk^v=huOl@>gpil9kGg;`<z46{LdCmK6)<Gv5`AtE3PM3B2>BOs
zMi2@@LFf-v<|*@l%N(N@|2d?^95*=3TK_^?Um2s@zmQggB7OdawCar0>0e0eGea(g
zA~w>)0Zws^GJl&$-K4`$4y8H4(-pN!bomR$9ZXP*Db17hnbaAIF{K6i{jQFKypJhm
zeG0*P?#5nRSF%D&{NNq;86`)Gl^8}Zd5I2JIkZ55y~H_AT|>ZaFg_tmTuD!9$Zb+L
zxXL<|VKluvU9XN=`cNiie%<{p`_2GhY>*JBvoon(wuu4G@sOpM(r@}Tmt<N@I)~DX
z@GEvo`r_`$P3ulR7`HH~O3cXh-X=S4%uQ0Cr6GTQMWzLt@P#!lgy4uMHQ0^OD~UAd
zMhMQx4<5_xnN29HzEF*i+-4A3rp_LWlh)@`ayj&ZU3$Ici<`jMEHAAmxnQi2lgX&f
z_(_EE#wHw1GN~(aN@<D8{TSoc=Mo01^{)l1=Q4X_6GkvjTc3Mv3r)A)Wrr}%H+gW*
z`n+yiDBoJ>7REm7^A=;f^_go^s6^CS=!1Mu*8hf)mId67P>HS3T4)g?WqoQ*`i=h-
jsxnQUh(I6^2sGm#Xs}2GD!@P300000NkvXXu0mjfqERPe

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_cast_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a7673fb97fcc445a9087309fe29a0c5a17ff086
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0007ENkl<ZcmeI1
zKWGzS7>94riyagyQNc)CEecKs9V`giOzK*2&_zTLQKL?-rIXmjKV3@1L5yG*Q4w(y
z7qL~zwIUAcAe7+$3X#w>r;n5RzIT@lruTgvzUN!Y`*Pnsx%=+-4)q)@aX1_fe2Pp`
z!zA-O=PVh#KkM%w<Os0E47sR~Pk>FP@wHG9+nmutli22&7OG*Jx)zdn2A9MMIUy(H
zgqDbqndO9>kQ4ezohku$xxgX%?F&Vj<tqDGZeK|AiBWp(3u!{iY_Tt-X);E)eId;U
zhD-|itfr4W9OE(pzewg9U3PLP%Ml(WYE|g57mS-2r$Lk|d7DX{qfC@JcG?{sgS?3;
z<?YV0mE1y8r6*mX1-|l{JB&~ulX&U5$RV%LWh#f}D6u2q;=?p`2$&7VhvXBK^ivu#
zo75qfSP^@1I=#D1kB*txV4Xm6#k3H7VL)xMN`*j^&1ucDH4Jcydn^#;M<fUbk(ATU
zp)A9Ek3A**;%=&w)|-AXu44ktv^w4!)QlT7lhh{(kz7>WlIVP7nVHdXKq-Z66TN<w
zNc&99vJ*%isNQ4IDJ{NGgLmAJzcev*wu{bDQGcIa4n1Y7KHln!8yB6m>ZSFi7mPIu
z>XH%B`-U$%FGc5Inn_(#PbsUSa<}M=iTZhYo5lXu0z6UM-xr->Q9mx~w>uV^Y9|DH
z#rCIL+_)g>FFF<~wimiCw%;Y{uS9*LsLysNRKagA^j3XO|M)CVmmI(y2~}8+*IsB|
zY@ZSJMvHp*pF(w}D9UfwV@WM1<b<4%6SBX414we}P!E<5YXATM07*qoM6N<$f`Ilg
A0ssI2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_download_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce97c85dfa3544a0246aa9604effbfd8a9b8d75f
GIT binary patch
literal 173
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawN<3X0Ln;{Gp4-UCWXRBZq37JQ
z<#+XSgBE;>Xqc?B^YPCZXI|4Q0T80z@JOXzdv<3r<FvU4HyKBiv7J7ba8pvpx;Zs{
y!y6u~g6rn$7P?e?7oKGEJ$uE%wtZfcRP>#1fAyL;U#1&qKZB>MpUXO@geCyfj6=8p

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..78aa591668242095017c9d5e96f7a9873fe1fbc8
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawdOTemLo)8Yz3#}@pdi5FIM2@h
zcsF};z`+CWBzDIKG_pEry11Auz9p#O(7?dR#KIx4z`kMCt2a+vCtcS%nf>^QsrM(T
z{K~l&Yj@SA9If=c^vXIaY>wlkMR7)vg;t&u=kNuYJa3$GaHnEwp`ORgIc%D<i<K-3
u_*BHt`4v49xOmI{PX^FnB_*X_A=2{#|5qp~zWe}m7lWs(pUXO@geCyry-4r?

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_headset_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..baf3ee295d5a60b92ef94ed77c52c98d1c7303ae
GIT binary patch
literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006JNkl<ZcmeIz
zPfJu$9LDkQQMm)Puo-&^GK`7kD<~8OYh$#j#RP6F5v1u27;Rg$jwEuz_n|3PLP_l+
z{4<OGK-esrA-Xf0)Aq;V8t2@5?p@URJnQrDIOkq3|Bpa1O_MdYY13iAfDUb5@|1gA
zLKQn@mUVuh|B@4)GgHK@63ZN;Epx;Y5jk4mE7~z%xJ@pq?4VO-i*Y<_&_icPms@zF
zc#KX+%qFYMQ=>veM1>mHdB7GiIw6lxcre07Lit-38RazRxWl`IQ!PfwNF~hKr;d#|
z-X}~_WMW>{FIE`B)-X+eV_sYa4WsNMlen7VlhJaMl&Z#?^@=iSjPV97@{@5=*)isv
zA+59Q8UL43STHWDOcrCt#WiqL;v4c&o+PV_$jAFL5l)uTA}jcCA1!hh2MYN`-)9IP
zhWQ{`4^dc~MT^w&<r-S#GS=3S9|@oKMe{Q(DLUfVB0epN=I<!1Ov^7iqxe*&FWRTD
z(iBHF@on4v?OhW`R`KnjXn*4VH_YSP4fo%_EsoUi?Sg1O#)^E$D)@F@w4Y#QAdW=%
zRub)ftZ0!uXpt}|3<`rzi^rZYC=3dN!k{oH3<`t7pnhS4Vyqk$Hs}B=8-)#OVdZLJ
zgX&n?D`e0v)+XrXKB!9-2Q&0?9n|FtjwX1W+n`;lq%y|~4vD=DiaDS~ogfH;Aoz#<
Y0nUy?vHX96ssI2007*qoM6N<$f_T*mkpKVy

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..82db5427b7613252c64dec1dbb782f4d987a0cfa
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006hNkl<ZcmeI%
zKTp#^9LMoHAZ?-pQhf-dDH4=Npn;@87mSMzHDN&sNn?Ei7*_^nBQa9L^C&`4NwCq4
z5TG6WlNjt^8^W($-j3gEsOEmx`*rc&pZStkZoE^W|0Xoklvrn*It@B>Xi(=JuXxH$
zG|Fu*hcvTn@QZ(S${S|T$%E1?Q^U3smPjQDTHrfz`^KYWKv{NhZHsZ=paL!WsmVis
zAk7-Rim0%{JUKF?NRc7OJ)W~gM6XuSK0qUEa<P3D8U5>-D?H{C7b`Q;FG%;`RLP?(
zHpk~4B;6lqjqc7UGK8|+FeT3EZnYm!f$k2NM8(_`hjjPA6_llg*?Y!N4!g=n%ziWO
z2HK&Ua|z|R%j{vc<pNs3>_BeE@s<uTE5rq*`GIuCB&yHd;2h~Isd%7e%!()vdxqJQ
zI3P_8smhQS&@f++j?wm@S<Lb%PrHlREql-g(mu-Lsz|SGL7E2AqF2xo(oeJ<Xc{SE
z)GKI=Hqw+GsDxBOdEPcs(GIkZwBjA~0_mk4Xd7wXJLo=A#ST<Q%6SJ}N2=L@8b}%M
zple8{cAySY$~!2H)V2eesRU*eKmim$X0f3*1rQKG0Te(16hHwKK<$BnB0JE@z(7ZK
zpv{4S%66bT0|VvlK#IMAfOb)~pb1)ugPLURL5dk#iGrHkj{A~7!H2{^yJX#dgXVb4
wF_AY=#1UokzW?q0FMtBbeE}3e0Te)g0Pux<f)lIlAOHXW07*qoM6N<$f(qLbhyVZp

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a35b3cd14af89804b7c3aab8f9b54cfe88771d19
GIT binary patch
literal 698
zcmV;r0!96aP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0007kNkl<ZXa()T
zJ!qVD901_og(Mv`O(QsD^rIgkn~QXk5@Twpx{KPPan?bsSg0t{p-SDOL$1lLgOo%l
zwUUH35w{j;J|?AR(f00!%LVheWN2Qld2f0DFTy=fL|0eW|DK9Tb2hbX+c4{Nl*y<S
zS+|TtIgDv&r|wjwXH>)E)Qv=1Dpnk1InpvI&qSnTPM&I{WK*8?NJ&ecW~5|Co@S)v
zo;+)jihdt!$TJgZIOCp9j7RYtcTHy&qi7EMT1#hYjzy7Fyz4JnxBa7?nwO$TPFj`q
zr?*r*?-yB%jzw_{yK2{dO_w|wdyK1E*V43R#&{IRA)lzr`oVKi2CrL}b=NCV1}DtR
zdf-F7Q4|%E=4@)&v1!&s>@nzymi_)U?dd3vQ7f{R9MxmWmaIiDM3IbXXy<|7Wc}gI
zD3(zTooV{g6HzP`D?0PNXQFr}b>fbfBMo!%)O?^fQn4w|-AGAGo@S(ETb^d5WJ8`i
zk&;<?>ORsJsW`0@zk4-OaZ6`@bTm>hqOLRBE*psAIi;?hzpcu;@0>~$&4^`LKYLci
zIrnAV_F@#zgsOE-E$e2C#U2B`(z4&Ks^KV)<F3i7Ij=v;<BT;~YhH`;=yzUS*1Qu@
z9>cEMwO`8>gR#dEQ>t#buIhb5Q9LKD%GxreN1uxt9@X%L{wSIr@7a>|t0nC$dn$@&
z&^LB;W=UV9V8l;4^I4?g4IA>+3`Qyrxu7A>*+|KZJl{o1ZpgC`DY-7se57PXp6N)*
zlss=oN`^EX<e`B`%jXXAX{4s#vd6ipH_|g?Njo<kiE`+3QO%<sx}Z18WYAgPTCiZ+
gI}S%zS67Mt1FO<WgNPS}M*si-07*qoM6N<$g4K9U0ssI2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..37ce6c90969e630f5f52c1e854f937617280e4c0
GIT binary patch
literal 395
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKNz!>D|;uuoF`1aa<FQ-JAV;|Q`
zzPk26Xol|9tnA|L4|KOoyOy+FXy?{4{--s37bi9?XyV(sZ6D{~pIf;X{n+O&|LCus
z`3Fh)B(I}MhJUl>OnS7T)l6-v_tcX)r_#2aWq!6-vDaXMRDZ;T)DWkJa~l#~|7bq-
zgwe6nenl_qoX_lclN6tGXC+20*eAB4?=sU@1J!_;G2B;<ZE;}M4d4a}Y;`D|Blbcj
zm}%<Ctq!?9+$I;8-X<fI>jo@i)%v)WHR||3ag8RW3}0TBWYd6EY_C=|uHxZ-QnSf{
zcheyUPVUg9&Q013B~Bk|{ynu7<$9lycg~o1+J&Qc=IBnlG*@i-vFSqWd|NCEY$ku+
z<ii(}S@^)Sd-K8dK*6mR7cM_K@HND5^3*TOj%t2fe1!4Gg+~XTvOF){Dsv-c$q~jI
m$sposY$x-E!@Ryp8|`_n6#ArpSbho^$PAvYelF{r5}E)w*|I(W

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6e0b10c6b5af42a8faf438306d1468641ff7bd0
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0004QNkl<ZXx{DE
zzb->z0EY3mh;}nrB*lW2)$A5}3szc|x)ssQ>K^FaMzkT3AR(;QYU0mhlc<#TobT&-
zBj>q*li%{5^PNx1%gf8l8$C+w(WXbT`n0K0{PENw{mohClJs>c2LVyyiZFGU4FTFG
zT-DSdrg;bmYNZEN2w5*Z=qxCRlpxl@3)HXzF`xKV7ztDdBT(SM2LM&T3)Hj%g&%xc
zP{RroWAN!f2Vew>Gx#*13V4B<Rv<RO3)HXz#T$H5P#wHL9V-w8-n>9Fkb`p2{{l^!
zfh78Fptc*R<_0R#jp%vN_)(7dJ!>gR6sgjRatzs3?8Z7@UVOjwj04&pnR7FEEgT1Q
zI5KBZlZbOKPKj3|j>M)FM`Gts&g}#_6312?iEA&;93Ms;i7hM6uYb8&a3oHKa+Z`u
z+<S2fyc=;OiDxU0#L)ofE>n)g0#8O9Nn-7b<iL?6R(UkyND?cY8gcTn>k~ypDIv&!
Rz)JuC002ovPDHLkV1f+(w+a9N

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7004fe5ba0842142b373184c59378ccc265c92b
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0004DNkl<ZcmeI$
zKTASU7{~E1Lf&Y(YhZtgAX{5|3BHHcmQbOWk_|y?FT$x+6iR6dE2EZX!>$nb2^yjz
zOOE&Gk2v4o8~7~Ga1J3ttZ~k|5~qi8&ju2$(!<{Oz@`G{4*S?6i%J~BIGHWy7W=j*
zEsil{My>qFF|M^Z#+eq!sLq0OgN@v-7Uz`(rrPqa9HXPfF;2BO#{M)pUF^^8XmJwe
zm`Y1yag2r*$2ijB7<+hco-1tZZR5Q|Eb}F_s1V`Q1?FiT3OF>xysb^1FWHEF&b+Ry
z25PE-25O*G4P^ff6hHy=q6TWHfht;{XJReTF(`pjidvvLXn{&vpe{KrP!*IwePS(8
z4U|ABMJ-Srv_K^-P?ww*s0vD;KCu?421=lmEiF(TCIuya4&EKq@^kR+ph||I1DG5X
z(aDH&Nj?h@6lnYSQFI4EM42W7=htbAG7;k!3WY+UH@$ywc~=BwtN;K207*qoM6N<$
Ef*01TTmS$7

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cedf001dea59005c5aebdbc799bb2620ac36cbb0
GIT binary patch
literal 434
zcmV;j0ZsmiP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0004bNkl<ZXx{DE
zze>YU7>4m6XvM`<sDBYbU0uC|-h-=)w1Ssn9Ryb|qLXWBL0g=pYDE`krM4h_92~?n
zY15FL??ulu7y4U1$a#an=VP5KHk3GB;E7EQ&Kh05duB_4^T<yxEGcmS&TTmlgnQNE
zz`%;L8p(k>Ee>32ap2g3b5DHxTAWW7+;UdNa-glnfeS4T9J=ImnB1Ngr_Zb#&T=9S
z)U`Nps>OkW{5kX7lDysgK__HipC%Ow=|I=yRhwcO(184EG57n=VoLIxj4G>v8fu`P
z8fd5n!h<~MuYo?)Ky@`xMGN%Kq88{Z{Apne8nUAWs*Qep*@8-1pbj%ypr~2P5cC#0
zcymxS`bA*{8a;SpP%ZAwWd$l}fuauH6coQ>n}DJZ-VjtBHzc?R4cXQL)y7XPNkDxk
z2R{X<>Ez(2097&s9Zg!tl7I@dGveHY_Of)KAfQOg(W00P6a*9~)1a63bxM<R%FWg1
c^ZEX3Uji8*RvU=+LjV8(07*qoM6N<$f?JxutN;K2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/Thumbs.db b/app/src/main/res/drawable-xxxhdpi/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..72fff2fb456772a8dae68c4864850425cd88d728
GIT binary patch
literal 3584
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt
z1pWfu3W`4vW&uVbD>OcbkQYXsN<jz&G2{bb34;QID?=WTE@G&JWo4phF<^>;Sr0E8
zaOhN!d@d_jaEXx_DDMDDXh2}ZV9H>|5YJ%FV8W2fkjP-nki?M2kOJfz0mYMnY!e_f
zfGEa7YB4Y|!t4jpSd?HD5`x-~Rgy$Oa_lG33cSiGu^$v?pmH1(C$RhvD)ZTam;;D8
zftU-3xq+Amh<SmS4~Y4J7+3``2m-MX5DNpb2oQtHkx?*oLO=o-XP~(M1&Vwi(3r`7
z`2yE2xy}GTcU~?jP}K8!dbk7u=>!nw040t`Gs-Q16k~CayA#8@b22Z19F}xPUq=Rp
zjs4tz5`lS(Wr?SYV@O5Z+qv6Ui#m$5&u1+5>%Do1p=m`&Z*Nn?jhWh_tb(k8B1b!Z
zxNAgob(nQUbVzWCYCA8Uu^~{zXGZa#za`>&-{)1Ar<={$`THEZ{BOBOw`baZ_p`9J
zzMUx1mRJ(C%jI~$OUC7gB@49XFt{InSitaP|K#@{WNTRGA8`M`w@30Pvy`SJ|Mo-N
zAGrTazIgtF%^jxWPR<L=W0==FzEpblGIWR3r#W-y9sIzMa#=BUjZ!V=_rs1GE?*RW
z*OI@mr0~=i-aCAc|1J4+ru~h|((Z*Xoh|sortSM+Fhxs#QhS1YgyymX)d8ytI*K@~
zImP@WKR2{~uz2(Ry?J@v!PgTOPv8B)?n%Ud=06;q|I6x6SRP6_(Qv-eIMMvY;p!bc
z^L~Gip1n!zU(2QCYo^|R;JJgN=+IN{|L>D3xIX23J<n2AFIb%ry@~N(ThP&2Cl@}{
zvtW64Hed()F22gh_OBb(K2X2^^wDO`n~bMl{IQTom|*X?QfJZ{@7p!PH=gY_vCheI
zJGe=b+247k&!n6_u>%VdpC3OLxXNMgna^vQZ*5rlhij?PwbL#4T_jZgWG$D?DiSf~
zZDZQJ)_-BhwW|EX3ZFeP)gxuRKE0NgdaTgCBWUJpTaM<Ym#ixneEsyuc)Glna>6Zz
zGp&vXjzrD6!#8`bfc?*}A7+2x@hV;Mm61oO@%Wl$AqS#vK5V=4O#PspqVMrNysHk?
z)Xkbw#Iaa5+{|gE-qw9>k!i1HK0GV3GGS}cocrtMGzQJhy2~B<AV4QG>bzy+F%@n7
z8}ce=XUsnwx1pqhKU^zdt&jc|>ofA6rK?L-b>=RSexaWrnwMj6_3XB|RmpEsBeY_y
zlth<YySqW_O>>ZJ^2{~bTUS2aCA(5#<C(qU6N9cLNj!O^zjEEi*$J5i7pH`D+$fX#
zX`-xITqQP*DZSoP`&xzi>MWhspx9)~s8@X4>1I>71Wxa<e1ATSSMR~2znLq~ZQQ&-
zICk-3?m5f0KVp0GV}Dk`vHI8l`+XleC8^gi9SA+O_Q9*xRYj^+X38&bnLH3?&=bsO
z4L%pDx-!r6`ZC7(3<Ym}wP*OR*YYg&-et!7gGJ$G8`tN5p-&4-a@szhRh!SCvNV46
z4aVatS923ebfzp>7%_Ev<>z<vL!L+I9WOkTo~z-1rR&0c>(gHAzJAYa>XF&VppncN
zaExg|537SDcY~1_Lu%Iy_LQYBDqRAeZqEk`=rEj$V3>kMB|eECEC;?l%IA|$Ej^^p
za3|{0gop1K{C==B-2NqHbjSZ3=X{2ku0A(q@x{ptKbR_b@@J-O%ve(VOi}(^L7m%~
z>B#|FE^=bMCFg8xn7o@O`t5dHz1mfIuJP(S7fMxhriun=`Gj@5S*45Z3_UBf;!xU)
zO`hdaK!N4!*Ho{(eZ}L0Dtpb%#t;X2kXV0C*%iB=UkkRcSbX7mD(_dIxqjl2?qxf6
zZuwcM&-(n_j?;?w-H!BX?-1Say7=%yUH|l|M&lU2O%~_u8CUO-ZUB`SC}`)Uiyy^b
bdA@S3-u4>YaPf5Yb6Mw<&;%^YMi2l1DBtAs

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cast_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_cast_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dbfcd941727c3b3d3f12fc83c48046b000cd6d4
GIT binary patch
literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0009lNkl<ZcmeI3
zO-NK<7>6InX+~W{s1%9Trh+u>OK1`8S`<k{lmsm*XrW0EMI>&b#6qkfw8no3WrS2j
z+de3XBuM`iwJ~*3iW)?Un4jav+_rk&d&gPKIOo85-sSmmm}l-i^S%cZi^XEGSS%LH
z0=Cmg4`Ce5Doi&awi1<ensBtP2#ut9fBg422Glz*g(e(BD&+p|JH}MR?JP9n7*ux<
z^cW@Z9YNSAfoTM4L^m9ztUx@l0#?8ZSOF_w1+0JuSOF_w1+0JuSb=$_7^a60v{1uw
zwvcLeCw3U)4OQ$Q#V`R;ecWW5aRQ?L=Oh8c1VsJf0_nyH2#M493=<Ibg<`V>9Ok$|
zP%i-=X{@1u{ZtU5otY&izLBqUCr)QCx9E+kFixrdqr`6RGZ{sq+Jspso6C%NDm=t*
z!Z5drTEZR*&k2|@jc(wrr-I*<ak`8NSA}L%1R$R-SA{Fd6_{a|UfO8lJiACG8Y_9}
zs&G`FPCUvp4n;Ydejd2qAU5kYN(@m=7Ve}F!V&eApl-9!I5lLrE4V&|Ivt0(J`UoB
zU!Dc#*s13<dY7Q<aqbq$Px$m4r$3W}q(DweoYM6^@RLnQ%0+IFwB;8FkVyfDxyDE4
zJr#btDzu8+x#V`@Tq+sxd<tt(*(k=m0ahe?ln7A9kjGgFqEaVPCv=#FvUu#O(11!N
zqe`Y-mtn4)S*bt?Dpy6ONDl!xz@$70qC2l<O3BpfA^;`K#&8#I7LwWsz!^DtlBs0&
z$d_n&?*oIprjqrz^JK{jObY!<;!-j?@jNZ$A<1S~+2W7*t-q}#UL|Xk7~>d{3bBbg
zqwW*eB42U@+=qc6gG%P9lE@H;JwJH@5lT_1QZggr8}3jN@<}G{4_`(7C0EJh5m7S5
zO5&dUu}z3TCoygO2$hZ{UbM4vhlB{!$0jhxIwf^oN&Kg_JY~HtAp#K!iE-nLO6rLC
zZ;HhfDeGMc5omx|1zsqrLS_92i^&naBK`uc1Y;NI7ws(i2h32`C*mv+p@AU8E)W*I
vAo_Z$I7RUin5L8Zh3~$_VzF2(7K`N{_zPlQnKI~100000NkvXXu0mjfgPMLk

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cast_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_cast_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb3539c64209c572938f0d306805f315b05c7d64
GIT binary patch
literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0009zNkl<ZcmeI2
zOGsQ-7{{-porjAMG$cf{-L!>j)!G)iDBX3@5D6h9A&^B9$U-B5kPsqnLLw%JNg!x4
zrU=ziq%Eb}K4?WMg=(A9ZmhaU6g3d4h#g<!V}4zRbH01Iv$%22f%E%Tau4_TbM80a
z|6KGO4u`|xa5x+<pn+bd$YL5<CP`C|r<VF-iayLHM=!}BffT=B1H&Z!1^Tdsw4Xo&
z_K>4q3iM(V52U~pHt~-X$YK*4Qb5NutTdcJB;^F0fD>>6PQVE`0RzejH~}Z%1PmxA
zu){iwOz|s&ba0xtDYi>MlHn)Xc$Xr}1OzkO<sIt;1iy2ZxXl6p&$vR$IsqYZo|w%7
z0Dtnn-2$-99TH{<#7J_08V=Dyno%|h<8P`>p2R6W<{r~PFe{uiKT3SaXRHxSyA4@r
zAJ<tTh|ejpA<XTilPvyxOWck$`Z_-cDwNm~r<+*Cj{$qm1Jz96$Bn`YY_iBSBlK~Z
z4?@lYd-xtdPM9-^m-&XH1h-}h{YWyrWmc3}pq=u78y1m9@)rryvd{`0lm;mDBk3|R
z%*}8l;6akTu+4jBrqPEaeA{^voj-_~C;*SCz!O!&8an696o99^i6^QVoq3YGFA%4U
z8jf*`-`F9D=e`O<=v*r7B(9{Dxxi21pjiKgh<S6oQs^iVr-_AtUXbnFh0YlhvQRl+
z;zy5IS;jIdqo#zpX10(tigh>9sWT;w9%fB;f|$<xSx2SQoH*UcRvu^J0U>G7dEf#%
z8OpRZAE8sXyXS#<ex#Mx0&ehC=mDmPSyZkSViNB#NR{uKiA7ZY72oyuQTd@zQ6j@B
zJW(xZh>ZG)I2OeUA`lP;63nCWwYH*EG<$X71ak7VA#JEEiNEj|D)N)uwSRnt|ESb9
zuOf$nc+LK4=$CCYjOQZ&Ux@9;LLRh>p?8Re?)(I{c~#r~HY$(A$Ws}4DFQia^Amup
z+V;m$8P=}Xp)wJvfDDtN0^e!d*P`-7yIvt?Mf3tgB=Q%S)yG-LFIbAoYQzFLdPv~q
zFObz|LCE!D(M3@SY%oqYwfg-$EGs7vVL1UO-~^n26L11f;D7Z*ytk_~$T$E1002ov
JPDHLkV1f?>j)4FG

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c83bffa7e4443c2f9bc5c037152366bbd2b2a8c
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeG3?%1&o4*=JaR&H=xB_ViXik240LWr43GxeO
z_}|d-YF7`CTjJ^B7*fIb_UuMphX4_Wz@K-epY(rm$rSOv5x&UEQI+e--EU&)I|8Rx
zn`YUVUt2QqqO7p8jPYX2Y1uALFv!Bh(&V7xf`I2(I$9v`=tPEz0uwjrB`PNJK1xr$
eb^X}yRc5jUbNLGR3)cYcXYh3Ob6Mw<&;$VajYK&B

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ded5652e406a8bb0788402b1ea2034968a241ead
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeG3?%1&o4*=J@dWsUxB}__Fko@OdIgZrQWE4B
z%<!L~;lbvM;Xr<er;B4q1>@VZ8#xa<@HhnOS1viNAnEC})a|0sJS72xJ-2)f?&QaR
z?3aFfZT$|bN3Ya!ZWwgOIdJDMXyKo5=w(d|$6F^2ai?7ZNyM@uS}y1~X^1JRa37T8
i%D!pbm~%M(0r%^vOJ5j@by@-4#Ng@b=d#Wzp$Pz$!&MXj

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_headset_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..974457ee1dc25f4c8e68fb4908cd1d5eb4639e0c
GIT binary patch
literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0008nNkl<ZcmeI#
zO-NL46vy%J;@{Y4iB8r=ozYF<N)W=05dA?~v@?rV85)uWQfQfG5w49OvY@3zOCt&f
z%2h-dv<W79!_}Z<C1qyQ*v#DahsUA&_RL+J&slrU{SD8XD5U}wqmv<KNRwfO97T%c
z_(X;@w-}<6ZA4TnBg~V-DPR2JDd$NMA#wV7f#b5CbCNg}SI-n*aXi)+u2DzDR58wX
z9G~@#i^Q;xZWeI@s*n7SRW;nj3ApZ1jU{co!wI3@un!9kvtITy3M??q09~X=5F<u{
z6kVL+Ixi`d{o6GT5wd|YpO9yc9%?D4mLohMzh#d<^bw*nl(sw&CrI$Gb}_l-;alQ#
zc)z~+^M5ktVFT7M!G<{kec`Nq^WvGK39phoG%uv!_d=U->*g2?U|Ie)Zs)xOsK$73
zW@#q~9V{8TXNVIN<F)mcBtdE6y<x&_0@7{#{M`g;k1@hQ0#L=GVeuphS_{j_IUk7O
z+qhxtwiAX9!*(9Ur+UMKd62N2Mb28K7GI_e=YE(TA?IDehdA=WU#E#MwIFZj6}ID9
zKaQv|!ZwMVc>>Smzv`c<CTu%c6;q$#Q7ew9%h+&LKJL6O+Y#h@KY<MmY>LUlcrtJ8
z{E_4vHH`-`a-vNSwj33cH~0_NI+1Vmo!C-GQB2>DYeS;N0ye$!fBVmf7Sq^tLrlMk
zYiZG90GkHI^vAfC5iPo~>42F28rN1tixf7=OLQ66<RO~CrUv9e>Y6;rV%StArWbI{
z5oMd4uK{e+02)98XaHAbr@sc!02)98XaEhM0W^RH&;S}h184vZU?IR}qypq|Z7EU#
zvbgpnQUTJqb}3Q;MsY1gF){%PG~>bj$OM?hlV;W<5nzo*JUSkM03~|y;T)xk1}HI%
zPsjLCu>foI5`ZS|QLrAMz$}dfCdmcTWXXpfAWxPwqco$GQc5YMlu~8=1ygWd*VB(W
Qz5oCK07*qoM6N<$g5iW<FaQ7m

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_headset_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f0b2e15443da158d9c5b8c558ab88a408b95868
GIT binary patch
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0009GNkl<ZcmeI&
zO-OWA7{KwfsIk!!ove-HjBW~7f)H+mC=eI!%%W9>6Osl}Xqmpg5w49OvcRQ8OCt&f
z%2h-dv<W8q!quQ;B{@wtj?K)!{WBkR?mhR+T|ED1f6o2Ec<vFdahaxRB$#4_eex8z
zphBHG6@H;Wo_AScihD6G$K6t6taD6-|LSi(=M}PX0wh`DD{T9c=Sg-SFvu>y6SUuW
zlY#C5df4KMu>HYnB)S2Z;S^W>%#(freH`Gr_v!To80QC~=sO<u0hpsqr)r$AM~-Q-
zq)3n;MV4t^;4QwUMyE>5Mh(byc!VlP%+rtQF#SBmM^tIoKP*NGSf$bSK-?zvzt?$?
zowkQ>gBPO$<k~#`Uu*{W1MFj)>o$bNC;)TRXw?yEOu)(Taho5~tZTqHWtyw7j0rib
z+|XQ!M_dB>S{|H5CNK_Wk~5kskaPz)pt<kKU>waTKhoTLt^hMFAO9hY!+E$R;RzRj
z9!`-J$zUAMDCfw2A`u?2g{;B^CW4vd2H8efz#v!1mN5~{OUN$i4+q#qc7%y=K0$Uj
z3?PYo;g?BA3K&JcoiDgAIA96cCMM$9LH1m5fc#heS9&7{+|Q-h^^2f@F=Tfz9_9_?
z<t`lzu#UX%r@R1$xD`9E1p^#=JAdTJJ8C`%AVEbeGw%)XwAlHYd+Y&I$UFK2-T(vC
z#qN*U16ITmCm4_OjePst1NOxddtL!=i{0O`2js;PIj?|avHPd?fPz?J+AH93vHQ37
zfD5ri)+<21M9=L3@(@jV1q{i9)E*!YvV>PakJ!Ct50DwpBU69^6rcdVqX4_?fwn0?
z0SZun0u-PC1t>rP3Q&Lo6yOVR8!JH79&i>bK+zuXS*!qgd%)|l0&Lg=veaV(s4-#>
zFnkyrz#%3GV1#lk040Wl0SwQ^0MK9|%r|o{)95Oo!CKhQE}!Agt^rCcxcG86%?H%H
z18N*H?C$IJ46l->NHuaml_GgI<iQyX5dTp?@KJyQ6rcbFC_n)UP=Esd1;b~TeAkTJ
Qod5s;07*qoM6N<$f(#IL8~^|S

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e351c7beb089e9513ef5ddaa2ac3f1a6638474cf
GIT binary patch
literal 938
zcmV;b16BNqP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000AVNkl<ZcmeIf
zPe|W&9LMpO4jIU=+#kr<FP%DBMTcGTQm3ToM~CKNv_tJD!4@4BBUh|#1i4F=#IVaQ
z*)Yl({*aX|T8f~Dywqv1=Gq8l`&AoSzoxn0@8|FPjHE;U_<n!;eSVkk+xR{nQX~?I
zME*ahrdk^j57Wam3;bh&Y2IPCHVWD}k4G_&QCejmFY^~cmPyJsj&m=^WEWkO<3-s-
zE6bE)iJh{D6y+M0J+$Ict^&=nhLgB>OV%)fi;J>`G%jw)8gjVE${JR2aaY!G0~hnM
zhG|@UElYTe3EXtc3bxQs9yfX7vVdw{;WqBh$^xF`2P*M9I}|qJ3{e@6PKArjoMZ`q
zzv59!fmanSI=PO&6?&+plSP6ovR7f^QNATeik(_R0|VqKmg6Jp6&~t1O&))jcuMQg
zz!ARWI(NwM6X$u29SRTC9OM@M7CFo&S;iB5kG}$E*e=U>kWUFR#U6!^Dg|IO$GL;Q
zdG;$z?BZ=E`Hcb|x0vJv&02@&xrV<LdZ<-+Xd#71u>wOhY7LL@4M9>gD@+_<nIIYV
zaX%lB!`~%36fWMRG>--REpnJm3KuU?nF43nuCUR}5|x-@k1XJG+|9FJHqb%=H!GZ?
zR#tEVHz}HB3FEjJmo=nuF(+%t;UXt%$l)R<Yq*JvIa$L+T#U;aj^XADcF7W&SjEj<
z-X$hG_zZV9IY5<cppieR#CJR{8+ZYaN_Y(LfGpq$9;JBP#@`=wQ={;)j|@Q;*-MOG
zviSRvgu+LhPgtc`o{wqJ8rm2m$QW%3A91?*il13#g*h(pI&rN-f-CsT@*XkSM-4~G
z;4e**D%nRp19<qGp<NpR?abiM<1F>Ek1CR+@t5HZYGfZVddcE%mgiK277p?u!wk{S
zAzEYsZHy7*0=xAuo@I(+(<Ed839jHT%lq8N7Dfm%$~J|M8jg~|-!ELFl&dt!0_qvS
zqY|@hl?}8rLnTIJ1yv+T<L+tML5yCqxS5nKv@wPYk49O;DO_~P8cyS)Pu4Jui$Ph#
z5H1E~4gI+2lQkT|MN-z#Lis%6vWIEPH6e>gP_7Qy#3<!BC#%@TRqo|7b+U^lW+~+|
z56L#RGD47Z)M+E&87A@gFOLa2w2{zA7kvyeNFPb!ibNujNTdvZ1LjD2D@E<;&j0`b
M07*qoM6N<$f~h#ERR910

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cea7381b5e3685642a7d4bd0658cb1098593078f
GIT binary patch
literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0005ENkl<ZcmeIt
zu}WKE9ES0yw82Ag5m6l6ox+g>7eU3vT|orV*;^2$bn6AQ4M__jQ0N8d;^Gh$%_YQ;
zMG@=jkdT}R=kFDW7|(Z(FMRKN1J4hE>Cey4&(F`#Pk$wT(_x4u^oTYULSCA^@;5C{
z4Ri9CDuHW2o-54Z8w73vb<FWAE&(OX`C~$NfPWb7Uv>qUVVDY_<qGf(OXUMMfE*84
zN_PU-#<T%VZNLJi4fv}Km?qK&e8rRjIqtOqTbMTBQX5djv;lQ(z!U>*zyYQV_`;nw
zU=z~@oNEK-F>OFi8!$;<8?cWl13q)B4cNf60S#?H0n-NjR0mwE1D@0Y_MUry2Y7%7
zctETUh|~dXbwEWO5E5$xpqgQRL;?$FWCmzKGK4B|CV*cgwvaL{2C3%96v%#bMh2A0
zeoTy<f5sTukF^o=FBs=T>`*%&j<oaPzjpqtc0R0Y=fijHd^pw4|HPwmKFn$7!;W@7
z{Ls#argnagzH&Ykwew+5J0JdN=fkmfKGe1IVOKjJ0&bM^0T$^g=L4+LQ_crip{tw^
muuNAuA7F_S<$OOs#XST4%E<A_S39x*0000<MNUMnLSTX(vDH`r

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_thumb_down_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..afecc66b738cc87f7bbf2a0161a5b356bafe0b48
GIT binary patch
literal 533
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z<9^g#WAGf*4tbAy<`FzT0bfm
z779uW9#z^qb&ZBuQ<rZQv!g)pb5R#TYk7y*GEo<S8iw4QpcRTImDeOC3nXVRe4+Iw
zUH4z~^_|wm59W#Ac+YOkZCt!`2Mm}W7s#Gd;2yNP$fxsA_x|t4?up+&$Cenj*vHPG
zq3oYP(eLwulUQ<us+Kk|v~ldeb-7y6@_^ad2t$E}do2IU<DykX5+*)-W5&@SBks#2
zz-GXEuVMc+hPH#!8&Y`}w68KxVC-RhV)32Lr_ubucGCvO4{SM6%rBl@lQv*K#t>!s
znXQI7|G+}i21cMn1oMkW$D|Fok1^PNJTLu0bPwb2YYe}DMm^%QC}O{}o4KQb1C06^
zvfeeUvVL$wHlT=I<kDX5Nfiq;m*0rLdfeUaX!@qEDLf13Tx#92YKdE;(p0tm3F|Me
z|8m^(a6^*VCu`|*_6u~m8}xaf{a>Wa{8Q-jwVy)PK>UC2XZz^q-ab*!y>%j=d;j@z
zF8|>ri}*$7t>Tl80r5?%{pUU}l{|O;>c>*c-9Jm`zCTs8?+E|vn$A)nj(z<nyr0AB
ziFeKRbJI^0XU);~>?z0vl0G&{JDz$AJ&uul?k$uICKtbve180B<U7XOtuGF&e0(+@
P7~Kq>u6{1-oD!M<)!Og~

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d9682036da8bcc268395e0d1bfb83efbb0d202c
GIT binary patch
literal 510
zcmV<a0RjGrP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0005SNkl<ZcmeIz
zzlsxa6vgo`37CNBqJq7Z2+=956cOzgK`a(aA3=nGrL}gNe+c>jT8pB{Zlm^sVNrtG
zT4q-hA#-F}2?WFZcIMzc_XWP6>f*mx%xXt@$wlY<cZeyMob!vDa@je*xIL~o=NGrn
z1?T+YCLD6fe~*^lP49d$^3E5}z4OIG?|gB~J709X^QSbN^Tkem^FJU~-vjS_vE`jF
zPI>45@Xi-6sM$9DDPP?4&KH~B`QoH^{x|P@@yt74biMP%Rcf%qYv(UGLJjs5t$ClQ
z!Oo)ty*axK$S7?iRKev8X;aERql#|39Kvr@*$r4St+>CZ3NI(~28f<JVC)W<xdU={
zfc|Sh00Izz0K_Bv=nlB=4ahm|4R{6KfK6|}7aHDx+u#h?W5XNJ2XDX`Z@_Et23+$7
zOlWum?tn93pJU#D5qJYS-hj8@4Y=+N_)60o&;@6}PmX&79)maFoHt+xya6}70pDq+
z0n85wa2L`5c2WA{7bj8y1}OdU1X2Mqa+LTMbkYG}m>lp3QUcm+qlEW{R$2hG8Iq#}
zm(!;OsQ~~PJ;uyXNjGCmkF%^?EEbE!VzF544;L}WD3Sg&H~;_u07*qoM6N<$f^FmI
Ah5!Hn

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_thumb_up_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f43cef8ec57bf386ee379c03ef3e8ab53bc88a69
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0005yNkl<Zc-rmT
zO)ErU9ER}|#gq`r-bxCyup)`Qlq_WFBS<MrYj%toDLw#e5s3}<$|MrDmg8k8bJ<vq
zIp>+?oO$m2@AWLMU(M?|&jf+ZW=n9iama{r{smBAR5>4@z?gDAz$@d*`2cSWE9V0|
z(4>-oN%_rb=fjqEKJ07f!@71p%xmXEzjl6s2IYJ>_c#BFC|lFchgt1>=+Vx9(awhh
z-}2j?@?k|gA11Z)p<6ruNjo3*wDVy}J0B)|$Zx4S|C?4H0J~JX8z1tANOqsxk|kX`
zz!vpbi5#ig0Pd*Q&T2y7i~22FE+}NKkB|9@l-347Mjen>2Ncx-C3OG>Fn|FJV1R%9
zL3XVUSXKWz-Kz~aQvX3SsSUU<dv{X^uu%R-x(eWxc5T4sUzbT#0Dank<G(LdX#l3Q
z0S^_9he!YxD_!gKAMi$pHlXqmK><L&HsCbudcW_0X>GtGjoN_l8{=LB-s#i^Y)83i
z=QChX8xZY$smFjBZNPKr8)%h)&x8QWQSZFF0&Ww@|DY=_KsFJ;PV}=6u7EV9*z>;~
z{$bz>2m*4k12$YvpSS~3oW+`dLUXKuARt99rYBN~O{e_o0Kcz=40(z*OD~cq!$4rO
g*=#nO&1MVT4=SGK_{4lm>;M1&07*qoM6N<$g1~$Cc>n+a

literal 0
HcmV?d00001


From 081a45b70d0707adc4e381082ad73708184a93eb Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Tue, 17 Jan 2017 22:13:33 +0530
Subject: [PATCH 23/30] Added dark theme

---
 app/src/main/res/drawable-hdpi/Thumbs.db     | Bin 4096 -> 3584 bytes
 app/src/main/res/drawable-mdpi/Thumbs.db     | Bin 3072 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/Thumbs.db  | Bin 3584 -> 0 bytes
 app/src/main/res/layout/activity_channel.xml |   2 +-
 app/src/main/res/values-v21/styles.xml       |   2 ++
 app/src/main/res/values/attrs.xml            |   1 +
 app/src/main/res/values/styles.xml           |   2 ++
 7 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100644 app/src/main/res/drawable-mdpi/Thumbs.db
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/Thumbs.db

diff --git a/app/src/main/res/drawable-hdpi/Thumbs.db b/app/src/main/res/drawable-hdpi/Thumbs.db
index aa501b8625b11caca2de09a05ba07f5b85be43b2..ef03b63ead94ffc0963446929de23a18eee00fe2 100644
GIT binary patch
delta 791
zcmZorXpq?;!n8SsZ4Tqagn&sbK8%c$6<Or16WaAu9u!<+WM%*YRuI9!V8md`V8#&7
zkO(AG7)*e?GzJ3(b0C=rq|<;b69x+g6QF*{$p=_DIQ~PyWI;|1rZlF>zgVi+xPa!=
zFilS6^WuR?gJ__DfhQwSjtPiCcCr95$XYfaW(Q&pAm#+(e?Z0DK$-`Ld4ZS@i1~q7
z0Eh*FSO|!PHz%^q2YN?h5(kHXAIL-?xVKQ<f&F0e;>i*m4)u&bJY5_^BHZ6j+v|Nb
zQRMjgogS@T&ifQDJyN)lu!TEovQ@`F_MN6H6#U%!y1aEA7i@OYcWzeV)y;L{&CPx0
z-N>i4uOZ><&qtq+Jp2;F{QmvD-GA&pJnZ<s^ZffCHqYnGZ=Ew|j#035QdeTmVK$p%
z#cQ<o&%IyB*}j2KyU+hb{VL(=_Wlh?ON2asGRi01yr{WE$m1t>_y)<-U0l0_e}9my
zI~L+}QFqOW%*b1XQr``yUg7LZI(qTt*@u$9mXx#xM~J?ADDI;=^`&R-gX)^r<QpwV
zceLhTP+$7`^)a6hv*RDA%N!9g-O=!`TI-9?uJidhe>=WkT)ZT1as2)s)yL-bU$gvr
z7d%({H7m$=stuo7VEBf<s*ShUZ?G@j<=Ogfx4*Eh@s&r9ceH;~4Dwv+mnHZ2)|vaY
zUuV2hi;WkL`r`iM;ZHH+<q_s9FWAm{QPwM@|1y5MTTPGuM)&<38Y{1O@-A>)FS&o&
zjT=AoWq0(JZGJ9s@$1i7m*#x>(HDIrdt+C9+2R$pD>=8!&#buTdRpg}>Ff&Kz6*IG
za}RcKUGHbvo2K(O!#+Ix-Z2$(C!deTF6a9Njw=32s*^}cF+bAr%KzzvC#zcGS~3EC
ze_s15m9#|lNQb}29nO#P>%3m5+8xYa@jCi&oQ=b2zmAF51eBxdtA0L?zan61X&Jg8
s;0N=^jcl(q_P=#LIN6O)ZL$NW07utx`HzveET3$S;LKoJ9LC2803GX2HUIzs

delta 1112
zcmZpWX;9c8!o<k7S&->9<0KXzM&`+iEb`VLm>bT|FSx|W%)r3Vzy>6Mz=*+=!Hgju
zNG38EGng|ZGbAxs0NH6k5d$DA6)0xHU<}kR$*48ik=1yz0SgP00ORCeELFy=Km%%+
zz~;aWG6HHg1Zp${8j%PzIvH$qGSCnZI|*da<O3`m9E?D1|AAogMHZD@ejsNO)F6-q
zhzW8f3lRSUDgrr{9f&!Am=lP(fS4PId4QM~i1~mRq)q@x3j(na5DNpb2oQ?`u^14G
z1F-}UO9De>KI0?~4uKy)9tiMh?Tme#$u)Db1cyUC!y-=?$B+p3x7SYdHYf<V25u3u
zz8Iu)G)TwQdZTdb0hJjFhy4>i`WZF0cJEdYW_4J0aLz_CW4rd5T4t8!#;;~)EVkU;
zsKD1`!SSe|yKvIxSFgLHx;F2tvwFHi?6KbSOV>>ly$wnxO<U^SxgyC>MSWETk7wsE
z-L@kxf90H=bQi5UDi9y?RpL=smYDOK70(P^T1$kPV>im@to*po^v?oDhiE4oqm=gf
ziM3qGlRxm-Om5&3;7EIVc2kVwbN|gVxH6a|K;8reUllY+*@E{^@)MtWVe$+v$9fg0
z|EBNG76}w-UoU8~&w=H3!vp4x92yzQ89^?Ny&1|{Kbf79mM{HyvvrAwaL|$<ZN)&B
z=GFys74})lJL*g|@e~m}a{T-3+4qYIO>drk=NEK_{r<a|n|HstS$*!z9bQ&e(@jb5
zA~o#V*6s-El=;!R{)61VutO_m6o%9nX<jK`-YsnPF+TrHaOv`ptFC*b4u4>gKfd9i
z%n@cop4tlCHpLjX@KqN2r}l04<UifHXu(rIL+8-PO(ncPy5tL(^dH)tkriL^ymSXE
z|KeXiMeaYgjA`DvA>j13M*{l}KK3$^5-(vjf8b}+yV#<48SDE89P5ITG&7Fn{b{i?
zt$(T<^6~3}RhR!+^F8L<v+{_{+Y0gUbobI@tS@zDAAD}nQGG$<eye!EewQr^(^e-g
z@lKb2ROV9{xb2$b`c<j2KbZW}+$YxU5k1Vac2e5fcNvSfaq>Up{nNPakNP}^&4Tue
z<KG`W8nn&nzq9n;?Jvyh59Vf6U0A<2IB8<YolVzw)XSGH6?<(cn-sg;<c(A7yWYgN
zOVV$;@9E2)+MsFEnl<x+ZfZHtX7580JjN#Zr3Yu%=uXdD@klc3^Iu)-uImdn8}cw$
z*tI?6sX8G4V4_6Y8Ebw{(cDi<|2J~1?fI;A?TyoO^{E~O`=t7lI`?y5GCPvv_Wbhi
z*?IEk&TCD4P_xwV-mx{&c{8W^N&P+gRV(w{mN`miUvJJUo+UnYo6qN;Lhl!IX=|*Q
ZDDaQLLF=K;+X+%yn?LXX^Sc1=DgZ&rq+b94

diff --git a/app/src/main/res/drawable-mdpi/Thumbs.db b/app/src/main/res/drawable-mdpi/Thumbs.db
deleted file mode 100644
index 8c7eab93985b984667cc2a50251a067bec66e604..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3072
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt
z1pWfu3W`4vW`V}#5OV&gQz;CAAclM(EMZV!aAn8?(nSoFu&hiJEylnK&-3uI0f$Zn
z{#p&Wf=i6dK=}ip!UG757)%+=7~&bs8B7>b84?+c8Il;%7*c?IBcOOPkZl5l1`x$q
zNG%2?Mo<udj04eFlwcLAfjSmue=^WM6QJE7`xAlonE|m8&_%`!7GPIlH3TRKv>)z&
zV(kZ&sj`Fu3zvmh#6kAL02XPyLLg^=!VVNCp#0AY#GtZ(9Y}KkF((jnLB(KpjMBp=
z1SEiQ3yS*`XnL%B9(K`v8taSB06%wLE-6sd^Ll!?1OaJ~QV9-F;(btV`vXWZ76-XI
zF|0c$^AgBmNq6*hWMJ6X&;2J6n1~qpJY5_^JiOmd_4Q&llyF$Cw<f{1L*t%f%$5ok
z{YA$GY#akWs43Ytzx66y`GfhD+x^*U3L7)6*1C$<emIfxW0L;l8sp%<rn)vqxMd!)
z?|Uq8eq(#_=4R$UIu*UQZ*(x%II8bBnrxD2y`x*bqWzf7W4m)L!beZuo#lJx;z92o
z&o2K*^N!~h7X4Q3>GWK;$B>u*io^EQTc?7zeUOvA{naf+cgw`Z7v?>D{i8_jj@)sN
zImt@X7OnmuGiy_O-`<tgl52{a*GyTKvmp8Yt2j31lDN7a|ML&7d!9Df{wrpu*yHK{
zSXQ&RUSjcI7~69E!nGxwe>!!%?6(Mi<o!1Lk=7&c$=a?z<vuqo-_fW2k2mxytDK+n
zlZ&g2?SUc1;OXk;vd$@?3B-nlKPxo+FD%*O6D;i>h9&$JfXWrX;a^-;^##bm7yb<E
zLE#_a{&tEXUz34^n>0JSoBjfB@dG!dD;fBoJZY7=J5wUYx7Jj)OQ1fgUF!4RC#{!i
z{su8!;Z$tVI9PrEk>vKmtV5H01V!XNw3XjE`clx_=w`r`2b}CYKBsn?8@mQvdT45*
z)^kd7_RO4!J;#*4{W!N;=B&?})6K2Ydmb=9=Xm;X<=QjHdDlGpYM%K0Yn&sOYV{U7
yC*#keB3FO&25YP-7FZe(^<G2Fsl)#8PIawyuV>$p+z|)#7fJwu_@jVkApihykI&-(

diff --git a/app/src/main/res/drawable-xxxhdpi/Thumbs.db b/app/src/main/res/drawable-xxxhdpi/Thumbs.db
deleted file mode 100644
index 72fff2fb456772a8dae68c4864850425cd88d728..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3584
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt
z1pWfu3W`4vW&uVbD>OcbkQYXsN<jz&G2{bb34;QID?=WTE@G&JWo4phF<^>;Sr0E8
zaOhN!d@d_jaEXx_DDMDDXh2}ZV9H>|5YJ%FV8W2fkjP-nki?M2kOJfz0mYMnY!e_f
zfGEa7YB4Y|!t4jpSd?HD5`x-~Rgy$Oa_lG33cSiGu^$v?pmH1(C$RhvD)ZTam;;D8
zftU-3xq+Amh<SmS4~Y4J7+3``2m-MX5DNpb2oQtHkx?*oLO=o-XP~(M1&Vwi(3r`7
z`2yE2xy}GTcU~?jP}K8!dbk7u=>!nw040t`Gs-Q16k~CayA#8@b22Z19F}xPUq=Rp
zjs4tz5`lS(Wr?SYV@O5Z+qv6Ui#m$5&u1+5>%Do1p=m`&Z*Nn?jhWh_tb(k8B1b!Z
zxNAgob(nQUbVzWCYCA8Uu^~{zXGZa#za`>&-{)1Ar<={$`THEZ{BOBOw`baZ_p`9J
zzMUx1mRJ(C%jI~$OUC7gB@49XFt{InSitaP|K#@{WNTRGA8`M`w@30Pvy`SJ|Mo-N
zAGrTazIgtF%^jxWPR<L=W0==FzEpblGIWR3r#W-y9sIzMa#=BUjZ!V=_rs1GE?*RW
z*OI@mr0~=i-aCAc|1J4+ru~h|((Z*Xoh|sortSM+Fhxs#QhS1YgyymX)d8ytI*K@~
zImP@WKR2{~uz2(Ry?J@v!PgTOPv8B)?n%Ud=06;q|I6x6SRP6_(Qv-eIMMvY;p!bc
z^L~Gip1n!zU(2QCYo^|R;JJgN=+IN{|L>D3xIX23J<n2AFIb%ry@~N(ThP&2Cl@}{
zvtW64Hed()F22gh_OBb(K2X2^^wDO`n~bMl{IQTom|*X?QfJZ{@7p!PH=gY_vCheI
zJGe=b+247k&!n6_u>%VdpC3OLxXNMgna^vQZ*5rlhij?PwbL#4T_jZgWG$D?DiSf~
zZDZQJ)_-BhwW|EX3ZFeP)gxuRKE0NgdaTgCBWUJpTaM<Ym#ixneEsyuc)Glna>6Zz
zGp&vXjzrD6!#8`bfc?*}A7+2x@hV;Mm61oO@%Wl$AqS#vK5V=4O#PspqVMrNysHk?
z)Xkbw#Iaa5+{|gE-qw9>k!i1HK0GV3GGS}cocrtMGzQJhy2~B<AV4QG>bzy+F%@n7
z8}ce=XUsnwx1pqhKU^zdt&jc|>ofA6rK?L-b>=RSexaWrnwMj6_3XB|RmpEsBeY_y
zlth<YySqW_O>>ZJ^2{~bTUS2aCA(5#<C(qU6N9cLNj!O^zjEEi*$J5i7pH`D+$fX#
zX`-xITqQP*DZSoP`&xzi>MWhspx9)~s8@X4>1I>71Wxa<e1ATSSMR~2znLq~ZQQ&-
zICk-3?m5f0KVp0GV}Dk`vHI8l`+XleC8^gi9SA+O_Q9*xRYj^+X38&bnLH3?&=bsO
z4L%pDx-!r6`ZC7(3<Ym}wP*OR*YYg&-et!7gGJ$G8`tN5p-&4-a@szhRh!SCvNV46
z4aVatS923ebfzp>7%_Ev<>z<vL!L+I9WOkTo~z-1rR&0c>(gHAzJAYa>XF&VppncN
zaExg|537SDcY~1_Lu%Iy_LQYBDqRAeZqEk`=rEj$V3>kMB|eECEC;?l%IA|$Ej^^p
za3|{0gop1K{C==B-2NqHbjSZ3=X{2ku0A(q@x{ptKbR_b@@J-O%ve(VOi}(^L7m%~
z>B#|FE^=bMCFg8xn7o@O`t5dHz1mfIuJP(S7fMxhriun=`Gj@5S*45Z3_UBf;!xU)
zO`hdaK!N4!*Ho{(eZ}L0Dtpb%#t;X2kXV0C*%iB=UkkRcSbX7mD(_dIxqjl2?qxf6
zZuwcM&-(n_j?;?w-H!BX?-1Say7=%yUH|l|M&lU2O%~_u8CUO-ZUB`SC}`)Uiyy^b
bdA@S3-u4>YaPf5Yb6Mw<&;%^YMi2l1DBtAs

diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml
index e889ac3f8..cf67d55c4 100644
--- a/app/src/main/res/layout/activity_channel.xml
+++ b/app/src/main/res/layout/activity_channel.xml
@@ -73,7 +73,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_rss_feed_white_24dp"
+        android:src="?attr/rss"
         app:layout_anchor="@id/channel_app_bar"
         app:layout_anchorGravity="bottom|end" />
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 496c7ae71..44b11f3b0 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -12,6 +12,7 @@
         <item name="download">@drawable/ic_file_download_black_24dp</item>
         <item name="share">@drawable/ic_share_black</item>
         <item name="cast">@drawable/ic_cast_black_24dp</item>
+        <item name="rss">@drawable/ic_rss_feed_white_24dp</item>
     </style>
 
 
@@ -29,6 +30,7 @@
         <item name="download">@drawable/ic_file_download_white_24dp</item>
         <item name="share">@drawable/ic_share_white_24dp</item>
         <item name="cast">@drawable/ic_cast_white_24dp</item>
+        <item name="rss">@drawable/ic_rss_feed_black_24dp</item>
     </style>
 
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 68928bdbc..6680aee03 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -6,4 +6,5 @@
     <attr name="download" format="reference"/>
     <attr name="share" format="reference"/>
     <attr name="cast" format="reference"/>
+    <attr name="rss" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 11d7b25bd..cc5eb39fe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,6 +28,7 @@
         <item name="download">@drawable/ic_file_download_black_24dp</item>
         <item name="share">@drawable/ic_share_black</item>
         <item name="cast">@drawable/ic_cast_black_24dp</item>
+        <item name="rss">@drawable/ic_rss_feed_white_24dp</item>
     </style>
 
 
@@ -45,6 +46,7 @@
         <item name="download">@drawable/ic_file_download_white_24dp</item>
         <item name="share">@drawable/ic_share_white_24dp</item>
         <item name="cast">@drawable/ic_cast_white_24dp</item>
+        <item name="rss">@drawable/ic_rss_feed_black_24dp</item>
     </style>
 
     <style name="BlackTheme" parent="DarkTheme">

From dfeed3d0eb420b9489603bd800dba026d2f4dce3 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Tue, 17 Jan 2017 22:31:00 +0530
Subject: [PATCH 24/30] Added dark theme

---
 app/src/main/java/org/schabi/newpipe/Themer.java | 1 +
 app/src/main/res/values-v21/styles.xml           | 1 +
 app/src/main/res/values/colors.xml               | 1 +
 app/src/main/res/values/styles.xml               | 4 ----
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/Themer.java b/app/src/main/java/org/schabi/newpipe/Themer.java
index 048837cec..b16ad0b56 100644
--- a/app/src/main/java/org/schabi/newpipe/Themer.java
+++ b/app/src/main/java/org/schabi/newpipe/Themer.java
@@ -17,5 +17,6 @@ public class Themer extends AppCompatActivity {
                 .getString("theme", getResources().getString(R.string.light_theme_title)), getResources().getString(R.string.dark_theme_title))) {
             setTheme(R.style.DarkTheme);
         }
+        else setTheme(R.style.BlackTheme);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 44b11f3b0..37d8a65a9 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -33,6 +33,7 @@
         <item name="rss">@drawable/ic_rss_feed_black_24dp</item>
     </style>
 
+
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 941e1b741..62d05536b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -33,5 +33,6 @@
     <color name="middle_gray">#E0E0E0</color>
     <color name="gray">#616161</color>
 
+    <color name="black">#000</color>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cc5eb39fe..2339c12a5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -49,10 +49,6 @@
         <item name="rss">@drawable/ic_rss_feed_black_24dp</item>
     </style>
 
-    <style name="BlackTheme" parent="DarkTheme">
-        <item name="android:windowBackground">@color/light_youtube_accent_color</item>
-    </style>
-
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid">
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>

From 44521a2e56e6a73b34d72e854d1da0d182de8883 Mon Sep 17 00:00:00 2001
From: 59436419 <kb@ksyko.com>
Date: Tue, 17 Jan 2017 22:35:23 +0530
Subject: [PATCH 25/30] Added dark theme

---
 app/src/main/java/org/schabi/newpipe/Themer.java |   1 -
 app/src/main/res/drawable-hdpi/Thumbs.db         | Bin 3584 -> 0 bytes
 .../res/drawable-hdpi/ic_rss_feed_black_24dp.png | Bin 0 -> 410 bytes
 .../res/drawable-mdpi/ic_rss_feed_black_24dp.png | Bin 0 -> 286 bytes
 .../drawable-xhdpi/ic_rss_feed_black_24dp.png    | Bin 0 -> 532 bytes
 .../drawable-xxhdpi/ic_rss_feed_black_24dp.png   | Bin 0 -> 768 bytes
 .../drawable-xxxhdpi/ic_rss_feed_black_24dp.png  | Bin 0 -> 1027 bytes
 7 files changed, 1 deletion(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/Thumbs.db
 create mode 100644 app/src/main/res/drawable-hdpi/ic_rss_feed_black_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_rss_feed_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_rss_feed_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_rss_feed_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_rss_feed_black_24dp.png

diff --git a/app/src/main/java/org/schabi/newpipe/Themer.java b/app/src/main/java/org/schabi/newpipe/Themer.java
index b16ad0b56..048837cec 100644
--- a/app/src/main/java/org/schabi/newpipe/Themer.java
+++ b/app/src/main/java/org/schabi/newpipe/Themer.java
@@ -17,6 +17,5 @@ public class Themer extends AppCompatActivity {
                 .getString("theme", getResources().getString(R.string.light_theme_title)), getResources().getString(R.string.dark_theme_title))) {
             setTheme(R.style.DarkTheme);
         }
-        else setTheme(R.style.BlackTheme);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/Thumbs.db b/app/src/main/res/drawable-hdpi/Thumbs.db
deleted file mode 100644
index ef03b63ead94ffc0963446929de23a18eee00fe2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3584
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt
z1pWfu3W`4vW&uVbD>OcbkQYXsN<jz&G2{bb34;QID?=WTE@G&JWo4phF<^>;Sr0E8
zaOg~E*Hd{=aEXx_Bo9hxKw!jR%3#J2&yWZtQy5Huyfg*_26G^p2&B`1EE5I`AjSo>
z7?>DA<q*sbxYVJGr-3v90nGjsp#2s=JB@%i6=*ZaJxM^G1w<K6QUzEF!t4goI29sE
zZ~@shQ2UXD$!3yjKe9!jI0HEa6eqC!4=VH7ftUk`Ie{2dHgE%J9w6ogVm=_|2V!6q
zz#s_3LO?7G#2|H}U}%Ma1Tfw}aqkCBkM|a;JFp*2Ufdbr=g!L|1xl*Co*phiKw1Ta
zIY5cyA;XLrK#H+A$lZxy-8q?;Kn_c~qpu?a!^VE@KZ(G+&G^I9#W5tp{q3~9-d7Vv
zj<4V8(dy;APvO!dg&PT5xU(i(b^K%BX}Ute&#kY^Ti0>HW+#2;W+h(TTqoY#+-Kg6
zd|LY&62AU?^!docFEPyT-{0H)$L_<!j_*6qzyD$Le9rvVIdkS11xqJ&CFUGvvpH70
zMr;4v`-PnC8~C*Q{7<YBu5Rz&khDa|^CzQx!p)1CON2ara))n_Jl(~$OZfK($+}}9
zP8W68oXCv4RVek{aOxG#zNDiUU!Hv^`D;l@YjA|<yNBXFs#9Nj=02#dX-&S-a&$*)
z{sr}=uU{YY`7k^Ffx65Q5z`$F|EjgV`0P5LpYyll`^Cje;ugp6?@@hh{x!?5cfoVD
zU$cU2r`qtT1%_|vtJ-*r{RaEeU7oG)cKZw48ee(zct`s;#URh6epzyVZ=Jbc`*p@E
zwb*#^s4wn69{v<FULIk-@`CNG7iGOd`Y+?ByVdmgZ*<?!p|SFcC+`B+^^*IS-MH~X
zUv@`t+2-dG7r*|Tb!pD0AAQkBvNv{>EnZ=}l5@-a%!+%ir*&?b&aTkyyO1X`_h1Lt
z^?sJUX*z#1?8C$F9aAxP^7&}&a=u^SsN%1rI*Ftd^CKOv{GU#EvZ^JnB_q)H=e565
zNlR3ZbohJR;ruAS&g+G$-NF17ucHsg**Ki`>zH^=Ksl<u>gVJ5D*~35mZ1v*elUOB
z_*!HCTjztoG{NBM>gTe~DWM6(#tvZVF9n+Zx{k|#jJ##}gwpiK#0N`%*4{FKA`Rss
zTP`jT+b6)u#eI$K5x2Fp>lzm(vwv)+3A#6KM5vyPI`XGc;YU*N@(W=C^D`80NY3x*
zUvvMarM2I&!m@+a>@9yEJia$`Zt?lKd;52GD!DSH7|pc%(`%k3RsHpOh2lr?nj;GQ
z7OVP?GIM5sblSB4kma=(kL6UOZY4;pzLTXPUvOfrUGiq<vr%pr7cFg{%4aCT=Q_7q
z^yJ2A-xe6h?&$paqx-5<nw(Vrq4_`fi%%@sSHAkc;_4h1=d(_SMJ;-#&v3Td+VEB5
z{|&3S$D->Jx3|r1ZEG)-|NG~l|F4e7jEH-AO#2so54&<Z@ZPQSoP7&@GB#hxFkP1<
zu+zN%Uu9wU=7^OKpDp~j;atl{?%O73_*5n&o;q&!ExRM|kl8V(Fo#oxbGBUT6}q-C
zNO$pxj7<5qMe5cX7vDT+XuHv#a!~cJ)ae;l45}x%Oxycrh2yjWzW1BL^@65X7tPtg
z?U{1a_mN21tK6OQkBELL?s}Y2m#iZ)iT{z_ubU3*KW}vYR5ZoE`~MCt`RlGZN6dU4
z%AHD@P_?@4cC!la59Yte`7Ie+=B|Ef^EcA@tx{(|o34D3mqyC@YHO9E0=G@i7WzBe
zteLa&=b96KbuZ#vh0ZI+Yd&G9U$V4TqR+_Y1fP$^rbmxvI$L^Z2*-qlOfY_P;rOH0
qBk~`u^H$#faP*GmCqGY>c??^-*R5W=Wr`;#6%tOB*wgB86a@gIZ{Fqr

diff --git a/app/src/main/res/drawable-hdpi/ic_rss_feed_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_rss_feed_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0adc29122d78b607b1ca357d6f287afeb2dad61
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004DNkl<ZcmeH`
zC7f146h{vUmx2`BUHT8F;MU9c72GLk!=>RBch=p~YTiw2Y2AGnn|b$lv8M$)litV~
z`QOKX{&;q=k(G=gG9PWL<`LT%5m6+qgV$_|ERvSaDgx8-Q`HbpnL<Fuvycs3p!7Rg
zP2h70(>P6oQgyPI(2VCY-Rg=biNFlXl*;F+ig?dG;!H*}nwRQ=D}%&8NC8_B7{)dA
z>{Ei)Q8r7J>V@<_30{yL?7?A_yw#9*DIDV(sq`t8PHKiEnC>_9Bh(`*b*d}Uy9u9+
zQ%QBO1jBeK(O39JCzXxEX_1e>l?lW+#~Pzjr`m#Hn)GbNg}Kz)X}8S<<*f>^NOli#
zAxY(BPIXjDbP|S(wx<dg+LY)l0OO??;utncnq&AS6-pGtkZQm0Vpt?IR`N>@s6T1~
zhU>QHoy6hH+29uWe#&VjiMco&v&)Kb=(Ih%_|G5CC;gWJbYTEw{{R3007*qoM6N<$
Eg5n;#W&i*H

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_rss_feed_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_rss_feed_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fb28d5c5c9fed74d52d64278870f7450e3001a9
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002xNkl<Zcmdtf
zHCh}%00z((PwLe18^o<jsu*&L)f;SwG`MpZ+*;fNoB(NYn{TT1djDz0-l&>Nv$RHU
zss~rGtZMbDY7onbZci(LMj7pvMC8CvRpq5_CxM(vQ!N^e`;;O7P3iC*aNl6u<wvDU
z&-nmEa!~yGoQlM$6u2J`)?FOj@m$(&L`m>6T>qrpzdSS)cliK%LaRm5yz|Es42Max
z;8m!vD3V+lTJXd}d!hafEQk8*LU0sM{~PI0>j3Sc-cSfOB6x=vp*97wp`I!PpRGHT
k19zOc@*gw?(5!}X4c)_XO0O_MHUIzs07*qoM6N<$g1+W_eE<Le

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_rss_feed_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_rss_feed_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7eb9897d8a6c6b6afbc14a61148c4e81ea64e4b7
GIT binary patch
literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005oNkl<ZcmeH}
z1I!&!5QV?mwh@#uYd8FZT5)ZJwQburqS_7X2DNS5xO+0yeJb~x@XYQz*-;+fAS5It
zH|a<yZ+XiruCkNqw4+R73^cAWhZ-bLgn`CIdXOa%1{(JmNTx&>Xk4ZtF*2UHtl=<E
zzH7399K?ZSl%x%-c>2wblqYUvp#>+f7B6T@97#!At{aOtbR({0q#uusNt`X9EN9GD
zL{X^iEMf$msrb$9&B1oli}KO$!42k+L^5nYCZiS?$PwG39i%pvDP}KX-sDXbM@eZ4
z)gbm$af@oE7uxR2WWt+ky#A)eOWK%;dL-Ea_(Mtx(1@knw<gA-uU^_{j(H{qnALiz
zg(4%@B-ewe$Zy(tOWRFb9aoYO6?X17X->}|)rl4}_q7OUDf%3|slrHB(3@g>B9#`3
z15%8vJahUryhz3v_sT=+x?X6zlL%NNdTBgprsd$F`-*|0&L*Ip=<V=epPBt$ZfGAk
z?YdmrQu6FHJa}jfmb=U{Q7cGEpEz{~9vm|UBV4AjsGSKo<kTy8FxVJWahZam4kuuh
zQ(xghIu6PYjUgbVoWX?z%#r8Q`&kU;C=b|6Gm;_5KZ|VyOb~;-B!J|kbP*ErH}Vb|
WO3K%kqpi^Z0000<MNUMnLSTaKr0gI7

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_rss_feed_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_rss_feed_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e3d4d97ae315bc9874596bc95f3d36e60452b1e
GIT binary patch
literal 768
zcmV+b1ONPqP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0008VNkl<ZcmeI$
z1B@O)6u|NS8MSTOwr$(C+prC4+ig%=adH=3bQjmQZSB{%-F-9J-hMdEZ^FBm?YrGK
z^WGFAR1Cu~4C5Gk*}yX9(VrT`lIDE2^_#m~U_NyTPuqm#dd*3O5}(EiiS>blv?Dx?
z6B6qhqlrx8gv7eb6k^ggA-QhRIn5Ii>lDQasw+I;4L?$m(nlr`0)=SBBsP-FZ}+4)
zOb$XOH@(=-E0>gRP@9m7qBp1crB8{^bS31<vYYSPlzuXjG*Fz~+PbosPnu{*vhF>l
zRZ8K^(R@6Mk))9Z+|krhHv;Aq2id|B`cjPu+~nqxX2;bEM(cRbMdnZvJ&5F>GNtQ*
zIx1B)k;o{b&<SIW`t%NNbA7-JV$o5jG$GjC{tn%>Z|R`2?G_LI_;H$is6;Bu`(!BQ
zp$9ZWCAabr=p2dx?I)u&=aM`sZxMrEQn<!j*OV+4pfX1hJDC8;Pd9e)R6N|RXN4<z
z++89GkT4pvlb`rf(X$$2iO5j|R3%PpYpEI1ZpA$=oB(U8X`>Iwi&HU0X}2Zd@{ypv
z2L0DNIzSLavR#>y95u>`+4}==1jP<zLy<jBR^5<5+%xhMEq<o@aMN+>6X+(=f<%7c
z<2Olkahy=HydQ|+B%0Tbm{)}1Q4AZg>?LU%wwmD+Yoz<fr4AmgRQ!YcT`D92r`{rF
z9-cH--??lbu97&tEivfk7SFkWC+9V%auWaAC4N6!wrQ~&J$a=`=$CEBHNofl_iqya
zqZ^9{mbSa+=dUm^3A`7Vrpe+7)$!oDCY>KdxwMC>*tHfB{qW$VIw7%-x{HWD*cBEL
zbMc@CKa{gi3+(cXm?b!fy|@%lmM9Y1fFK6l&8`va@g#!9{IKng6~rK2a~&}rIwJPq
ySq)C`9E(?+rx9u?u9MLfN5nBQEyFMj!}tTZkP1gc9p;As0000<MNUMnLSTYBkZjEW

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_rss_feed_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_rss_feed_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2cc96ac72ca784ce939392e63d5cebe9f954de7
GIT binary patch
literal 1027
zcmV+e1pNDnP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000BZNkl<ZcmeI&
z1F$?t5XbTFVfV$hZQHhO+jb$gZ6|-*wr$0Bp8a0zq<iMJYHn{gHJ>S0&)xl&JyVDG
z|K)j}=XsvzdEPdx&&n)DhLrm8_wfVOe8@na;xhJU_4EY#Q5lu==32HUo0<U1_>L}I
z#ImUgpo}KEb1Y#x0_fv=o@48@1kgtxc1cSBeGFyav;@${XtqsvfFEh)X_iVy0DXML
znP~~2kKwFI$*jSq?8N>Y!$mwwAKs@mdIY}bND^Zqw&ObbP#rPE<Afwio}Iayk0L~v
z$T}oWhJARg;Ir{9JCR6>auuHz6rq+wNT`qtcn^DoW=<!ua-7e%)(Agv9SOE9FYtpk
z#C0Uvj!d<lh0{s2kjJg}!oeim(Ue=BNIOz=PjELkaVf{J8D&JZHj^yxg>~X==3055
z4qV836mC)aS>DcJDZ0@Qd5A42Ou*a52#=Mnou1AWEP`EzM~$CzR4La3UvmpfVE2fz
z*<Q1>3z~ASB!^jsH;qf4lCQ|7va_}Q?qisLX6cudKkz64CW|oMa49aGgf;Pa*1}{>
zzE|fymyAVyIR|2Lq+t_ghh*$ZG+ElT$JCkQD1sqOV2)+U7_HwAnWD}-fTCHA{kV;h
zG!+=)T68<m8pGpMu@vVqj34Z0fz!}Er_S4rSZq#vTCMlOfoPWIYh_knVzU{;t^09n
zp*c&PwJk9^%W`{<CqR~EzB1=|VzoIR7$ZD_=4|y%Qbw$nGhRwRuoJRC-IhF_m<7CG
zZ1Zx+E>&jqAb!ROSE&2k70UB#d14nBE~IjnK=z_C;}VKuO-|)XE@V#v@m|nx=bMr3
zq11Q7u?$E4V}s;-9%LEeiBzq2`->pSD51;A;?SaWl75u%+CNi02bUweQ>ot$XF~Pr
zZW1DlP->?k+fk{%0cRdE?n(UnLfS%Y^fpJ5qf)Hyha+oS8t4c3w~k8XgUEV_)iq>r
z;tuQog#!L*OXVDVi0mrmlh?wDsn*VaPyR){XVycqg;ISWPSjZgT*$wjt5jZqBu}$g
zeI-ulYcKtamY`9rY>!B3te?S&udM-2fdVh0_aoiLLvW(2HNcwu*X_#APZ^R2#p+LS
z;xy~u2P6k5)te$YPpqxOiGT&h07oEMU8z1M(r#T2C-$aA{rMfqAjwc2p-tXL`Sc}m
z<SZq^a27=~SDbMplI@iMtKrPv|GAKwc#sg?MDZuxg=8Zoz(zO}a4KE-njffR3b(U1
xW<!)eJxNwo0&Gue<i+86p67X<=XqW+{RAwlF9m%+^oIZd002ovPDHLkV1g##^XdQq

literal 0
HcmV?d00001


From 8083f06fe7e285ef3b48254ab45440dc207aa786 Mon Sep 17 00:00:00 2001
From: ksyko <lord.kratos.kb19@gmail.com>
Date: Wed, 18 Jan 2017 00:12:36 +0530
Subject: [PATCH 26/30] Update SettingsFragment.java

---
 .../main/java/org/schabi/newpipe/settings/SettingsFragment.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
index 6f843d028..a6466daf9 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsFragment.java
@@ -86,7 +86,6 @@ public class SettingsFragment  extends PreferenceFragment
         DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
         THEME = getString(R.string.theme_key);
         USE_TOR_KEY = getString(R.string.use_tor_key);
-        THEME = getString(R.string.theme_key);
 
         // get pref objects
         defaultResolutionPreference =

From 8e451b2a8368351b73a5ca95a2f69b2266f5ebca Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Thu, 19 Jan 2017 19:38:33 +0100
Subject: [PATCH 27/30] Use fragments setHasOptionsMenu

Remove complications by allowing android to handle fragment's
options menu.

See https://developer.android.com/guide/components/fragments.html#ActionBar
---
 .../main/java/org/schabi/newpipe/MainActivity.java    |  5 +----
 .../newpipe/detail/VideoItemDetailActivity.java       | 11 +----------
 .../newpipe/detail/VideoItemDetailFragment.java       |  1 +
 .../org/schabi/newpipe/download/DownloadActivity.java |  3 +--
 .../search_fragment/SearchInfoItemFragment.java       |  2 ++
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index bfeb74287..3dae561e7 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -52,8 +52,6 @@ public class MainActivity extends AppCompatActivity {
         MenuInflater inflater = getMenuInflater();
 
         inflater.inflate(R.menu.main_menu, menu);
-
-        mainFragment.onCreateOptionsMenu(menu, inflater);
         return true;
     }
 
@@ -79,8 +77,7 @@ public class MainActivity extends AppCompatActivity {
                 return true;
             }
             default:
-                return mainFragment.onOptionsItemSelected(item) ||
-                        super.onOptionsItemSelected(item);
+                return super.onOptionsItemSelected(item);
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
index 591017a92..2c4f9cf58 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
@@ -162,19 +162,10 @@ public class VideoItemDetailActivity extends AppCompatActivity {
             NavUtils.navigateUpTo(this, intent);
             return true;
         } else {
-            return fragment.onOptionsItemSelected(item) ||
-                    super.onOptionsItemSelected(item);
+            return super.onOptionsItemSelected(item);
         }
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        fragment.onCreateOptionsMenu(menu, getMenuInflater());
-        return true;
-    }
-
-
     /**
      * Retrieves all Strings which look remotely like URLs from a text.
      * Used if NewPipe was called through share menu.
diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
index 2c6e4b55a..9371397f8 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailFragment.java
@@ -629,6 +629,7 @@ public class VideoItemDetailFragment extends Fragment {
                 onNotSpecifiedContentError();
             }
         });
+        setHasOptionsMenu(true);
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index a7e52c486..2ad4107ba 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -273,8 +273,7 @@ public class DownloadActivity extends AppCompatActivity implements AdapterView.O
                 return true;
             }
             default:
-                return mFragment.onOptionsItemSelected(item) ||
-                        super.onOptionsItemSelected(item);
+                return super.onOptionsItemSelected(item);
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
index 2afe149a8..09e7c0903 100644
--- a/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
@@ -160,6 +160,8 @@ public class SearchInfoItemFragment extends Fragment {
             }
         }
 
+        setHasOptionsMenu(true);
+
         SearchWorker sw = SearchWorker.getInstance();
         sw.setSearchWorkerResultListener(new SearchWorker.SearchWorkerResultListener() {
             @Override

From 7fb4e5a1434ddf7449dbbff27393aec6982472ad Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Fri, 20 Jan 2017 18:54:15 +0100
Subject: [PATCH 28/30] Rename download db sqlite file

Rename the sqlite database to "downloads.db" instead of "newpipe.db"
to make sure the file will create a conflicts later.
---
 .../giga/get/sqlite/DownloadMissionSQLiteHelper.java      | 2 +-
 .../java/us/shandian/giga/ui/adapter/MissionAdapter.java  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
index 7b86f7dc4..6c29be474 100644
--- a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
@@ -17,7 +17,7 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
     private final String TAG = "DownloadMissionHelper";
 
     // TODO: use NewPipeSQLiteHelper ('s constants) when playlist branch is merged (?)
-    private static final String DATABASE_NAME = "newpipe.db";
+    private static final String DATABASE_NAME = "downloads.db";
 
     private static final int DATABASE_VERSION = 2;
     /**
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index 094ddf3b3..5960c64fd 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -22,6 +22,7 @@ import android.support.v7.widget.RecyclerView;
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import org.schabi.newpipe.R;
@@ -150,9 +151,8 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 				h.status.setText(R.string.msg_error);
 			} else {
 				float progress = (float) h.mission.done / h.mission.length;
-				h.status.setText(String.format("%.2f%%", progress * 100));
+				h.status.setText(String.format(Locale.US, "%.2f%%", progress * 100));
 				h.progress.setProgress(progress);
-			
 			}
 		}
 		
@@ -315,7 +315,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 	static class ViewHolder extends RecyclerView.ViewHolder {
 		public DownloadMission mission;
 		public int position;
-		
+
 		public TextView status;
 		public ImageView icon;
 		public TextView name;
@@ -324,7 +324,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 		public ImageView menu;
 		public ProgressDrawable progress;
 		public MissionObserver observer;
-		
+
 		public long lastTimeStamp = -1;
 		public long lastDone = -1;
 		public int colorId;

From 5d81358c1518890e907653bce63c35a49e5fe7f2 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Sun, 22 Jan 2017 13:48:50 +0100
Subject: [PATCH 29/30] rename Themer to ThemableActivity

---
 app/src/main/java/org/schabi/newpipe/MainActivity.java | 10 +---------
 .../newpipe/{Themer.java => ThemableActivity.java}     |  2 +-
 .../schabi/newpipe/detail/VideoItemDetailActivity.java |  5 ++---
 .../org/schabi/newpipe/download/DownloadActivity.java  |  5 ++---
 .../java/org/schabi/newpipe/report/ErrorActivity.java  |  5 ++---
 5 files changed, 8 insertions(+), 19 deletions(-)
 rename app/src/main/java/org/schabi/newpipe/{Themer.java => ThemableActivity.java} (91%)

diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
index 9472d5903..0d6893ebe 100644
--- a/app/src/main/java/org/schabi/newpipe/MainActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -1,24 +1,16 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.media.AudioManager;
-import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.widget.Toast;
 
-import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.settings.SettingsActivity;
 
-import java.util.Objects;
-import java.util.prefs.Preferences;
-
 /**
  * Created by Christian Schabesberger on 02.08.16.
  *
@@ -39,7 +31,7 @@ import java.util.prefs.Preferences;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class MainActivity extends Themer {
+public class MainActivity extends ThemableActivity {
 
     private Fragment mainFragment = null;
 
diff --git a/app/src/main/java/org/schabi/newpipe/Themer.java b/app/src/main/java/org/schabi/newpipe/ThemableActivity.java
similarity index 91%
rename from app/src/main/java/org/schabi/newpipe/Themer.java
rename to app/src/main/java/org/schabi/newpipe/ThemableActivity.java
index 048837cec..425801676 100644
--- a/app/src/main/java/org/schabi/newpipe/Themer.java
+++ b/app/src/main/java/org/schabi/newpipe/ThemableActivity.java
@@ -8,7 +8,7 @@ import java.util.Objects;
 
 import static org.schabi.newpipe.R.attr.theme;
 
-public class Themer extends AppCompatActivity {
+public class ThemableActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
index 05895fef4..e969ba2d5 100644
--- a/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/detail/VideoItemDetailActivity.java
@@ -5,7 +5,6 @@ import android.media.AudioManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -14,7 +13,7 @@ import android.widget.Toast;
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.Themer;
+import org.schabi.newpipe.ThemableActivity;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 
@@ -40,7 +39,7 @@ import java.util.HashSet;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class VideoItemDetailActivity extends Themer {
+public class VideoItemDetailActivity extends ThemableActivity {
 
     /**
      * Removes invisible separators (\p{Z}) and punctuation characters including
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index 2f77cadb2..e7ff154fe 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -13,7 +13,6 @@ import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -28,7 +27,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.schabi.newpipe.Themer;
+import org.schabi.newpipe.ThemableActivity;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.settings.SettingsActivity;
@@ -43,7 +42,7 @@ import us.shandian.giga.ui.fragment.MissionsFragment;
 import us.shandian.giga.util.CrashHandler;
 import us.shandian.giga.util.Utility;
 
-public class DownloadActivity extends Themer implements AdapterView.OnItemClickListener{
+public class DownloadActivity extends ThemableActivity implements AdapterView.OnItemClickListener{
 
     public static final String INTENT_DOWNLOAD = "us.shandian.giga.intent.DOWNLOAD";
 
diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
index b87fa8af8..039ed8eaa 100644
--- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
@@ -14,7 +14,6 @@ import android.preference.PreferenceManager;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.NavUtils;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
@@ -35,7 +34,7 @@ import org.schabi.newpipe.BuildConfig;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.Themer;
+import org.schabi.newpipe.ThemableActivity;
 import org.schabi.newpipe.extractor.Parser;
 
 import java.io.PrintWriter;
@@ -66,7 +65,7 @@ import java.util.Vector;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ErrorActivity extends Themer {
+public class ErrorActivity extends ThemableActivity {
     public static class ErrorInfo implements Parcelable {
         public int userAction;
         public String request;

From 9e76f94cf6f129d362532e8d19af2763fb8a2966 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Sun, 22 Jan 2017 14:47:05 +0100
Subject: [PATCH 30/30] update support lib and move on to 0.8.8

---
 app/build.gradle | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6021f5433..87e7b79e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 21
-        versionName "0.8.7"
+        versionCode 22
+        versionName "0.8.8"
     }
     buildTypes {
         release {
@@ -32,10 +32,10 @@ android {
 
 dependencies {
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.0.0'
-    compile 'com.android.support:support-v4:25.0.0'
-    compile 'com.android.support:design:25.0.0'
-    compile 'com.android.support:recyclerview-v7:25.0.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:design:25.1.0'
+    compile 'com.android.support:recyclerview-v7:25.1.0'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
     compile 'info.guardianproject.netcipher:netcipher:1.2'