new SeekType chapterSkip

When a user taps on a chapter, the pop now also shows the name of the chapter. The chapters are now marked in AppRedColor instead of orange. This is based on PR yattee#639 That one needs to be merged first before this one can go in.
stonerl · May 3, 2024 · 03fbb49 · 03fbb49
1 parent ae65acd
commit 03fbb49
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Model/SeekType.swift b/Model/SeekType.swift
@@ -1,6 +1,7 @@
 import Foundation
 
 enum SeekType: Equatable {
+    case chapterSkip(String)
     case segmentSkip(String)
     case segmentRestore
     case userInteracted

diff --git a/Shared/Player/Controls/OSD/Seek.swift b/Shared/Player/Controls/OSD/Seek.swift
@@ -85,6 +85,14 @@ struct Seek: View {
                             .font(.system(size: playerControlsLayout.segmentFontSize))
                             .foregroundColor(getColor(for: category))
                             .padding(.bottom, 3)
+                    case let .chapterSkip(chapter):
+                        Divider()
+                        Text(chapter)
+                            .font(.system(size: playerControlsLayout.segmentFontSize))
+                            .truncationMode(.tail)
+                            .multilineTextAlignment(.center)
+                            .foregroundColor(Color("AppRedColor"))
+                            .padding(.bottom, 3)
                     default:
                         EmptyView()
                     }

diff --git a/Shared/Player/Controls/TimelineView.swift b/Shared/Player/Controls/TimelineView.swift
@@ -333,7 +333,7 @@ struct TimelineView: View {
     var chaptersLayers: some View {
         ForEach(chapters) { chapter in
             RoundedRectangle(cornerRadius: 4)
-                .fill(Color.orange)
+                .fill(Color("AppRedColor"))
                 .frame(maxWidth: 2, maxHeight: height)
                 .offset(x: (chapter.start * oneUnitWidth) - 1)
         }

diff --git a/Shared/Player/Video Details/ChapterView.swift b/Shared/Player/Video Details/ChapterView.swift
@@ -15,7 +15,7 @@ import SwiftUI
 
         var body: some View {
             Button(action: {
-                player.backend.seek(to: chapter.start, seekType: .userInteracted)
+                player.backend.seek(to: chapter.start, seekType: .chapterSkip(chapter.title))
             }) {
                 Group {
                     verticalChapter
@@ -72,7 +72,7 @@ import SwiftUI
 
         var body: some View {
             Button {
-                player.backend.seek(to: chapter.start, seekType: .userInteracted)
+                player.backend.seek(to: chapter.start, seekType: .chapterSkip(chapter.title))
             } label: {
                 Group {
                     horizontalChapter