[WIP] New embeded in fragment video player

app/src/main/AndroidManifest.xml

@@ -34,8 +34,9 @@
             android:theme="@style/VideoPlayerTheme"
             tools:ignore="UnusedAttribute"/>
 
+
         <service
-            android:name=".player.BackgroundPlayer"
+            android:name=".player.MainPlayerService"
             android:exported="false"/>
 
         <activity
@@ -52,13 +53,6 @@
             android:name=".player.PopupVideoPlayer"
             android:exported="false"/>
 
-        <activity
-            android:name=".player.MainVideoPlayer"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:theme="@style/PlayerTheme"/>
-
         <activity
             android:name=".settings.SettingsActivity"
             android:label="@string/settings"/>

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

@@ -22,10 +22,12 @@
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
@@ -53,6 +55,9 @@
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
 import org.schabi.newpipe.history.HistoryListener;
+import org.schabi.newpipe.player.VideoPlayer;
+import org.schabi.newpipe.playlist.PlayQueue;
+import org.schabi.newpipe.settings.SettingsContentObserver;
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.StateSaver;
@@ -65,10 +70,11 @@
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
 
-public class MainActivity extends AppCompatActivity implements HistoryListener {
+public class MainActivity extends AppCompatActivity implements HistoryListener, SettingsContentObserver.OnChangeListener {
     private static final String TAG = "MainActivity";
     public static final boolean DEBUG = false;
     private SharedPreferences sharedPreferences;
+    private SettingsContentObserver mSettingsContentObserver;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Activity's LifeCycle
@@ -90,6 +96,9 @@ protected void onCreate(Bundle savedInstanceState) {
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
         initHistory();
+
+        mSettingsContentObserver = new SettingsContentObserver(new Handler(), this);
+        setupOrientation();
     }
 
     @Override
@@ -126,6 +135,15 @@ public void run() {
             NavigationHelper.openMainActivity(this);
         }
 
+        getContentResolver().registerContentObserver(
+                android.provider.Settings.System.CONTENT_URI, true,
+                mSettingsContentObserver );
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        getContentResolver().unregisterContentObserver(mSettingsContentObserver);
     }
 
     @Override
@@ -146,17 +164,20 @@ protected void onNewIntent(Intent intent) {
     @Override
     public void onBackPressed() {
         if (DEBUG) Log.d(TAG, "onBackPressed() called");
+        if(sendBackPressedEvent()) return;
 
+        if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
+            finish();
+        } else super.onBackPressed();
+    }
+
+    private boolean sendBackPressedEvent() {
         Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
         // If current fragment implements BackPressable (i.e. can/wanna handle back press) delegate the back press to it
         if (fragment instanceof BackPressable) {
-            if (((BackPressable) fragment).onBackPressed()) return;
+            if (((BackPressable) fragment).onBackPressed()) return true;
         }
-
-
-        if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
-            finish();
-        } else super.onBackPressed();
+        return false;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -191,21 +212,31 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         if (DEBUG) Log.d(TAG, "onOptionsItemSelected() called with: item = [" + item + "]");
         int id = item.getItemId();
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
+        boolean isPlayerFragment = (fragment.isVisible() && fragment instanceof VideoDetailFragment);
 
         switch (id) {
             case android.R.id.home:
+                // If current fragment implements BackPressable (i.e. can/wanna handle back press) delegate the back press to it
+                if (fragment instanceof BackPressable) {
+                    ((BackPressable) fragment).onBackPressed();
+                }
                 NavigationHelper.gotoMainFragment(getSupportFragmentManager());
                 return true;
             case R.id.action_settings:
                 NavigationHelper.openSettings(this);
+                if(isPlayerFragment)((VideoDetailFragment)fragment).hideMainPlayer();
                 return true;
             case R.id.action_show_downloads:
+                if(isPlayerFragment)((VideoDetailFragment)fragment).hideMainPlayer();
                 return NavigationHelper.openDownloads(this);
             case R.id.action_about:
                 NavigationHelper.openAbout(this);
+                if(isPlayerFragment)((VideoDetailFragment)fragment).hideMainPlayer();
                 return true;
             case R.id.action_history:
                 NavigationHelper.openHistory(this);
+                if(isPlayerFragment)((VideoDetailFragment)fragment).hideMainPlayer();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -238,7 +269,8 @@ private void handleIntent(Intent intent) {
             switch (((StreamingService.LinkType) intent.getSerializableExtra(Constants.KEY_LINK_TYPE))) {
                 case STREAM:
                     boolean autoPlay = intent.getBooleanExtra(VideoDetailFragment.AUTO_PLAY, false);
-                    NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay);
+                    PlayQueue playQueue = (PlayQueue) intent.getSerializableExtra(VideoPlayer.PLAY_QUEUE);
+                    NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay, playQueue);
                     break;
                 case CHANNEL:
                     NavigationHelper.openChannelFragment(getSupportFragmentManager(), serviceId, url, title);
@@ -327,4 +359,36 @@ public void onSearch(int serviceId, String query) {
             historyEntrySubject.onNext(searchHistoryEntry);
         }
     }
-}
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Utils
+    //////////////////////////////////////////////////////////////////////////*/
+
+    private void setLandScape(boolean v) {
+        setRequestedOrientation(v
+                ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+                : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
+    }
+
+    private boolean globalScreenOrientationLocked() {
+        // 1: Screen orientation changes using acelerometer
+        // 0: Screen orientatino is locked
+        return !(android.provider.Settings.System.getInt(getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0) == 1);
+    }
+
+    private void setupOrientation() {
+        if(sharedPreferences == null) return;
+        if(globalScreenOrientationLocked()) {
+            boolean lastOrientationWasLandscape
+                    = sharedPreferences.getBoolean(getString(R.string.last_orientation_landscape_key), false);
+            setLandScape(lastOrientationWasLandscape);
+        }
+        else
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+    }
+
+    @Override
+    public void onSettingsChanged() {
+        setupOrientation();
+    }
+}

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

@@ -44,13 +44,16 @@ class ActionBarHandler {
 
     private AppCompatActivity activity;
     private int selectedVideoStream = -1;
+    private String selectedStreamResolution = null;
 
     private SharedPreferences defaultPreferences;
 
     private Menu menu;
 
     // Only callbacks are listed here, there are more actions which don't need a callback.
     // those are edited directly. Typically VideoDetailFragment will implement those callbacks.
+    private OnActionListener onSearchListener;
+    private OnStreamChangesListener onStreamSelectedListener;
     private OnActionListener onShareListener;
     private OnActionListener onOpenInBrowserListener;
     private OnActionListener onDownloadListener;
@@ -61,22 +64,37 @@ public interface OnActionListener {
         void onActionSelected(int selectedStreamId);
     }
 
+    public interface OnStreamChangesListener {
+        void onActionSelected(int selectedStreamId);
+        void onStreamResolutionSelected(String selectedResolution);
+    }
+
     public ActionBarHandler(AppCompatActivity activity) {
         this.activity = activity;
     }
 
     public void setupStreamList(final List<VideoStream> videoStreams, Spinner toolbarSpinner) {
         if (activity == null) return;
 
-        selectedVideoStream = ListHelper.getDefaultResolutionIndex(activity, videoStreams);
+        if(selectedStreamResolution == null) selectedVideoStream = ListHelper.getDefaultResolutionIndex(activity, videoStreams);
+        else selectedVideoStream = ListHelper.getDefaultResolutionIndex(activity, videoStreams, selectedStreamResolution);
 
         boolean isExternalPlayerEnabled = PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(activity.getString(R.string.use_external_video_player_key), false);
         toolbarSpinner.setAdapter(new SpinnerToolbarAdapter(activity, videoStreams, isExternalPlayerEnabled));
-        toolbarSpinner.setSelection(selectedVideoStream);
+        final int defaultSelection = selectedVideoStream >= videoStreams.size()? videoStreams.size()-1 : selectedVideoStream;
+        toolbarSpinner.setSelection(defaultSelection);
         toolbarSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                if(defaultSelection == position) return;  // Without this line action called every time view loaded
                 selectedVideoStream = position;
+                VideoStream preferredVideoStream = videoStreams.get(selectedVideoStream);
+                selectedStreamResolution = preferredVideoStream.resolution;
+
+                if(onStreamSelectedListener != null) {
+                    onStreamSelectedListener.onActionSelected(selectedVideoStream);
+                    onStreamSelectedListener.onStreamResolutionSelected(preferredVideoStream.resolution);
+                }
             }
 
             @Override
@@ -105,6 +123,12 @@ public void updateItemsVisibility(){
     public boolean onItemSelected(MenuItem item) {
         int id = item.getItemId();
         switch (id) {
+            case R.id.menu_item_search: {
+                if (onSearchListener != null) {
+                    onSearchListener.onActionSelected(selectedVideoStream);
+                }
+                return true;
+            }
             case R.id.menu_item_share: {
                 if (onShareListener != null) {
                     onShareListener.onActionSelected(selectedVideoStream);
@@ -137,13 +161,17 @@ public int getSelectedVideoStream() {
         return selectedVideoStream;
     }
 
+    public void setStreamResolution(String selectedResolution) { selectedStreamResolution = selectedResolution; }
+
+    public void setOnStreamSelectedListener(OnStreamChangesListener listener) { onStreamSelectedListener = listener; }
+
     public void setOnShareListener(OnActionListener listener) {
         onShareListener = listener;
     }
 
-    public void setOnOpenInBrowserListener(OnActionListener listener) {
-        onOpenInBrowserListener = listener;
-    }
+    public void setOnOpenInBrowserListener(OnActionListener listener) { onOpenInBrowserListener = listener; }
+
+    public void setOnSearchListener(OnActionListener listener) { onSearchListener = listener; }
 
     public void setOnDownloadListener(OnActionListener listener) {
         onDownloadListener = listener;

app/src/main/java/org/schabi/newpipe/fragments/detail/StackItem.java

@@ -1,16 +1,19 @@
 package org.schabi.newpipe.fragments.detail;
 
+import org.schabi.newpipe.playlist.PlayQueue;
+
 import java.io.Serializable;
 
 class StackItem implements Serializable {
     private int serviceId;
-    private String title;
-    private String url;
+    private String title, url;
+    private PlayQueue playQueue;
 
-    StackItem(int serviceId, String url, String title) {
+    StackItem(int serviceId, String url, String title, PlayQueue playQueue) {
         this.serviceId = serviceId;
         this.url = url;
         this.title = title;
+        this.playQueue = playQueue;
     }
 
     public void setTitle(String title) {
@@ -29,6 +32,10 @@ public String getUrl() {
         return url;
     }
 
+    public PlayQueue getPlayQueue() {
+        return playQueue;
+    }
+
     @Override
     public String toString() {
         return getServiceId() + ":" + getUrl() + " > " + getTitle();