Skip to content

Commit

Permalink
Enable chapter support in the main custom player layout (#855)
Browse files Browse the repository at this point in the history
  • Loading branch information
defagos authored Apr 30, 2024
1 parent eab0c9f commit f6112d1
Show file tree
Hide file tree
Showing 7 changed files with 160 additions and 216 deletions.
12 changes: 4 additions & 8 deletions Demo/Pillarbox-demo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
0E011D1A2B2DF9BE00DAAD3D /* MediaCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011D192B2DF9BE00DAAD3D /* MediaCardView.swift */; };
0E4128BD2AFB7F2A00D67759 /* InlineSystemPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E4128BC2AFB7F2A00D67759 /* InlineSystemPlayerView.swift */; };
0E4128BF2AFB959B00D67759 /* PlayerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E4128BE2AFB959B00D67759 /* PlayerViewModel.swift */; };
0E46D3012BD2754400133AE2 /* ChaptersPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E46D3002BD2754400133AE2 /* ChaptersPlayerView.swift */; };
0E46D3012BD2754400133AE2 /* PlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E46D3002BD2754400133AE2 /* PlayerView.swift */; };
0E48F3FC2B2DBAD4001982BB /* CustomNavigationLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E48F3FB2B2DBAD4001982BB /* CustomNavigationLink.swift */; };
0E6B995C29D43E4200D0276D /* OptInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E6B995B29D43E4200D0276D /* OptInView.swift */; };
0EB94A1F2B5AE29000FF3175 /* HighSpeedView~ios.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB94A1E2B5AE29000FF3175 /* HighSpeedView~ios.swift */; };
Expand Down Expand Up @@ -67,7 +67,6 @@
6F59E89B29CF31E20093E6FB /* SystemPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F59E86D29CF31E10093E6FB /* SystemPlayerView.swift */; };
6F59E89C29CF31E20093E6FB /* BasicPlaybackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F59E86E29CF31E10093E6FB /* BasicPlaybackView.swift */; };
6F59E89D29CF31E20093E6FB /* VanillaPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F59E86F29CF31E10093E6FB /* VanillaPlayerView.swift */; };
6F59E89E29CF31E20093E6FB /* PlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F59E87029CF31E10093E6FB /* PlayerView.swift */; };
6F59E8A029CF31E20093E6FB /* Constant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F59E87329CF31E10093E6FB /* Constant.swift */; };
6F59E8A229CF31E20093E6FB /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F59E87529CF31E10093E6FB /* Logger.swift */; };
6F59E8A329CF31E20093E6FB /* ExamplesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F59E87729CF31E10093E6FB /* ExamplesView.swift */; };
Expand Down Expand Up @@ -99,7 +98,7 @@
0E011D192B2DF9BE00DAAD3D /* MediaCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaCardView.swift; sourceTree = "<group>"; };
0E4128BC2AFB7F2A00D67759 /* InlineSystemPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineSystemPlayerView.swift; sourceTree = "<group>"; };
0E4128BE2AFB959B00D67759 /* PlayerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerViewModel.swift; sourceTree = "<group>"; };
0E46D3002BD2754400133AE2 /* ChaptersPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChaptersPlayerView.swift; sourceTree = "<group>"; };
0E46D3002BD2754400133AE2 /* PlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlayerView.swift; sourceTree = "<group>"; };
0E48F3FB2B2DBAD4001982BB /* CustomNavigationLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomNavigationLink.swift; sourceTree = "<group>"; };
0E6B995B29D43E4200D0276D /* OptInView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptInView.swift; sourceTree = "<group>"; };
0EB94A1E2B5AE29000FF3175 /* HighSpeedView~ios.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HighSpeedView~ios.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -161,7 +160,6 @@
6F59E86D29CF31E10093E6FB /* SystemPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SystemPlayerView.swift; sourceTree = "<group>"; };
6F59E86E29CF31E10093E6FB /* BasicPlaybackView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicPlaybackView.swift; sourceTree = "<group>"; };
6F59E86F29CF31E10093E6FB /* VanillaPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VanillaPlayerView.swift; sourceTree = "<group>"; };
6F59E87029CF31E10093E6FB /* PlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlayerView.swift; sourceTree = "<group>"; };
6F59E87329CF31E10093E6FB /* Constant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constant.swift; sourceTree = "<group>"; };
6F59E87529CF31E10093E6FB /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
6F59E87729CF31E10093E6FB /* ExamplesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamplesView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -404,11 +402,10 @@
isa = PBXGroup;
children = (
6F59E86E29CF31E10093E6FB /* BasicPlaybackView.swift */,
0E46D3002BD2754400133AE2 /* ChaptersPlayerView.swift */,
0E4128BC2AFB7F2A00D67759 /* InlineSystemPlayerView.swift */,
6F59E86B29CF31E10093E6FB /* PlaybackView.swift */,
6F59E86A29CF31E10093E6FB /* PlayerConfiguration.swift */,
6F59E87029CF31E10093E6FB /* PlayerView.swift */,
0E46D3002BD2754400133AE2 /* PlayerView.swift */,
0E4128BE2AFB959B00D67759 /* PlayerViewModel.swift */,
6F59E86C29CF31E10093E6FB /* SimplePlayerView.swift */,
6F59E86D29CF31E10093E6FB /* SystemPlayerView.swift */,
Expand Down Expand Up @@ -643,7 +640,6 @@
6F7EAA552B17755C00194D03 /* TrackingProgressTutorial~ios.swift in Sources */,
6F59E88229CF31E10093E6FB /* Media.swift in Sources */,
6F59E87E29CF31E10093E6FB /* ServerSetting.swift in Sources */,
6F59E89E29CF31E20093E6FB /* PlayerView.swift in Sources */,
6F59E87929CF31E10093E6FB /* SearchView.swift in Sources */,
6F59E88029CF31E10093E6FB /* RadioChannel.swift in Sources */,
6F0E5CD32B3394EA0031E313 /* PiPButton.swift in Sources */,
Expand Down Expand Up @@ -681,7 +677,7 @@
6FCB9DDE29E024E900961B69 /* BlurredView.swift in Sources */,
6F59E89129CF31E20093E6FB /* WrappedView.swift in Sources */,
6F59E88629CF31E20093E6FB /* ContentListView.swift in Sources */,
0E46D3012BD2754400133AE2 /* ChaptersPlayerView.swift in Sources */,
0E46D3012BD2754400133AE2 /* PlayerView.swift in Sources */,
6FC5D6A22A6FA8D20012BC89 /* Modal.swift in Sources */,
6F59E89B29CF31E20093E6FB /* SystemPlayerView.swift in Sources */,
6F59E87B29CF31E10093E6FB /* DemoApp.swift in Sources */,
Expand Down
4 changes: 0 additions & 4 deletions Demo/Sources/ContentLists/ContentListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,7 @@ private struct ContentCell: View {
type: .urn(media.urn, server: serverSetting.server),
isMonoscopic: media.isMonoscopic
)
#if os(iOS)
router.presented = .chaptersPlayer(media: media)
#else
router.presented = .player(media: media)
#endif
}
#if os(iOS)
.swipeActions { CopyButton(text: media.urn) }
Expand Down
179 changes: 0 additions & 179 deletions Demo/Sources/Players/ChaptersPlayerView.swift

This file was deleted.

Loading

0 comments on commit f6112d1

Please sign in to comment.