From fde0b2ae7fb2fdbe91063e28ffc0d33610253d63 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@gmail.com>
Date: Thu, 10 Sep 2015 20:42:39 +0200
Subject: [PATCH] Made youtu.be links be vieweble through NewPipe, and fixed
 InfoBar design.

---
 app/src/main/AndroidManifest.xml              |  8 +++++
 .../org/schabi/newpipe/PlayVideoActivity.java |  2 +-
 .../org/schabi/newpipe/VideoListAdapter.java  |  2 +-
 .../newpipe/youtube/YoutubeExtractor.java     | 29 ++++++++++++-----
 app/src/main/res/values-v21/styles.xml        | 32 +++++++++++++++++++
 app/src/main/res/values/colors.xml            |  3 +-
 app/src/main/res/values/styles.xml            |  6 ++--
 7 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/values-v21/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 215fb3050..27fdfdc7a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,6 +55,14 @@
                     android:host="m.youtube.com"
                     android:scheme="https"
                     android:pathPrefix="/watch"/>
+                <data
+                    android:host="youtu.be"
+                    android:scheme="https"
+                    android:pathPrefix="/"/>
+                <data
+                    android:host="youtu.be"
+                    android:scheme="http"
+                    android:pathPrefix="/"/>
             </intent-filter>
         </activity>
         <activity android:name=".PlayVideoActivity"
diff --git a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
index 98b6d9f7e..dc633b3be 100644
--- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
@@ -120,7 +120,7 @@ public class PlayVideoActivity extends AppCompatActivity {
                 }
             }
         });
-        hideUi();
+        showUi();
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
index fb63a91ce..51ca76044 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -120,7 +120,7 @@ public class VideoListAdapter extends BaseAdapter {
         holder.itemDurationView.setText(videoList.get(position).duration);
 
         if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(context.getResources().getColor(R.color.actionBarColorYoutube));
+            convertView.setBackgroundColor(context.getResources().getColor(R.color.primaryColorYoutube));
         } else {
             convertView.setBackgroundColor(0);
         }
diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
index 332518c36..2046bcfef 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
@@ -95,19 +95,32 @@ public class YoutubeExtractor implements Extractor {
     @Override
     public String getVideoId(String videoUrl) {
         try {
-            String query = (new URI(videoUrl)).getQuery();
-            String queryElements[] = query.split("&");
-            Map<String, String> queryArguments = new HashMap<>();
-            for(String e : queryElements) {
-                String[] s = e.split("=");
-                queryArguments.put(s[0], s[1]);
+            URI uri = new URI(videoUrl);
+            if(uri.getHost().contains("youtube")) {
+                String query = uri.getQuery();
+                String queryElements[] = query.split("&");
+                Map<String, String> queryArguments = new HashMap<>();
+                for (String e : queryElements) {
+                    String[] s = e.split("=");
+                    queryArguments.put(s[0], s[1]);
+                }
+                return queryArguments.get("v");
+            } else if(uri.getHost().contains("youtu.be")) {
+                // uri.getRawPath() does somehow not return the last character.
+                // so we do a workaround instead.
+                //return uri.getRawPath();
+                String url[] = videoUrl.split("/");
+                return url[url.length-1];
+            } else {
+                Log.e(TAG, "Error could not parse url: " + videoUrl);
+
             }
-            return queryArguments.get("v");
-        } catch(Exception e) {
+        }  catch(Exception e) {
             Log.e(TAG, "Error could not parse url: " + videoUrl);
             e.printStackTrace();
             return "";
         }
+        return null;
     }
 
     @Override
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..e0b443174
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,32 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light">
+        <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="android:colorPrimary">@color/primaryColorYoutube</item>
+        <item name="android:colorPrimaryDark">@color/primaryColorDarkYoutube</item>
+    </style>
+
+    <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
+        <item name="android:displayOptions">showHome</item>
+        <item name="displayOptions">showHome</item>
+        <item name="android:background">@color/primaryColorYoutube</item>
+        <item name="background">@color/primaryColorYoutube</item>
+    </style>
+
+    <style name="FullscreenTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="android:actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
+        <item name="actionBarStyle">@style/NewPipePlayerActionBarTheme</item>
+    </style>
+
+    <style name="NewPipePlayerActionBarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse" >
+        <item name="android:displayOptions">showHome</item>
+        <item name="displayOptions">showHome</item>
+        <item name="android:background">@color/black_overlay</item>
+        <item name="background">@color/black_overlay</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ff356914a..eaf1f6c18 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="actionBarColorYoutube">#dd0000</color>
+    <color name="primaryColorYoutube">#dd0000</color>
+    <color name="primaryColorDarkYoutube">#bb0000</color>
     <color name="black_overlay">#66000000</color>
 </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 4e752773a..454286d7f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,13 +4,15 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light">
         <item name="android:actionBarStyle">@style/NewPipeActionbarTheme</item>
         <item name="actionBarStyle">@style/NewPipeActionbarTheme</item>
+        <item name="colorPrimary">@color/primaryColorYoutube</item>
+        <item name="colorPrimaryDark">@color/primaryColorDarkYoutube</item>
     </style>
 
     <style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
         <item name="android:displayOptions">showHome</item>
         <item name="displayOptions">showHome</item>
-        <item name="android:background">@color/actionBarColorYoutube</item>
-        <item name="background">@color/actionBarColorYoutube</item>
+        <item name="android:background">@color/primaryColorYoutube</item>
+        <item name="background">@color/primaryColorYoutube</item>
     </style>
 
     <style name="FullscreenTheme" parent="Theme.AppCompat.Light.DarkActionBar">