Add scrollbars in video details and button to scroll comments to top

Added player settings to disable scroll to top button

Fix #439

Shared/Defaults.swift

@@ -136,6 +136,10 @@ extension Defaults.Keys {
     static let seekGestureSpeed = Key<Double>("seekGestureSpeed", default: 0.5)
     static let seekGestureSensitivity = Key<Double>("seekGestureSensitivity", default: 30.0)
     static let showKeywords = Key<Bool>("showKeywords", default: false)
+    #if !os(tvOS)
+        static let showScrollToTopInComments = Key<Bool>("showScrollToTopInComments", default: true)
+    #endif
+
     #if os(iOS)
         static let expandVideoDescriptionDefault = Constants.isIPad
     #else

Shared/Player/Video Details/CommentsView.swift

@@ -1,7 +1,6 @@
 import SwiftUI
 
 struct CommentsView: View {
-    var embedInScrollView = false
     @State private var repliesID: Comment.ID?
 
     @ObservedObject private var comments = CommentsModel.shared
@@ -16,7 +15,7 @@ struct CommentsView: View {
                 PlaceholderProgressView()
             } else {
                 let last = comments.all.last
-                let commentsStack = LazyVStack {
+                LazyVStack {
                     ForEach(comments.all) { comment in
                         CommentView(comment: comment, repliesID: $repliesID)
                             .onAppear {
@@ -25,15 +24,6 @@ struct CommentsView: View {
                             .borderBottom(height: comment != last ? 0.5 : 0, color: Color("ControlsBorderColor"))
                     }
                 }
-
-                if embedInScrollView {
-                    ScrollView(.vertical, showsIndicators: false) {
-                        commentsStack
-                        Color.clear.frame(height: 50)
-                    }
-                } else {
-                    commentsStack
-                }
             }
         }
         .padding(.horizontal)

Shared/Player/Video Details/VideoDetails.swift

@@ -4,6 +4,8 @@ import SDWebImageSwiftUI
 import SwiftUI
 
 struct VideoDetails: View {
+    static let pageMenuID = "pageMenu"
+
     struct TitleView: View {
         @ObservedObject private var model = PlayerModel.shared
         @State private var titleSize = CGSize.zero
@@ -170,12 +172,15 @@ struct VideoDetails: View {
     @Environment(\.colorScheme) private var colorScheme
 
     @ObservedObject private var accounts = AccountsModel.shared
-    let comments = CommentsModel.shared
+    @ObservedObject private var comments = CommentsModel.shared
     @ObservedObject private var player = PlayerModel.shared
 
     @Default(.enableReturnYouTubeDislike) private var enableReturnYouTubeDislike
     @Default(.playerSidebar) private var playerSidebar
     @Default(.showInspector) private var showInspector
+    #if !os(tvOS)
+        @Default(.showScrollToTopInComments) private var showScrollToTopInComments
+    #endif
     @Default(.expandVideoDescription) private var expandVideoDescription
 
     var body: some View {
@@ -211,7 +216,10 @@ struct VideoDetails: View {
                 .animation(nil, value: player.currentItem)
                 .frame(minWidth: 0, maxWidth: .infinity)
 
+            ScrollViewReader { proxy in
                 pageView
+                    .overlay(scrollToTopButton(proxy), alignment: .bottomTrailing)
+            }
             #if os(iOS)
             .opacity(detailsVisibility ? 1 : 0)
             #endif
@@ -266,9 +274,10 @@ struct VideoDetails: View {
     }
 
     var pageView: some View {
-        ScrollView(.vertical, showsIndicators: false) {
+        ScrollView(.vertical) {
             LazyVStack {
                 pageMenu
+                    .id(Self.pageMenuID)
                     .padding(5)
 
                 switch page {
@@ -319,7 +328,6 @@ struct VideoDetails: View {
                                         .padding(.top, 20)
                                 }
                             }
-                            .padding(.bottom, 60)
                         }
                     }
                     .onAppear {
@@ -338,12 +346,13 @@ struct VideoDetails: View {
                         .padding(.horizontal)
 
                 case .comments:
-                    CommentsView(embedInScrollView: false)
+                    CommentsView()
                         .onAppear {
                             comments.loadIfNeeded()
                         }
                 }
             }
+            .padding(.bottom, 60)
         }
         #if os(iOS)
         .onAppear {
@@ -365,6 +374,30 @@ struct VideoDetails: View {
         }
     }
 
+    @ViewBuilder func scrollToTopButton(_ proxy: ScrollViewProxy) -> some View {
+        #if !os(tvOS)
+            if showScrollToTopInComments,
+               page == .comments,
+               comments.loaded,
+               comments.all.count > 3
+            {
+                Button {
+                    withAnimation {
+                        proxy.scrollTo(Self.pageMenuID)
+                    }
+                } label: {
+                    Label("Scroll to top", systemImage: "arrow.up")
+                        .padding(8)
+                        .foregroundColor(.white)
+                        .background(Circle().opacity(0.8).foregroundColor(.accentColor))
+                }
+                .padding()
+                .labelStyle(.iconOnly)
+                .buttonStyle(.plain)
+            }
+        #endif
+    }
+
     var descriptionHeader: some View {
         HStack {
             Text("Description".localized())

Shared/Settings/PlayerSettings.swift

@@ -8,6 +8,9 @@ struct PlayerSettings: View {
     @Default(.playerSidebar) private var playerSidebar
 
     @Default(.showKeywords) private var showKeywords
+    #if !os(tvOS)
+        @Default(.showScrollToTopInComments) private var showScrollToTopInComments
+    #endif
     @Default(.expandVideoDescription) private var expandVideoDescription
     @Default(.pauseOnHidingPlayer) private var pauseOnHidingPlayer
     #if os(iOS)
@@ -86,6 +89,11 @@ struct PlayerSettings: View {
 
                 if !accounts.isEmpty {
                     keywordsToggle
+
+                    #if !os(tvOS)
+                        showScrollToTopInCommentsToggle
+                    #endif
+
                     #if !os(tvOS)
                         expandVideoDescriptionToggle
                     #endif
@@ -160,6 +168,12 @@ struct PlayerSettings: View {
         .modifier(SettingsPickerModifier())
     }
 
+    #if !os(tvOS)
+        private var showScrollToTopInCommentsToggle: some View {
+            Toggle("Show scroll to top button in comments", isOn: $showScrollToTopInComments)
+        }
+    #endif
+
     private var keywordsToggle: some View {
         Toggle("Show keywords", isOn: $showKeywords)
     }