prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better handling of loading state when playing back audio

Browse source
This commit is contained in:
Jackson Harper 2022-08-17 11:39:27 +08:00
parent cdd5ba7417
commit 4ea42161b3
2 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift
View file

@ -56,6 +56,41 @@ struct WebReaderContainerView: View {
}
}
var audioNavbarItem: some View {
if audioSession.isLoadingItem(item: item) {
return AnyView(ProgressView()
.padding(.horizontal)
.scaleEffect(navBarVisibilityRatio))
} else {
return AnyView(Button(
action: {
switch audioSession.state {
case .playing:
if audioSession.item == self.item {
audioSession.pause()
return
}
fallthrough
case .paused:
if audioSession.item == self.item {
audioSession.unpause()
return
}
fallthrough
default:
audioSession.play(item: self.item)
}
},
label: {
Image(systemName: audioSession.isPlayingItem(item: item) ? "pause.circle" : "play.circle")
.font(.appTitleTwo)
}
)
.padding(.horizontal)
.scaleEffect(navBarVisibilityRatio))
}
}
var navBar: some View {
HStack(alignment: .center) {
#if os(iOS)
@ -72,32 +107,7 @@ struct WebReaderContainerView: View {
Spacer()
#endif
if FeatureFlag.enableTextToSpeechButton {
Button(
action: {
switch audioSession.state {
case .playing:
if audioSession.item == self.item {
audioSession.pause()
return
}
fallthrough
case .paused:
if audioSession.item == self.item {
audioSession.unpause()
return
}
fallthrough
default:
audioSession.play(item: self.item)
}
},
label: {
Image(systemName: audioSession.isPlayingItem(item: item) ? "pause.circle" : "play.circle")
.font(.appTitleTwo)
}
)
.padding(.horizontal)
.scaleEffect(navBarVisibilityRatio)
audioNavbarItem
}
Button(
action: { showPreferencesPopover.toggle() },

6
apple/OmnivoreKit/Sources/Services/AudioSession/AudioSession.swift
View file

@ -47,6 +47,10 @@ public class AudioSession: ObservableObject {
item = nil
}
public func isLoadingItem(item: LinkedItem) -> Bool {
state == .loading && self.item == item
}
public func isPlayingItem(item: LinkedItem) -> Bool {
state == .playing && self.item == item
}
@ -55,7 +59,7 @@ public class AudioSession: ObservableObject {
state = .loading
// Just simulating some loading delay here
DispatchQueue.main.asyncAfter(deadline: .now()) {
DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(1000)) {
self.audioUrl = Bundle.main.url(forResource: "speech-sample", withExtension: "mp3")!
if let url = self.audioUrl {
do {