Merge pull request #13134 from TeamNewPipe/revert-12781-feat/similar-youtube-client-screen-rotation

Author: Stypox

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

@@ -206,8 +206,6 @@ public final class VideoDetailFragment
     int lastStableBottomSheetState = BottomSheetBehavior.STATE_EXPANDED;
     @State
     protected boolean autoPlayEnabled = true;
-    @State
-    protected int originalOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
 
     @Nullable
     private StreamInfo currentInfo = null;
@@ -1910,29 +1908,23 @@ public void onFullscreenStateChanged(final boolean fullscreen) {
 
     @Override
     public void onScreenRotationButtonClicked() {
-        final Optional<MainPlayerUi> playerUi = player != null
-                ? player.UIs().get(MainPlayerUi.class)
-                : Optional.empty();
-        if (playerUi.isEmpty()) {
+        // On Android TV screen rotation is not supported
+        // In tablet user experience will be better if screen will not be rotated
+        // from landscape to portrait every time.
+        // Just turn on fullscreen mode in landscape orientation
+        // or portrait & unlocked global orientation
+        final boolean isLandscape = DeviceUtils.isLandscape(requireContext());
+        if (DeviceUtils.isTv(activity) || DeviceUtils.isTablet(activity)
+                && (!globalScreenOrientationLocked(activity) || isLandscape)) {
+            player.UIs().get(MainPlayerUi.class).ifPresent(MainPlayerUi::toggleFullscreen);
             return;
         }
 
-        // On tablets and TVs, just toggle fullscreen UI without orientation change.
-        if (DeviceUtils.isTablet(activity) || DeviceUtils.isTv(activity)) {
-            playerUi.get().toggleFullscreen();
-            return;
-        }
+        final int newOrientation = isLandscape
+                ? ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
 
-        if (playerUi.get().isFullscreen()) {
-            // EXITING FULLSCREEN
-            playerUi.get().toggleFullscreen();
-            activity.setRequestedOrientation(originalOrientation);
-        } else {
-            // ENTERING FULLSCREEN
-            originalOrientation = activity.getRequestedOrientation();
-            playerUi.get().toggleFullscreen();
-            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
-        }
+        activity.setRequestedOrientation(newOrientation);
     }
 
     /*