fixed landscape layout problem & added watch with kodi function

Author: Christian Schabesberger

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

@@ -4,7 +4,9 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
+import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
@@ -40,6 +42,8 @@
 
 public class ActionBarHandler {
     private static final String TAG = ActionBarHandler.class.toString();
+    private static final String KORE_PACKET = "org.xbmc.kore";
+
     private static ActionBarHandler handler = null;
 
     private Context context = null;
@@ -49,6 +53,8 @@ public class ActionBarHandler {
     private int selectedStream = -1;
     private String videoTitle = "";
 
+    SharedPreferences defaultPreferences = null;
+
     public static ActionBarHandler getHandler() {
         if(handler == null) {
             handler = new ActionBarHandler();
@@ -73,7 +79,7 @@ public void setStreams(VideoInfo.Stream[] streams) {
         this.streams = streams;
         selectedStream = 0;
         String[] itemArray = new String[streams.length];
-        String defaultResolution = PreferenceManager.getDefaultSharedPreferences(context)
+        String defaultResolution = defaultPreferences
                 .getString(context.getString(R.string.defaultResolutionPreference),
                         context.getString(R.string.defaultResolutionListItem));
         int defaultResolutionPos = 0;
@@ -104,15 +110,21 @@ public boolean setupMenu(Menu menu, MenuInflater inflater, Context context) {
         // CAUTION set item properties programmatically otherwise it would not be accepted by
         // appcompat itemsinflater.inflate(R.menu.videoitem_detail, menu);
 
+        defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+
         inflater.inflate(R.menu.videoitem_detail, menu);
         MenuItem playItem = menu.findItem(R.id.menu_item_play);
         MenuItem shareItem = menu.findItem(R.id.menu_item_share);
+        MenuItem castItem = menu.findItem(R.id.action_play_with_kodi);
 
         MenuItemCompat.setShowAsAction(playItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS
                 | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
         MenuItemCompat.setShowAsAction(shareItem, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM
                 | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 
+        castItem.setVisible(defaultPreferences
+                .getBoolean(context.getString(R.string.showPlayWidthKodiPreference), false));
+
         return true;
     }
 
@@ -143,6 +155,10 @@ public boolean onItemSelected(MenuItem item, Context context) {
                 Intent intent = new Intent(context, SettingsActivity.class);
                 context.startActivity(intent);
             }
+            break;
+            case R.id.action_play_with_kodi:
+                playWithKodi();
+                break;
             default:
                 Log.e(TAG, "Menu Item not known");
         }
@@ -216,8 +232,7 @@ public void downloadVideo() {
             DownloadManager.Request request = new DownloadManager.Request(
                     Uri.parse(streams[selectedStream].url));
             request.setDestinationUri(Uri.fromFile(new File(
-                            PreferenceManager.getDefaultSharedPreferences(context)
-                            .getString("download_path_preference", "/storage/emulated/0/NewPipe")
+                            defaultPreferences.getString("download_path_preference", "/storage/emulated/0/NewPipe")
                             + "/" + videoTitle + suffix)));
             try {
                 dm.enqueue(request);
@@ -236,4 +251,35 @@ public void openInBrowser() {
             context.startActivity(Intent.createChooser(intent, context.getString(R.string.chooseBrowser)));
         }
     }
+
+    public void playWithKodi() {
+        if(!videoTitle.isEmpty()) {
+            try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setPackage(KORE_PACKET);
+                intent.setData(Uri.parse(webisteUrl.replace("https", "http")));
+                context.startActivity(intent);
+            } catch (Exception e) {
+                e.printStackTrace();
+                AlertDialog.Builder builder = new AlertDialog.Builder(context);
+                builder.setMessage(R.string.koreNotFound)
+                        .setPositiveButton(R.string.installeKore, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Intent intent = new Intent();
+                                intent.setAction(Intent.ACTION_VIEW);
+                                intent.setData(Uri.parse(context.getString(R.string.fdroidKoreUrl)));
+                                context.startActivity(intent);
+                            }
+                        })
+                        .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+
+                            }
+                        });
+                builder.create().show();
+            }
+        }
+    }
 }

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

@@ -156,7 +156,11 @@ public void updateInfo(VideoInfo info) {
             ImageView uploaderThumbnailView = (ImageView) a.findViewById(R.id.detailUploaderThumbnailView);
             ImageView thumbsUpPic = (ImageView) a.findViewById(R.id.detailThumbsUpImgView);
             ImageView thumbsDownPic = (ImageView) a.findViewById(R.id.detailThumbsDownImgView);
+            View textSeperationLine = a.findViewById(R.id.textSeperationLine);
 
+            if(textSeperationLine != null) {
+                textSeperationLine.setVisibility(View.VISIBLE);
+            }
             progressBar.setVisibility(View.GONE);
             videoTitleView.setVisibility(View.VISIBLE);
             uploaderView.setVisibility(View.VISIBLE);

app/src/main/res/drawable/ai_play.png

@@ -59,7 +59,7 @@
             android:visibility="invisible"
             android:text="Herr von Gurken" />
 
-        <View
+        <View android:id="@+id/textSeperationLine"
             android:layout_width="fill_parent"
             android:layout_height="1dp"
             android:background="@android:color/darker_gray"

app/src/main/res/drawable/ai_share.png

@@ -4,12 +4,12 @@
     <item android:id="@+id/menu_item_play"
         android:title="@string/play"
         app:showAsAction="always"
-        android:icon="@drawable/ai_play"/>
+        android:icon="@drawable/ic_play_arrow_black"/>
 
     <item android:id="@+id/menu_item_share"
         android:title="@string/share"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ai_share"/>
+        android:icon="@drawable/ic_share_black"/>
 
     <item android:id="@+id/menu_item_openInBrowser"
         app:showAsAction="never"
@@ -22,4 +22,9 @@
     <item android:id="@+id/action_settings"
         app:showAsAction="never"
         android:title="@string/settings"/>
+
+    <item android:id="@+id/action_play_with_kodi"
+        android:title="@string/playWithKodiTitle"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_cast_black"/>
 </menu>

app/src/main/res/drawable/ic_cast_black.png

@@ -28,4 +28,10 @@
     <string name="autoPlayThroughIntentTitle">Automatisch abspielen durch Intent.</string>
     <string name="autoPlayThroughIntentSummary">Startet ein Video automatisch wenn es von einer anderen App aufgerufen wurde.</string>
     <string name="defaultResolutionPreferenceTitle">Standard Auflösung</string>
+    <string name="playWithKodiTitle">Mit Kodi abspielen</string>
+    <string name="koreNotFound">Kore app wurde nicht gefunden. Kore wird benötigt, um Videos mit Kodi wieder zu geben.</string>
+    <string name="installeKore">Kore installieren</string>
+    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="showPlayWithKodiTitle">Zeige \"Mit Kodi abspielen\" Option</string>
+    <string name="showPlayWithKodiSummary">Zeigt eine Option an, über die man Videos mit dem Kodi Mediacenter abspielen kann.</string>
 </resources>