Settings view #80: Move voice settings from StatusBar to here.

filimo · filimo · commit 41de201df6e4 · 2020-03-11T05:13:28.000+03:00
diff --git a/ReaderTranslator.xcodeproj/project.pbxproj b/ReaderTranslator.xcodeproj/project.pbxproj
diff --git a/ReaderTranslator/Components/SettingsView/SettingsView.swift b/ReaderTranslator/Components/SettingsView/SettingsView.swift
@@ -15,21 +15,8 @@ struct SettingsView: View {
         Group {
             if viewStore.showSettings {
                 VStack {
-                    ForEach(AvailableView.resiableViews, id: \.self) { view in
-                        HStack {
-                            TextField(
-                                "",
-                                value: view.order,
-                                formatter: NumberFormatter.localInt
-                            ).frame(width: 20)
-                            Text(view.text).frame(width: 150, alignment: .leading)
-                            TextField(
-                                "",
-                                value: view.width,
-                                formatter: NumberFormatter.localCGFloat
-                            ).frame(width: 50)
-                        }
-                    }
+                    SettingsView_Views()
+                    SettingsView_Voice().padding([.top, .bottom], 5)
 
                     Button(
                         action: { self.viewStore.showSettings = false },
diff --git a/ReaderTranslator/Components/SettingsView/SettingsView_Views.swift b/ReaderTranslator/Components/SettingsView/SettingsView_Views.swift
@@ -0,0 +1,35 @@
+//
+//  SettingsView_Views.swift
+//  ReaderTranslator
+//
+//  Created by Viktor Kushnerov on 11/3/20.
+//  Copyright © 2020 Viktor Kushnerov. All rights reserved.
+//
+
+import SwiftUI
+
+struct SettingsView_Views: View {
+    var body: some View {
+        ForEach(AvailableView.resiableViews, id: \.self) { view in
+            HStack {
+                TextField(
+                    "",
+                    value: view.order,
+                    formatter: NumberFormatter.localInt
+                ).frame(width: 20)
+                Text(view.text).frame(width: 150, alignment: .leading)
+                TextField(
+                    "",
+                    value: view.width,
+                    formatter: NumberFormatter.localCGFloat
+                ).frame(width: 50)
+            }
+        }
+    }
+}
+
+struct SettingsView_Views_Previews: PreviewProvider {
+    static var previews: some View {
+        SettingsView_Views()
+    }
+}
diff --git a/ReaderTranslator/Components/SettingsView/SettingsView_Voice.swift b/ReaderTranslator/Components/SettingsView/SettingsView_Voice.swift
@@ -8,21 +8,21 @@
 
 import SwiftUI
 
-struct StatusBarView_Voice: View {
+struct SettingsView_Voice: View {
     var body: some View {
-        Group {
-            Divider().fixedSize()
-            Text("Voice: ")
-            StatusBarView_Voice_Select()
-            StatusBarView_Voice_Favorite()
-            StatusBarView_Voice_Toggle()
-            StatusBarView_Voice_Volume()
+        VStack {
+            HStack {
+                SettingsView_Voice_Select()
+                SettingsView_Voice_Favorite()
+            }
+            SettingsView_Voice_Toggle()
+            SettingsView_Voice_Rate()
         }
     }
 }
 
 struct StatusBarView_Voice_Previews: PreviewProvider {
     static var previews: some View {
-        StatusBarView_Voice()
+        SettingsView_Voice()
     }
 }
diff --git a/ReaderTranslator/Components/SettingsView/SettingsView_Voice_Favorite.swift b/ReaderTranslator/Components/SettingsView/SettingsView_Voice_Favorite.swift
@@ -0,0 +1,52 @@
+//
+//  StatusBarView_Voice_Favorite.swift
+//  ReaderTranslator
+//
+//  Created by Viktor Kushnerov on 9/28/19.
+//  Copyright © 2019 Viktor Kushnerov. All rights reserved.
+//
+
+import SwiftUI
+
+struct SettingsView_Voice_Favorite: View {
+    @ObservedObject var store = AudioStore.shared
+
+    var body: some View {
+        Group {
+            favotiteButton()
+            MenuButton(label: Image.sfSymbol("list.dash")) {
+                ForEach(store.favoriteVoiceNames, id: \.id) { item in
+                    Button(
+                        action: {
+                            self.store.language = item.language
+                            self.store.voiceName = item.voice
+                            SpeechSynthesizer.speak(isVoiceEnabled: true)
+                        },
+                        label: {
+                            Text("\(item.language) \(item.voice)")
+                        }
+                    )
+                }
+            }
+            .menuButtonStyle(BorderlessButtonMenuButtonStyle())
+            .fixedSize()
+        }
+    }
+
+    private func favotiteButton() -> some View {
+        let action = FavoriteVoiceName.isFavorite ?
+            { FavoriteVoiceName.removeCurrentVoice() } :
+            { FavoriteVoiceName.addCurrentVoice() }
+        let label = FavoriteVoiceName.isFavorite ?
+            { Image.sfSymbol("star.fill") } :
+            { Image.sfSymbol("star") }
+
+        return Button(action: action, label: label)
+    }
+}
+
+struct SettingsView_Voice_Favorite_Previews: PreviewProvider {
+    static var previews: some View {
+        SettingsView_Voice_Favorite()
+    }
+}
diff --git a/ReaderTranslator/Components/SettingsView/SettingsView_Voice_Rate.swift b/ReaderTranslator/Components/SettingsView/SettingsView_Voice_Rate.swift
@@ -8,11 +8,11 @@
 
 import SwiftUI
 
-struct StatusBarView_Voice_Volume: View {
+struct SettingsView_Voice_Rate: View {
     @ObservedObject var store = AudioStore.shared
 
     var body: some View {
-        Group {
+        HStack {
             Text("Rate:")
             #if os(macOS)
                 TextField(
@@ -35,8 +35,8 @@ struct StatusBarView_Voice_Volume: View {
     }
 }
 
-struct StatusBarView_Voice_Volume_Previews: PreviewProvider {
+struct SettingsView_Voice_Volume_Previews: PreviewProvider {
     static var previews: some View {
-        StatusBarView_Voice_Volume()
+        SettingsView_Voice_Rate()
     }
 }
diff --git a/ReaderTranslator/Components/SettingsView/SettingsView_Voice_Select.swift b/ReaderTranslator/Components/SettingsView/SettingsView_Voice_Select.swift
@@ -8,11 +8,12 @@
 
 import SwiftUI
 
-struct StatusBarView_Voice_Select: View {
+struct SettingsView_Voice_Select: View {
     @ObservedObject var store = AudioStore.shared
 
     var body: some View {
-        Group {
+        HStack {
+            Text("Language: ")
             MenuButton(store.language) {
                 ForEach(SpeechSynthesizer.languages, id: \.self) { language in
                     Button(
@@ -27,6 +28,7 @@ struct StatusBarView_Voice_Select: View {
             .menuButtonStyle(BorderlessButtonMenuButtonStyle())
             .fixedSize()
 
+            Text("Voice: ")
             MenuButton(store.voiceName) {
                 ForEach(SpeechSynthesizer.getVoices(language: store.language), id: \.id) { voice in
                     Button(
@@ -46,8 +48,8 @@ struct StatusBarView_Voice_Select: View {
     }
 }
 
-struct StatusBarView_Voice_Select_Previews: PreviewProvider {
+struct SettingsView_Voice_Select_Previews: PreviewProvider {
     static var previews: some View {
-        StatusBarView_Voice_Select()
+        SettingsView_Voice_Select()
     }
 }
diff --git a/ReaderTranslator/Components/SettingsView/SettingsView_Voice_Toggle.swift b/ReaderTranslator/Components/SettingsView/SettingsView_Voice_Toggle.swift
@@ -0,0 +1,38 @@
+//
+//  StatusBarView_Voice_Toggle.swift
+//  ReaderTranslator
+//
+//  Created by Viktor Kushnerov on 10/3/19.
+//  Copyright © 2019 Viktor Kushnerov. All rights reserved.
+//
+
+import SwiftUI
+
+struct SettingsView_Voice_Toggle: View {
+    @ObservedObject var audio = AudioStore.shared
+
+    var body: some View {
+        VStack {
+            HStack {
+                Text("Speak sentences")
+                Image.sfSymbol(audio.isSpeakSentences ? "speaker.3.fill" : "speaker")
+                    .onTapGesture { self.audio.isSpeakSentences.toggle() }
+                Slider(
+                    value: $audio.sentencesVolume,
+                    in: 0.1 ... 1.0,
+                    onEditingChanged: { _ in SpeechSynthesizer.speak() }
+                ).frame(width: 100)
+            }
+            HStack {
+                Text("Speak words")
+                Image.sfSymbol(audio.isSpeakWords ? "speaker.3.fill" : "speaker")
+                    .onTapGesture { self.audio.isSpeakWords.toggle() }
+                Slider(
+                    value: $audio.wordsVolume,
+                    in: 0.1 ... 1.0,
+                    onEditingChanged: { _ in SpeechSynthesizer.speak() }
+                ).frame(width: 100)
+            }
+        }
+    }
+}
diff --git a/ReaderTranslator/Views/StatusBarView/StatusBarView.swift b/ReaderTranslator/Views/StatusBarView/StatusBarView.swift
@@ -18,7 +18,6 @@ struct StatusBarView: View {
         HStack {
             StatusBarView_Zoom()
 
-            StatusBarView_Voice().padding([.top, .bottom], 5)
             StatusBarView_Safari()
             StatusBarView_Bookmarks()
             StatusBarView_ViewsEnabler()
@@ -27,7 +26,7 @@ struct StatusBarView: View {
             playbackRateView
             StatusBarView_SettingsView()
 //            StatusBarView_Sync()
-        }.padding(.trailing, 20)
+        }.padding(5)
     }
 
     private var speechHandler: some View {
diff --git a/ReaderTranslator/Views/StatusBarView/StatusBarView_Voice/StatusBarView_Voice_Favorite.swift b/ReaderTranslator/Views/StatusBarView/StatusBarView_Voice/StatusBarView_Voice_Favorite.swift
diff --git a/ReaderTranslator/Views/StatusBarView/StatusBarView_Voice/StatusBarView_Voice_Toggle.swift b/ReaderTranslator/Views/StatusBarView/StatusBarView_Voice/StatusBarView_Voice_Toggle.swift
diff --git a/ReaderTranslatorMac/Assets.xcassets/list.dash.imageset/Contents.json b/ReaderTranslatorMac/Assets.xcassets/list.dash.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "list.dash.pdf",
+      "language-direction" : "left-to-right"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/ReaderTranslatorMac/Assets.xcassets/list.dash.imageset/list.dash.pdf b/ReaderTranslatorMac/Assets.xcassets/list.dash.imageset/list.dash.pdf

Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,21 @@`
`8`	`8`
`9`	`9`	`import SwiftUI`
`10`	`10`
`11`		`-struct StatusBarView_Voice: View {`
	`11`	`+struct SettingsView_Voice: View {`
`12`	`12`	`var body: some View {`
`13`		`- Group {`
`14`		`- Divider().fixedSize()`
`15`		`- Text("Voice: ")`
`16`		`- StatusBarView_Voice_Select()`
`17`		`- StatusBarView_Voice_Favorite()`
`18`		`- StatusBarView_Voice_Toggle()`
`19`		`- StatusBarView_Voice_Volume()`
	`13`	`+ VStack {`
	`14`	`+ HStack {`
	`15`	`+ SettingsView_Voice_Select()`
	`16`	`+ SettingsView_Voice_Favorite()`
	`17`	`+ }`
	`18`	`+ SettingsView_Voice_Toggle()`
	`19`	`+ SettingsView_Voice_Rate()`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`struct StatusBarView_Voice_Previews: PreviewProvider {`
`25`	`25`	`static var previews: some View {`
`26`		`- StatusBarView_Voice()`
	`26`	`+ SettingsView_Voice()`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@`
`8`	`8`
`9`	`9`	`import SwiftUI`
`10`	`10`
`11`		`-struct StatusBarView_Voice_Volume: View {`
	`11`	`+struct SettingsView_Voice_Rate: View {`
`12`	`12`	`@ObservedObject var store = AudioStore.shared`
`13`	`13`
`14`	`14`	`var body: some View {`
`15`		`- Group {`
	`15`	`+ HStack {`
`16`	`16`	`Text("Rate:")`
`17`	`17`	`#if os(macOS)`
`18`	`18`	`TextField(`
`@@ -35,8 +35,8 @@ struct StatusBarView_Voice_Volume: View {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-struct StatusBarView_Voice_Volume_Previews: PreviewProvider {`
	`38`	`+struct SettingsView_Voice_Volume_Previews: PreviewProvider {`
`39`	`39`	`static var previews: some View {`
`40`		`- StatusBarView_Voice_Volume()`
	`40`	`+ SettingsView_Voice_Rate()`
`41`	`41`	`}`
`42`	`42`	`}`