From 495f9b2eabc356ddeb7d8bf9941ad3f663e3fd2f Mon Sep 17 00:00:00 2001
From: Hsin-Yen Chung <u7632983@anu.edu.au>
Date: Sun, 29 Oct 2023 13:05:22 +1100
Subject: [PATCH] finish the rotation method with click the button.

---
 app/build.gradle                                 |   6 +++---
 .../java/org/schabi/newpipe/RouterActivity.java  |   1 -
 .../detail/BaseDescriptionFragment.java          |   1 -
 .../schabi/newpipe/player/PlayQueueActivity.java |   3 +--
 .../newpipe/player/helper/PlayerHelper.java      |   2 +-
 .../schabi/newpipe/player/ui/MainPlayerUi.java   |   2 +-
 .../main/res/drawable-xxxhdpi/magnify_button.png | Bin 0 -> 3408 bytes
 .../layout-large-land/fragment_video_detail.xml  |   9 +++++++++
 .../main/res/layout/fragment_video_detail.xml    |  11 +++++++++++
 app/src/main/res/values/settings_keys.xml        |   2 +-
 app/src/main/res/values/strings.xml              |   1 +
 11 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxxhdpi/magnify_button.png

diff --git a/app/build.gradle b/app/build.gradle
index 7b69b5b72..b5a16ef9a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -196,9 +196,9 @@ dependencies {
     // Or you can use a commit you pushed to GitHub by just replacing TeamNewPipe with your GitHub
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
-    implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:289db1178ab66694c23893e6a487d4708343c47b'
-    implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
+    implementation 'com.github.teamnewpipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
+    implementation 'com.github.teamnewpipe:NewPipeExtractor:289db1178ab66694c23893e6a487d4708343c47b'
+    implementation 'com.github.teamnewpipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index c59dc7532..c15a9a3b9 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -550,7 +550,6 @@ public class RouterActivity extends AppCompatActivity {
         final AdapterChoiceItem popupPlayer = new AdapterChoiceItem(
                 getString(R.string.popup_player_key), getString(R.string.popup_player),
                 R.drawable.ic_picture_in_picture);
-
         final List<AdapterChoiceItem> returnedItems = new ArrayList<>();
         returnedItems.add(showInfo); // Always present
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/BaseDescriptionFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/BaseDescriptionFragment.java
index e3bdc6592..0b7ffdfd0 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/BaseDescriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/BaseDescriptionFragment.java
@@ -44,7 +44,6 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable;
 public abstract class BaseDescriptionFragment extends BaseFragment {
     private final CompositeDisposable descriptionDisposables = new CompositeDisposable();
     protected FragmentDescriptionBinding binding;
-
     @Override
     public View onCreateView(@NonNull final LayoutInflater inflater,
                              @Nullable final ViewGroup container,
diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
index defc8ba21..698acc8aa 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
@@ -62,7 +62,7 @@ public final class PlayQueueActivity extends AppCompatActivity
     private static final int MENU_ID_AUDIO_TRACK = 71;
 
     private Player player;
-
+    private boolean isFullscreen = false;
     private boolean serviceBound;
     private ServiceConnection serviceConnection;
 
@@ -526,7 +526,6 @@ public final class PlayQueueActivity extends AppCompatActivity
         unbind();
         finish();
     }
-
     ////////////////////////////////////////////////////////////////////////////
     // Binding Service Helper
     ////////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index a110a80d6..9a71013a4 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -387,7 +387,7 @@ public final class PlayerHelper {
         // 0: Screen orientation is locked
         // if the accelerometer sensor is missing completely, assume locked orientation
         return android.provider.Settings.System.getInt(
-                context.getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0) == 0
+                context.getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 1) == 0
                     || !context.getPackageManager()
                         .hasSystemFeature(PackageManager.FEATURE_SENSOR_ACCELEROMETER);
     }
diff --git a/app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java b/app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java
index 03f90a344..7b03b6fb7 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java
@@ -271,7 +271,7 @@ public final class MainPlayerUi extends VideoPlayerUi implements View.OnLayoutCh
 
         closeItemsList();
         showHideKodiButton();
-        binding.fullScreenButton.setVisibility(View.GONE);
+        binding.fullScreenButton.setVisibility(View.VISIBLE);
         setupScreenRotationButton();
         binding.resizeTextView.setVisibility(View.VISIBLE);
         binding.getRoot().findViewById(R.id.metadataView).setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/drawable-xxxhdpi/magnify_button.png b/app/src/main/res/drawable-xxxhdpi/magnify_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..aad13e4bb80e298231c1a00d28004a4a7a11f675
GIT binary patch
literal 3408
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index d18681056..fde80ff9c 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -157,6 +157,15 @@
                             android:layout_height="match_parent"
                             android:descendantFocusability="afterDescendants" />
 
+                        <ImageButton
+                            android:id="@+id/magnify_button"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical|end"
+                            android:contentDescription="@string/toggle_fullscreen"
+                            android:background="?attr/selectableItemBackground"
+                            android:scaleType="center"
+                            android:src="@drawable/ic_fullscreen_exit" />
                     </FrameLayout>
 
                 </org.schabi.newpipe.views.CustomCollapsingToolbarLayout>
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 1a4711581..c344b6367 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -140,12 +140,23 @@
                         tools:progress="40"
                         tools:visibility="visible" />
 
+
                     <!-- Player will be inserted here in realtime -->
                     <FrameLayout
                         android:id="@+id/player_placeholder"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent" />
 
+                    <ImageButton
+                        android:id="@+id/magnify_button"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center_vertical|end"
+                        android:contentDescription="@string/toggle_fullscreen"
+                        android:background="?attr/selectableItemBackground"
+                        android:scaleType="center"
+                        android:src="@drawable/ic_fullscreen" />
+
                 </FrameLayout>
             </org.schabi.newpipe.views.CustomCollapsingToolbarLayout>
 
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 880fa92da..426a7725d 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -85,7 +85,7 @@
     </string-array>
 
     <string name="start_main_player_fullscreen_key">start_main_player_fullscreen_key</string>
-
+    <string name="fullscreen_key">fullscreen_key</string>
     <string name="autoplay_key">autoplay_key</string>
     <string name="autoplay_value">@string/autoplay_wifi_key</string>
     <string name="autoplay_always_key">autoplay_always_key</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 435e9a382..5e6b6a2a5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -466,6 +466,7 @@
     <string name="caption_none">No Captions</string>
     <string name="resize_fit">Fit</string>
     <string name="resize_fill">Fill</string>
+    <string name="fullscreen">Fullscreen</string>
     <string name="resize_zoom">Zoom</string>
     <string name="caption_auto_generated">Auto-generated</string>
     <!-- Caption Settings -->