Skip to content

Commit 6bec28e

Browse files
Xuan LiuXYW16
Xuan Liu
authored and
XYW16
committed
feat: Add pinned video player feature
- Add pinned video player toggle in Settings → Player - Implement YouTube-style pinned player that stays at top while scrolling - Add overlay layout for pinned mode with video player, title, uploader info, and tabs - Integrate with existing player system and preference management - Support seamless switching between pinned and scrollable modes
1 parent 09e4bea commit 6bec28e

5 files changed

Lines changed: 236 additions & 28 deletions

File tree

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

Lines changed: 98 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ public final class VideoDetailFragment
187187
} else if (getString(R.string.show_description_key).equals(key)) {
188188
showDescription = sharedPreferences.getBoolean(key, true);
189189
tabSettingsChanged = true;
190+
} else if (getString(R.string.pinned_video_player_key).equals(key)) {
191+
setupPinnedPlayerMode();
190192
}
191193
};
192194

@@ -207,6 +209,9 @@ public final class VideoDetailFragment
207209
@State
208210
protected boolean autoPlayEnabled = true;
209211

212+
// Pinned player fields
213+
private boolean isPinnedPlayerEnabled = false;
214+
210215
@Nullable
211216
private StreamInfo currentInfo = null;
212217
private Disposable currentWorker;
@@ -627,6 +632,9 @@ protected void initViews(final View rootView, final Bundle savedInstanceState) {
627632

628633
binding.detailThumbnailRootLayout.requestFocus();
629634

635+
// Setup pinned player mode
636+
setupPinnedPlayerMode();
637+
630638
binding.detailControlsPlayWithKodi.setVisibility(
631639
KoreUtils.shouldShowPlayWithKodi(requireContext(), serviceId)
632640
? View.VISIBLE
@@ -1271,7 +1279,14 @@ private void tryAddVideoPlayerView() {
12711279
if (binding != null) {
12721280
// prevent from re-adding a view multiple times
12731281
playerUi.removeViewFromParent();
1274-
binding.playerPlaceholder.addView(playerUi.getBinding().getRoot());
1282+
1283+
// Add to appropriate placeholder based on pinned mode
1284+
if (isPinnedPlayerEnabled) {
1285+
binding.pinnedPlayerPlaceholder.addView(playerUi.getBinding().getRoot());
1286+
} else {
1287+
binding.playerPlaceholder.addView(playerUi.getBinding().getRoot());
1288+
}
1289+
12751290
playerUi.setupVideoSurfaceIfNeeded();
12761291
}
12771292
});
@@ -1295,6 +1310,85 @@ private void makeDefaultHeightForVideoPlaceholder() {
12951310
binding.playerPlaceholder.requestLayout();
12961311
}
12971312

1313+
/*//////////////////////////////////////////////////////////////////////////
1314+
// Pinned Player Methods
1315+
//////////////////////////////////////////////////////////////////////////*/
1316+
1317+
/**
1318+
* Check if pinned player mode is enabled in settings.
1319+
*
1320+
* @return true if pinned player mode is enabled, false otherwise
1321+
*/
1322+
private boolean isPinnedPlayerEnabled() {
1323+
return PreferenceManager.getDefaultSharedPreferences(requireContext())
1324+
.getBoolean(getString(R.string.pinned_video_player_key), false);
1325+
}
1326+
1327+
/**
1328+
* Setup pinned player mode based on user preference.
1329+
*/
1330+
private void setupPinnedPlayerMode() {
1331+
isPinnedPlayerEnabled = isPinnedPlayerEnabled();
1332+
1333+
if (binding == null) {
1334+
return;
1335+
}
1336+
1337+
if (isPinnedPlayerEnabled) {
1338+
// Show pinned overlay, hide original content
1339+
binding.pinnedPlayerOverlay.setVisibility(View.VISIBLE);
1340+
binding.detailMainContent.setVisibility(View.GONE);
1341+
1342+
// Copy data to pinned layout
1343+
copyDataToPinnedLayout();
1344+
1345+
// Setup tabs for pinned mode
1346+
setupPinnedTabs();
1347+
} else {
1348+
// Show original layout, hide pinned overlay
1349+
binding.pinnedPlayerOverlay.setVisibility(View.GONE);
1350+
binding.detailMainContent.setVisibility(View.VISIBLE);
1351+
}
1352+
}
1353+
1354+
/**
1355+
* Copy video data to pinned layout elements.
1356+
*/
1357+
private void copyDataToPinnedLayout() {
1358+
if (currentInfo == null || binding == null) {
1359+
return;
1360+
}
1361+
1362+
// Copy title
1363+
binding.pinnedDetailTitleView.setText(currentInfo.getName());
1364+
1365+
// Copy uploader info
1366+
binding.pinnedDetailUploaderNameView.setText(currentInfo.getUploaderName());
1367+
// Note: Subscriber count and description methods may not be available
1368+
// binding.pinnedDetailUploaderSubscriberCountView.setText(
1369+
// currentInfo.getSubscriberCount());
1370+
// binding.pinnedDetailDescriptionView.setText(currentInfo.getDescription());
1371+
1372+
// Load uploader thumbnail - check if method exists
1373+
// if (currentInfo.getUploaderAvatarUrl() != null) {
1374+
// PicassoHelper.loadAvatarImage(currentInfo.getUploaderAvatarUrl())
1375+
// .into(binding.pinnedDetailUploaderThumbnailView);
1376+
// }
1377+
}
1378+
1379+
/**
1380+
* Setup tabs for pinned mode (similar to original tabs).
1381+
*/
1382+
private void setupPinnedTabs() {
1383+
if (binding == null || pageAdapter == null) {
1384+
return;
1385+
}
1386+
1387+
// Setup ViewPager and TabLayout for pinned mode
1388+
binding.pinnedViewPager.setAdapter(pageAdapter);
1389+
binding.pinnedTabLayout.setupWithViewPager(binding.pinnedViewPager);
1390+
}
1391+
12981392
private final ViewTreeObserver.OnPreDrawListener preDrawListener =
12991393
new ViewTreeObserver.OnPreDrawListener() {
13001394
@Override
@@ -1499,6 +1593,9 @@ public void handleResult(@NonNull final StreamInfo info) {
14991593

15001594
updateTabs(info);
15011595

1596+
// Update pinned player data when video info is loaded
1597+
copyDataToPinnedLayout();
1598+
15021599
animate(binding.detailThumbnailPlayButton, true, 200);
15031600
binding.detailVideoTitleView.setText(title);
15041601

‎app/src/main/res/layout/fragment_video_detail.xml‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,4 +704,131 @@
704704

705705
</RelativeLayout>
706706

707+
<!-- PINNED PLAYER OVERLAY (shown when pinned mode is enabled) -->
708+
<LinearLayout
709+
android:id="@+id/pinned_player_overlay"
710+
android:layout_width="match_parent"
711+
android:layout_height="match_parent"
712+
android:orientation="vertical"
713+
android:visibility="gone"
714+
android:background="?attr/windowBackground">
715+
716+
<!-- PINNED PLAYER AREA -->
717+
<FrameLayout
718+
android:id="@+id/pinned_player_placeholder"
719+
android:layout_width="match_parent"
720+
android:layout_height="200dp"
721+
android:background="@android:color/black" />
722+
723+
<!-- SCROLLABLE CONTENT BELOW PINNED PLAYER -->
724+
<androidx.core.widget.NestedScrollView
725+
android:id="@+id/pinned_content_scroll"
726+
android:layout_width="match_parent"
727+
android:layout_height="0dp"
728+
android:layout_weight="1"
729+
android:fillViewport="true">
730+
731+
<LinearLayout
732+
android:layout_width="match_parent"
733+
android:layout_height="wrap_content"
734+
android:orientation="vertical"
735+
android:padding="16dp">
736+
737+
<!-- TITLE -->
738+
<org.schabi.newpipe.views.NewPipeTextView
739+
android:id="@+id/pinned_detail_title_view"
740+
android:layout_width="match_parent"
741+
android:layout_height="wrap_content"
742+
android:textAppearance="?android:attr/textAppearanceMedium"
743+
android:textColor="?android:attr/textColorPrimary"
744+
android:textSize="16sp"
745+
android:layout_marginBottom="16dp"
746+
tools:text="Video Title" />
747+
748+
<!-- UPLOADER INFO -->
749+
<LinearLayout
750+
android:layout_width="match_parent"
751+
android:layout_height="wrap_content"
752+
android:orientation="horizontal"
753+
android:layout_marginBottom="16dp">
754+
755+
<ImageView
756+
android:id="@+id/pinned_detail_uploader_thumbnail_view"
757+
android:layout_width="40dp"
758+
android:layout_height="40dp"
759+
android:layout_marginEnd="12dp"
760+
android:background="@drawable/ic_person"
761+
android:contentDescription="@string/detail_uploader_thumbnail_view_description"
762+
android:scaleType="centerCrop"
763+
tools:src="@drawable/placeholder_thumbnail_channel" />
764+
765+
<LinearLayout
766+
android:layout_width="0dp"
767+
android:layout_height="wrap_content"
768+
android:layout_weight="1"
769+
android:orientation="vertical">
770+
771+
<org.schabi.newpipe.views.NewPipeTextView
772+
android:id="@+id/pinned_detail_uploader_name_view"
773+
android:layout_width="wrap_content"
774+
android:layout_height="wrap_content"
775+
android:textAppearance="?android:attr/textAppearanceMedium"
776+
android:textColor="?android:attr/textColorPrimary"
777+
android:textSize="14sp"
778+
tools:text="Channel Name" />
779+
780+
<org.schabi.newpipe.views.NewPipeTextView
781+
android:id="@+id/pinned_detail_uploader_subscriber_count_view"
782+
android:layout_width="wrap_content"
783+
android:layout_height="wrap_content"
784+
android:textAppearance="?android:attr/textAppearanceSmall"
785+
android:textColor="?android:attr/textColorSecondary"
786+
android:textSize="12sp"
787+
tools:text="1.2M subscribers" />
788+
789+
</LinearLayout>
790+
791+
<androidx.appcompat.widget.AppCompatButton
792+
android:id="@+id/pinned_detail_subscribe_button"
793+
android:layout_width="wrap_content"
794+
android:layout_height="wrap_content"
795+
android:text="@string/subscribe_button_title"
796+
android:textSize="12sp" />
797+
798+
</LinearLayout>
799+
800+
<!-- DESCRIPTION -->
801+
<org.schabi.newpipe.views.NewPipeTextView
802+
android:id="@+id/pinned_detail_description_view"
803+
android:layout_width="match_parent"
804+
android:layout_height="wrap_content"
805+
android:textAppearance="?android:attr/textAppearanceSmall"
806+
android:textColor="?android:attr/textColorSecondary"
807+
android:textSize="12sp"
808+
android:layout_marginBottom="16dp"
809+
tools:text="Stream meta info with link" />
810+
811+
<!-- TAB CONTENT (Comments, Related, etc.) -->
812+
<androidx.viewpager.widget.ViewPager
813+
android:id="@+id/pinned_view_pager"
814+
android:layout_width="match_parent"
815+
android:layout_height="400dp" />
816+
817+
</LinearLayout>
818+
819+
</androidx.core.widget.NestedScrollView>
820+
821+
<!-- TAB LAYOUT FOR PINNED MODE -->
822+
<com.google.android.material.tabs.TabLayout
823+
android:id="@+id/pinned_tab_layout"
824+
android:layout_width="match_parent"
825+
android:layout_height="wrap_content"
826+
app:elevation="16dp"
827+
app:tabBackground="?attr/windowBackground"
828+
app:tabGravity="fill"
829+
app:tabIconTint="?attr/colorAccent"
830+
app:tabIndicatorGravity="top" />
831+
832+
</LinearLayout>
833+
707834
</FrameLayout>

‎app/src/main/res/values-v35/styles.xml‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎app/src/main/res/values/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@
9191
<string name="clear_queue_confirmation_description">The active player queue will be replaced</string>
9292
<string name="ignore_hardware_media_buttons_title">Ignore hardware media button events</string>
9393
<string name="ignore_hardware_media_buttons_summary">Useful, for instance, if you are using a headset with broken physical buttons</string>
94+
<string name="pinned_video_player_key">pinned_video_player_key</string>
95+
<string name="pinned_video_player_title">Pin video player at top</string>
96+
<string name="pinned_video_player_summary">Keep the video player visible at the top while scrolling through comments and recommendations</string>
9497
<string name="show_comments_title">Show comments</string>
9598
<string name="show_comments_summary">Turn off to hide comments</string>
9699
<string name="show_next_and_similar_title">Show \'Next\' and \'Similar\' videos</string>

‎app/src/main/res/xml/video_audio_settings.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,5 +249,13 @@
249249
android:title="@string/ignore_hardware_media_buttons_title"
250250
app:singleLineTitle="false"
251251
app:iconSpaceReserved="false" />
252+
253+
<SwitchPreferenceCompat
254+
android:defaultValue="false"
255+
android:key="@string/pinned_video_player_key"
256+
android:summary="@string/pinned_video_player_summary"
257+
android:title="@string/pinned_video_player_title"
258+
app:singleLineTitle="false"
259+
app:iconSpaceReserved="false" />
252260
</PreferenceCategory>
253261
</PreferenceScreen>

0 commit comments

Comments
 (0)