Longman features #61: Fix ReaderTranslatorPlayer

filimo · Feb 5, 2020 · edb9e5b · edb9e5b
1 parent 7e82cac
commit edb9e5b
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 16 deletions.
diff --git a/ReaderTranslator/Views/StatusBarView/StatusBarView_Voice/StatusBarView_Voice_Toggle.swift b/ReaderTranslator/Views/StatusBarView/StatusBarView_Voice/StatusBarView_Voice_Toggle.swift
@@ -27,14 +27,22 @@ struct StatusBarView_Voice_Toggle: View {
                     HStack {
                         Image.sfSymbol(audio.isSpeakSentences ? "speaker.3.fill" : "speaker")
                             .onTapGesture { self.audio.isSpeakSentences.toggle() }
-                        Slider(value: $audio.sentencesVolume, in: 0.1 ... 1.0).frame(width: 100)
+                        Slider(
+                            value: $audio.sentencesVolume,
+                            in: 0.1 ... 1.0,
+                            onEditingChanged: { _ in SpeechSynthesizer.speak() }
+                        ).frame(width: 100)
                     }
                     Divider()
                     Text("Speak words")
                     HStack {
                         Image.sfSymbol(audio.isSpeakWords ? "speaker.3.fill" : "speaker")
                             .onTapGesture { self.audio.isSpeakWords.toggle() }
-                        Slider(value: $audio.wordsVolume, in: 0.1 ... 1.0).frame(width: 100)
+                        Slider(
+                            value: $audio.wordsVolume,
+                            in: 0.1 ... 1.0,
+                            onEditingChanged: { _ in SpeechSynthesizer.speak() }
+                        ).frame(width: 100)
                     }
                 }
             }

diff --git a/ReaderTranslatorMac/Info.plist b/ReaderTranslatorMac/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.3</string>
+	<string>1.9.4</string>
 	<key>CFBundleVersion</key>
 	<string>1800</string>
 	<key>LSApplicationCategoryType</key>

diff --git a/ReaderTranslatorPlayer/Store/AudioStore.swift b/ReaderTranslatorPlayer/Store/AudioStore.swift
@@ -41,8 +41,8 @@ final class AudioStore: NSObject, ObservableObject {
     }
 
     @Published(wrappedValue: nil, key: "lastAudio") var lastAudio: URL?
-    @Published(key: "isVoiceEnabled") var isEnabled = true
-    @Published(key: "voiceVolume") var volume: Float = 1
+    @Published(key: "isSpeakWords") var isSpeakWords = true
+    @Published(key: "wordsVolume") var wordsVolume: Float = 1
     @Published(key: "audioRate") var rate: Float = 1 {
         didSet {
             setupNowPlaying()

diff --git a/ReaderTranslatorPlayer/Views/ViewModes/GTranslatorView.swift b/ReaderTranslatorPlayer/Views/ViewModes/GTranslatorView.swift
@@ -16,7 +16,7 @@ struct GTranslatorView: View {
             .navigationBarItems(trailing:
                 Button(action: {
                     LongmanStore.shared.addAudio(url: self.sentence.url)
-                    LongmanStore.shared.next()
+                    LongmanStore.shared.play()
                 }, label: { self.soundIco })
             )
     }

diff --git a/ReaderTranslatorPlayer/Views/ViewModes/LongmanView.swift b/ReaderTranslatorPlayer/Views/ViewModes/LongmanView.swift
@@ -6,8 +6,11 @@
 //  Copyright © 2019 Viktor Kushnerov. All rights reserved.
 //
 
+import Combine
 import SwiftUI
 
+private var cancellableLongmanSpeak: AnyCancellable?
+
 struct LongmanView: View {
     var phrase: String
 
@@ -18,9 +21,10 @@ struct LongmanView: View {
         LongmanRepresenter(phrase: phrase)
             .onAppear {
                 self.store.hideNavBar = false
-                if self.longmanStore.word != self.phrase {
-                    RunLoop.main.perform {
-                        self.longmanStore.word = self.phrase
+                cancellableLongmanSpeak = self.longmanStore.fetchInfo(text: self.phrase)
+                .sink { isSoundExist in
+                    if isSoundExist {
+                        LongmanStore.shared.play()
                     }
                 }
             }

diff --git a/ReaderTranslatorPlayer/Views/ViewModes/SentencesView/SentencesView.swift b/ReaderTranslatorPlayer/Views/ViewModes/SentencesView/SentencesView.swift
@@ -6,8 +6,11 @@
 //  Copyright © 2019 Viktor Kushnerov. All rights reserved.
 //
 
+import Combine
 import SwiftUI
 
+private var cancellableLongmanSpeak: AnyCancellable?
+
 struct SentencesView: View {
     let bookmark: String
 
@@ -27,17 +30,18 @@ struct SentencesView: View {
                             showGTranlator: self.$showGTranlator,
                             showLongmanView: self.$showLongmanView)
                     }
-                }
+                }.frame(maxWidth: .infinity, maxHeight: .infinity)
             }
             navigationLinksView
         }
         .onAppear {
             self.store.hideNavBar = false
-            if self.longmanStore.word != self.bookmark {
-                RunLoop.main.perform {
-                    self.longmanStore.word = self.bookmark
+            cancellableLongmanSpeak = LongmanStore.shared.fetchInfo(text: self.bookmark)
+                .sink { isSoundExist in
+                    if isSoundExist {
+                        LongmanStore.shared.play()
+                    }
                 }
-            }
             self.showGTranlator = nil
             self.showLongmanView = false
         }
@@ -53,7 +57,7 @@ struct SentencesView: View {
             }
             if showLongmanView {
                 NavigationLink(
-                    destination: LongmanView(phrase: longmanStore.word),
+                    destination: LongmanView(phrase: self.bookmark),
                     isActive: .constant(true),
                     label: { EmptyView() })
             }

diff --git a/ReaderTranslatorPlayer/Views/ViewModes/SentencesView/SentencesView_Row.swift b/ReaderTranslatorPlayer/Views/ViewModes/SentencesView/SentencesView_Row.swift
@@ -19,7 +19,7 @@ struct SentencesView_Row: View {
         HStack {
             Button(action: {
                 LongmanStore.shared.addAudio(url: self.sentence.url)
-                LongmanStore.shared.next()
+                LongmanStore.shared.play()
             }, label: { self.soundIco })
             Button(
                 action: { self.showGTranlator = self.sentence },