feat: add pin video to top pref

InfinityLoop1308 · InfinityLoop1308 · commit 32212638b898 · 2026-01-11T09:20:39.000+08:00
diff --git a/library/src/commonMain/kotlin/project/pipepipe/app/ui/screens/settings/PlayerSettingScreen.kt b/library/src/commonMain/kotlin/project/pipepipe/app/ui/screens/settings/PlayerSettingScreen.kt
@@ -200,6 +200,12 @@ fun PlayerSettingScreen(
             summary = stringResource(MR.strings.start_main_player_fullscreen_summary),
             defaultValue = false
         ),
+        PreferenceItem.SwitchPref(
+            key = "pin_video_to_top_key",
+            title = stringResource(MR.strings.pin_video_to_top_title),
+            summary = stringResource(MR.strings.pin_video_to_top_summary),
+            defaultValue = true
+        ),
         PreferenceItem.ListPref(
             key = "autoplay_key",
             title = stringResource(MR.strings.autoplay_title),
diff --git a/library/src/commonMain/kotlin/project/pipepipe/app/ui/screens/videodetail/VideoDetailScreen.kt b/library/src/commonMain/kotlin/project/pipepipe/app/ui/screens/videodetail/VideoDetailScreen.kt
@@ -46,7 +46,6 @@ import project.pipepipe.app.database.DatabaseOperations
 import project.pipepipe.app.helper.NetworkStateHelper
 import project.pipepipe.app.platform.ScreenOrientation
 import project.pipepipe.app.ui.component.*
-import project.pipepipe.app.ui.component.player.PlayerGestureSettings
 import project.pipepipe.app.ui.component.player.VideoPlayer
 import project.pipepipe.app.uistate.VideoDetailPageState
 import kotlin.math.min
@@ -249,6 +248,23 @@ fun VideoDetailScreen(modifier: Modifier, navController: NavHostController) {
         }
     }
 
+    // Monitor comments inner scroll enabled state
+    var commentsInnerScrollEnabled by remember {
+        mutableStateOf(SharedContext.settingsManager.getBoolean("pin_video_to_top_key", true))
+    }
+
+    DisposableEffect(Unit) {
+        val listener = SharedContext.settingsManager.addBooleanListener(
+            "pin_video_to_top_key",
+            true
+        ) { newValue ->
+            commentsInnerScrollEnabled = newValue
+        }
+        onDispose {
+            listener?.deactivate()
+        }
+    }
+
     var configuredTabs by remember {
         mutableStateOf(SharedContext.settingsManager.getStringSet("video_tabs_key", setOf("comments", "related", "sponsorblock", "description")))
     }
@@ -453,14 +469,14 @@ fun VideoDetailScreen(modifier: Modifier, navController: NavHostController) {
                             }
                         } else if (controller != null) {
                             // Normal state: show full video detail UI
-                            val isPortrait = screenOrientation == ScreenOrientation.PORTRAIT
+                            val shouldPlayerSticky = screenOrientation == ScreenOrientation.PORTRAIT && commentsInnerScrollEnabled
 
                             // Player composable content
                             val playerContent: @Composable () -> Unit = {
                                 Box(
                                     modifier = Modifier
                                         .then(
-                                            if (isPortrait) Modifier.aspectRatio(16f / 9f)
+                                            if (shouldPlayerSticky) Modifier.aspectRatio(16f / 9f)
                                             else Modifier
                                                 .height(200.dp)
                                         )
@@ -498,7 +514,7 @@ fun VideoDetailScreen(modifier: Modifier, navController: NavHostController) {
                                 }
                             }
 
-                            if (isPortrait) {
+                            if (shouldPlayerSticky) {
                                 // Portrait mode: Player is sticky (outside LazyColumn)
                                 playerContent()
                             }
@@ -508,7 +524,7 @@ fun VideoDetailScreen(modifier: Modifier, navController: NavHostController) {
                                     .weight(1f),
                                 state = listState
                             ) {
-                                if (!isPortrait) {
+                                if (!shouldPlayerSticky) {
                                     // Landscape mode: Player participates in scrolling (inside LazyColumn)
                                     item { playerContent() }
                                 }
diff --git a/library/src/commonMain/moko-resources/base/strings.xml b/library/src/commonMain/moko-resources/base/strings.xml
@@ -543,6 +543,8 @@
 <string name="playback_skip_silence_summary">Automatically skip silent parts during playback</string>
 <string name="start_main_player_fullscreen_title">Start in fullscreen</string>
 <string name="start_main_player_fullscreen_summary">Start playback in fullscreen directly</string>
+<string name="pin_video_to_top_title">Pin video to top</string>
+<string name="pin_video_to_top_summary">Keep the video player pinned to the top when scrolling. Only applies in portrait mode.</string>
 <string name="advanced_formats_title">Enable advanced formats</string>
 <string name="advanced_formats_summary">If your device has support, enabling advanced formats can reduce data
         consumption and provide higher resolutions. You may not be able to watch high resolution videos without enabling
diff --git a/library/src/commonMain/moko-resources/de/strings.xml b/library/src/commonMain/moko-resources/de/strings.xml
@@ -586,4 +586,6 @@
 <string name="clear_all">Alles löschen</string>
 <string name="clear_all_logs_message">Möchten Sie wirklich alle Fehlerprotokolle löschen?</string>
 <string name="clear_all_logs_title">Alle Protokolle löschen</string>
+<string name="pin_video_to_top_summary">Den Videoplayer beim Scrollen oben anheften. Gilt nur im Hochformat.</string>
+<string name="pin_video_to_top_title">Video oben anheften</string>
 </resources>
diff --git a/library/src/commonMain/moko-resources/es/strings.xml b/library/src/commonMain/moko-resources/es/strings.xml
@@ -586,4 +586,6 @@
 <string name="clear_all">Borrar todo</string>
 <string name="clear_all_logs_message">¿Estás seguro de que quieres borrar todos los registros de errores?</string>
 <string name="clear_all_logs_title">Borrar todos los registros</string>
+<string name="pin_video_to_top_summary">Mantener el reproductor de video anclado en la parte superior al desplazarse. Solo se aplica en modo vertical.</string>
+<string name="pin_video_to_top_title">Anclar video en la parte superior</string>
 </resources>
diff --git a/library/src/commonMain/moko-resources/fr/strings.xml b/library/src/commonMain/moko-resources/fr/strings.xml
@@ -586,4 +586,6 @@
 <string name="clear_all">Tout effacer</string>
 <string name="clear_all_logs_message">Êtes-vous sûr de vouloir effacer tous les journaux d\'erreurs ?</string>
 <string name="clear_all_logs_title">Effacer tous les journaux</string>
+<string name="pin_video_to_top_summary">Garder le lecteur vidéo épinglé en haut lors du défilement. S\'applique uniquement en mode portrait.</string>
+<string name="pin_video_to_top_title">Épingler la vidéo en haut</string>
 </resources>
diff --git a/library/src/commonMain/moko-resources/it/strings.xml b/library/src/commonMain/moko-resources/it/strings.xml
@@ -586,4 +586,6 @@
 <string name="clear_all">Cancella tutto</string>
 <string name="clear_all_logs_message">Sei sicuro di voler cancellare tutti i log di errore?</string>
 <string name="clear_all_logs_title">Cancella tutti i log</string>
+<string name="pin_video_to_top_summary">Mantieni il riproduttore video bloccato in alto durante lo scorrimento. Si applica solo in modalità verticale.</string>
+<string name="pin_video_to_top_title">Blocca video in alto</string>
 </resources>
diff --git a/library/src/commonMain/moko-resources/ja/strings.xml b/library/src/commonMain/moko-resources/ja/strings.xml
@@ -586,4 +586,6 @@
 <string name="clear_all">すべてクリア</string>
 <string name="clear_all_logs_message">すべてのエラーログをクリアしてもよろしいですか？</string>
 <string name="clear_all_logs_title">すべてのログをクリア</string>
+<string name="pin_video_to_top_summary">スクロール時に動画プレーヤーを上部に固定します。ポートレートモードでのみ適用されます。</string>
+<string name="pin_video_to_top_title">動画を上部に固定</string>
 </resources>
diff --git a/library/src/commonMain/moko-resources/vi/strings.xml b/library/src/commonMain/moko-resources/vi/strings.xml
@@ -586,4 +586,6 @@
 <string name="clear_all">Xóa tất cả</string>
 <string name="clear_all_logs_message">Bạn có chắc chắn muốn xóa tất cả nhật ký lỗi không?</string>
 <string name="clear_all_logs_title">Xóa tất cả nhật ký</string>
+<string name="pin_video_to_top_summary">Giữ trình phát video được ghim ở trên cùng khi cuộn. Chỉ áp dụng ở chế độ dọc.</string>
+<string name="pin_video_to_top_title">Ghim video lên đầu</string>
 </resources>
diff --git a/library/src/commonMain/moko-resources/zh-CN/strings.xml b/library/src/commonMain/moko-resources/zh-CN/strings.xml
@@ -586,4 +586,6 @@
 <string name="clear_all">清除所有</string>
 <string name="clear_all_logs_message">您确定要清除所有错误日志吗？</string>
 <string name="clear_all_logs_title">清除所有日志</string>
+<string name="pin_video_to_top_summary">滚动时将视频播放器固定在顶部。仅适用于竖屏模式。</string>
+<string name="pin_video_to_top_title">将视频置顶</string>
 </resources>
diff --git a/library/src/commonMain/moko-resources/zh-TW/strings.xml b/library/src/commonMain/moko-resources/zh-TW/strings.xml
@@ -586,4 +586,6 @@
 <string name="clear_all">清除全部</string>
 <string name="clear_all_logs_message">您確定要清除所有錯誤日誌嗎？</string>
 <string name="clear_all_logs_title">清除所有日誌</string>
+<string name="pin_video_to_top_summary">捲動時將影片播放器固定在頂部。僅適用於直向模式。</string>
+<string name="pin_video_to_top_title">將影片固定在頂部</string>
 </resources>
