[WIP] New embeded in fragment video player

app/src/main/AndroidManifest.xml

@@ -40,30 +40,16 @@
             android:theme="@style/OldVideoPlayerTheme"
             tools:ignore="UnusedAttribute"/>
 
+
         <service
-            android:name=".player.BackgroundPlayer"
+            android:name=".player.MainPlayerService"
             android:exported="false"/>
 
         <activity
             android:name=".player.BackgroundPlayerActivity"
             android:launchMode="singleTask"
             android:label="@string/title_activity_background_player"/>
 
-        <activity
-            android:name=".player.PopupVideoPlayerActivity"
-            android:launchMode="singleTask"
-            android:label="@string/title_activity_popup_player"/>
-
-        <service
-            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"/>
-
         <activity
             android:name=".settings.SettingsActivity"
             android:label="@string/settings"/>

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

@@ -44,20 +44,17 @@
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.fragments.BackPressable;
 import org.schabi.newpipe.fragments.MainFragment;
 import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
 import org.schabi.newpipe.fragments.list.search.SearchFragment;
+import org.schabi.newpipe.player.BasePlayer;
+import org.schabi.newpipe.playlist.PlayQueue;
 import org.schabi.newpipe.report.ErrorActivity;
-import org.schabi.newpipe.util.Constants;
-import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.StateSaver;
-import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.*;
 
 public class MainActivity extends AppCompatActivity {
     private static final String TAG = "MainActivity";
@@ -74,7 +71,8 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
 
         ThemeHelper.setTheme(this, ServiceHelper.getSelectedServiceId(this));
 
@@ -127,17 +125,17 @@ public void onDrawerClosed(View drawerView) {
     }
 
     private boolean changeService(MenuItem item) {
-        if (item.getGroupId() == R.id.menu_services_group) {
-            drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
-            ServiceHelper.setSelectedServiceId(this, item.getTitle().toString());
-            drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
+                if (item.getGroupId() == R.id.menu_services_group) {
+                    drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(false);
+                    ServiceHelper.setSelectedServiceId(this, item.getTitle().toString());
+                    drawerItems.getMenu().getItem(ServiceHelper.getSelectedServiceId(this)).setChecked(true);
             headerServiceView.setText("gurken");
         } else {
             return false;
+                }
+                drawer.closeDrawers();
+                return true;
         }
-        drawer.closeDrawers();
-        return true;
-    }
 
     private void setupDrawerFooter() {
         ImageButton settings = findViewById(R.id.drawer_settings);
@@ -187,28 +185,35 @@ protected void onResume() {
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         if (sharedPreferences.getBoolean(Constants.KEY_THEME_CHANGE, false)) {
-            if (DEBUG) Log.d(TAG, "Theme has changed, recreating activity...");
+            if (DEBUG)
+                Log.d(TAG, "Theme has changed, recreating activity...");
+
             sharedPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, false).apply();
             // https://stackoverflow.com/questions/10844112/runtimeexception-performing-pause-of-activity-that-is-not-resumed
             // Briefly, let the activity resume properly posting the recreate call to end of the message queue
             new Handler(Looper.getMainLooper()).post(MainActivity.this::recreate);
         }
 
         if (sharedPreferences.getBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false)) {
-            if (DEBUG) Log.d(TAG, "main page has changed, recreating main fragment...");
+            if (DEBUG)
+                Log.d(TAG, "main page has changed, recreating main fragment...");
+
             sharedPreferences.edit().putBoolean(Constants.KEY_MAIN_PAGE_CHANGE, false).apply();
             NavigationHelper.openMainActivity(this);
         }
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
-        if (DEBUG) Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]");
+        if (DEBUG)
+            Log.d(TAG, "onNewIntent() called with: intent = [" + intent + "]");
+
         if (intent != null) {
             // Return if launched from a launcher (e.g. Nova Launcher, Pixel Launcher ...)
             // to not destroy the already created backstack
             String action = intent.getAction();
-            if ((action != null && action.equals(Intent.ACTION_MAIN)) && intent.hasCategory(Intent.CATEGORY_LAUNCHER)) return;
+            if ((action != null && action.equals(Intent.ACTION_MAIN)) && intent.hasCategory(Intent.CATEGORY_LAUNCHER))
+                return;
         }
 
         super.onNewIntent(intent);
@@ -218,18 +223,27 @@ protected void onNewIntent(Intent intent) {
 
     @Override
     public void onBackPressed() {
-        if (DEBUG) Log.d(TAG, "onBackPressed() called");
+        if (DEBUG)
+            Log.d(TAG, "onBackPressed() called");
+
+        if (sendBackPressedEvent())
+            return;
 
+        if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
+            finish();
+        } else
+            super.onBackPressed();
+    }
+
+    // If current fragment implements BackPressable (i.e. can/wanna handle back press) delegate the back press to it
+    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;
     }
 
     /**
@@ -270,7 +284,9 @@ private void onHomeButtonPressed() {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (DEBUG) Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "]");
+        if (DEBUG)
+            Log.d(TAG, "onCreateOptionsMenu() called with: menu = [" + menu + "]");
+
         super.onCreateOptionsMenu(menu);
 
         Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_holder);
@@ -297,23 +313,31 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (DEBUG) Log.d(TAG, "onOptionsItemSelected() called with: item = [" + item + "]");
+        if (DEBUG)
+            Log.d(TAG, "onOptionsItemSelected() called with: item = [" + item + "]");
+
         int id = item.getItemId();
+        Intent hideMainPlayerIntent = new Intent(VideoDetailFragment.ACTION_HIDE_MAIN_PLAYER);
 
         switch (id) {
             case android.R.id.home:
+                sendBackPressedEvent();
                 onHomeButtonPressed();
                 return true;
             case R.id.action_settings:
                 NavigationHelper.openSettings(this);
+                sendBroadcast(hideMainPlayerIntent);
                 return true;
             case R.id.action_show_downloads:
+                sendBroadcast(hideMainPlayerIntent);
                 return NavigationHelper.openDownloads(this);
             case R.id.action_about:
                 NavigationHelper.openAbout(this);
+                sendBroadcast(hideMainPlayerIntent);
                 return true;
             case R.id.action_history:
                 NavigationHelper.openHistory(this);
+                sendBroadcast(hideMainPlayerIntent);
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -325,19 +349,23 @@ public boolean onOptionsItemSelected(MenuItem item) {
     //////////////////////////////////////////////////////////////////////////*/
 
     private void initFragments() {
-        if (DEBUG) Log.d(TAG, "initFragments() called");
+        if (DEBUG)
+            Log.d(TAG, "initFragments() called");
+
         StateSaver.clearStateFiles();
         if (getIntent() != null && getIntent().hasExtra(Constants.KEY_LINK_TYPE)) {
             handleIntent(getIntent());
-        } else NavigationHelper.gotoMainFragment(getSupportFragmentManager());
+        } else
+            NavigationHelper.gotoMainFragment(getSupportFragmentManager());
     }
 
     /*//////////////////////////////////////////////////////////////////////////
     // Utils
     //////////////////////////////////////////////////////////////////////////*/
 
     private void updateDrawerNavigation() {
-        if (getSupportActionBar() == null) return;
+        if (getSupportActionBar() == null)
+            return;
 
         final Toolbar toolbar = findViewById(R.id.toolbar);
         final DrawerLayout drawer = findViewById(R.id.drawer_layout);
@@ -358,16 +386,19 @@ private void updateDrawerNavigation() {
     }
 
     private void handleIntent(Intent intent) {
-        if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
+        if (DEBUG)
+            Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]");
 
         if (intent.hasExtra(Constants.KEY_LINK_TYPE)) {
             String url = intent.getStringExtra(Constants.KEY_URL);
             int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
             String title = intent.getStringExtra(Constants.KEY_TITLE);
             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);
+                    boolean autoPlay = intent.getBooleanExtra(BasePlayer.AUTO_PLAY, false);
+                    final String intentCacheKey = intent.getStringExtra(BasePlayer.PLAY_QUEUE);
+                    final PlayQueue playQueue = intentCacheKey != null ? SerializedCache.getInstance().take(intentCacheKey, PlayQueue.class) : null;
+                    NavigationHelper.openVideoDetailFragment(getSupportFragmentManager(), serviceId, url, title, autoPlay, playQueue);
                     break;
                 case CHANNEL:
                     NavigationHelper.openChannelFragment(getSupportFragmentManager(), serviceId, url, title);
@@ -378,11 +409,12 @@ private void handleIntent(Intent intent) {
             }
         } else if (intent.hasExtra(Constants.KEY_OPEN_SEARCH)) {
             String searchQuery = intent.getStringExtra(Constants.KEY_QUERY);
-            if (searchQuery == null) searchQuery = "";
+            if (searchQuery == null)
+                searchQuery = "";
             int serviceId = intent.getIntExtra(Constants.KEY_SERVICE_ID, 0);
             NavigationHelper.openSearchFragment(getSupportFragmentManager(), serviceId, searchQuery);
         } else {
             NavigationHelper.gotoMainFragment(getSupportFragmentManager());
         }
     }
-}
+}

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

@@ -31,12 +31,14 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.player.BasePlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.playlist.ChannelPlayQueue;
 import org.schabi.newpipe.playlist.PlayQueue;
 import org.schabi.newpipe.playlist.PlaylistPlayQueue;
 import org.schabi.newpipe.playlist.SinglePlayQueue;
 import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
@@ -453,7 +455,7 @@ public Consumer<Info> getResultHandler(Choice choice) {
                         playQueue = new SinglePlayQueue((StreamInfo) info);
 
                         if (playerChoice.equals(videoPlayerKey)) {
-                            NavigationHelper.playOnMainPlayer(this, playQueue);
+                            openMainPlayer(playQueue, choice);
                         } else if (playerChoice.equals(backgroundPlayerKey)) {
                             NavigationHelper.enqueueOnBackgroundPlayer(this, playQueue, true);
                         } else if (playerChoice.equals(popupPlayerKey)) {
@@ -466,7 +468,7 @@ public Consumer<Info> getResultHandler(Choice choice) {
                     playQueue = info instanceof ChannelInfo ? new ChannelPlayQueue((ChannelInfo) info) : new PlaylistPlayQueue((PlaylistInfo) info);
 
                     if (playerChoice.equals(videoPlayerKey)) {
-                        NavigationHelper.playOnMainPlayer(this, playQueue);
+                        openMainPlayer(playQueue, choice);
                     } else if (playerChoice.equals(backgroundPlayerKey)) {
                         NavigationHelper.playOnBackgroundPlayer(this, playQueue);
                     } else if (playerChoice.equals(popupPlayerKey)) {
@@ -476,6 +478,16 @@ public Consumer<Info> getResultHandler(Choice choice) {
             };
         }
 
+        private void openMainPlayer(PlayQueue playQueue, Choice choice) {
+            Intent intent = NavigationHelper.getPlayerIntent(this, MainActivity.class, playQueue);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(Constants.KEY_LINK_TYPE, choice.linkType);
+            intent.putExtra(Constants.KEY_URL, choice.url);
+            intent.putExtra(Constants.KEY_TITLE, "");
+            intent.putExtra(BasePlayer.AUTO_PLAY, true);
+            this.startActivity(intent);
+        }
+
         @Override
         public void onDestroy() {
             super.onDestroy();

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();