Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-22 21:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

set playingFullscreen to proper value

Browse Source 
Signed-off-by: Toni Förster <toni.foerster@gmail.com>
This commit is contained in:
Toni Förster 2024-08-20 22:56:55 +02:00
parent 64a18678ce
commit 8e97d3f42f
No known key found for this signature in database
GPG Key ID: 292F3E5086C83FC7
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Model/Import Export Settings/Exporters/PlayerSettingsGroupExporter.swift
View File

@ -7,6 +7,7 @@ final class PlayerSettingsGroupExporter: SettingsGroupExporter {
"playerInstanceID": Defaults[.playerInstanceID] ?? "", "playerInstanceID": Defaults[.playerInstanceID] ?? "",
"pauseOnHidingPlayer": Defaults[.pauseOnHidingPlayer], "pauseOnHidingPlayer": Defaults[.pauseOnHidingPlayer],
"closeVideoOnEOF": Defaults[.closeVideoOnEOF], "closeVideoOnEOF": Defaults[.closeVideoOnEOF],
"exitFullscreenOnEOF": Defaults[.exitFullscreenOnEOF],
"expandVideoDescription": Defaults[.expandVideoDescription], "expandVideoDescription": Defaults[.expandVideoDescription],
"collapsedLinesDescription": Defaults[.collapsedLinesDescription], "collapsedLinesDescription": Defaults[.collapsedLinesDescription],
"showChapters": Defaults[.showChapters], "showChapters": Defaults[.showChapters],

4
Model/Import Export Settings/Importers/PlayerSettingsGroupImporter.swift
View File

@ -17,6 +17,10 @@ struct PlayerSettingsGroupImporter {
Defaults[.closeVideoOnEOF] = closeVideoOnEOF Defaults[.closeVideoOnEOF] = closeVideoOnEOF
} }
if let exitFullscreenOnEOF = json["exitFullscreenOnEOF"].bool {
Defaults[.exitFullscreenOnEOF] = exitFullscreenOnEOF
}
if let expandVideoDescription = json["expandVideoDescription"].bool { if let expandVideoDescription = json["expandVideoDescription"].bool {
Defaults[.expandVideoDescription] = expandVideoDescription Defaults[.expandVideoDescription] = expandVideoDescription
} }

4
Model/Player/Backends/PlayerBackend.swift
View File

@ -123,9 +123,7 @@ extension PlayerBackend {
if Defaults[.closeVideoOnEOF] { if Defaults[.closeVideoOnEOF] {
model.resetQueue() model.resetQueue()
model.hide() model.hide()
} } else if Defaults[.exitFullscreenOnEOF], model.playingFullScreen {
if !Defaults[.closeVideoOnEOF], Defaults[.exitFullscreenOnEOF], model.playingFullScreen {
model.exitFullScreen() model.exitFullScreen()
} }
#endif #endif

2
Model/Player/PlayerModel.swift
View File

@ -1001,6 +1001,7 @@ final class PlayerModel: ObservableObject {
logger.info("entering fullscreen") logger.info("entering fullscreen")
toggleFullscreen(false, showControls: showControls) toggleFullscreen(false, showControls: showControls)
self.playingFullScreen = true
} }
func exitFullScreen(showControls: Bool = true) { func exitFullScreen(showControls: Bool = true) {
@ -1008,6 +1009,7 @@ final class PlayerModel: ObservableObject {
logger.info("exiting fullscreen") logger.info("exiting fullscreen")
toggleFullscreen(true, showControls: showControls) toggleFullscreen(true, showControls: showControls)
self.playingFullScreen = false
} }
func updateNowPlayingInfo() { func updateNowPlayingInfo() {

1
Shared/Defaults.swift
View File

@ -75,6 +75,7 @@ extension Defaults.Keys {
static let expandVideoDescription = Key<Bool>("expandVideoDescription", default: expandVideoDescriptionDefault) static let expandVideoDescription = Key<Bool>("expandVideoDescription", default: expandVideoDescriptionDefault)
static let collapsedLinesDescription = Key<Int>("collapsedLinesDescription", default: 5) static let collapsedLinesDescription = Key<Int>("collapsedLinesDescription", default: 5)
static let exitFullscreenOnEOF = Key<Bool>("exitFullscreenOnEOF", default: true)
static let showChapters = Key<Bool>("showChapters", default: true) static let showChapters = Key<Bool>("showChapters", default: true)
static let showChapterThumbnails = Key<Bool>("showChapterThumbnails", default: true) static let showChapterThumbnails = Key<Bool>("showChapterThumbnails", default: true)