[MINOR] Make changes following client visit

AceCentre · Mar 27, 2024 · b669ffb · b669ffb
1 parent 66ef8f2
commit b669ffb
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 13 deletions.
diff --git a/DragToSpeak/Components/CellView.swift b/DragToSpeak/Components/CellView.swift
@@ -42,6 +42,8 @@ struct CellView: View {
                 baseColor = .green.opacity(0.5)
             case .space:
                 baseColor = .blue.opacity(0.5)
+            case .clear:
+                baseColor = .red.opacity(0.5)
             default:
                 baseColor = .white
             }

diff --git a/DragToSpeak/Components/MessageAndControlsArea.swift b/DragToSpeak/Components/MessageAndControlsArea.swift
@@ -8,6 +8,8 @@
 import SwiftUI
 
 struct MessageAndControlsArea: View {
+    @EnvironmentObject var appSettings: AppSettings
+
     @ObservedObject var messageController: MessageController
 
     var body: some View {
@@ -16,16 +18,22 @@ struct MessageAndControlsArea: View {
                 MessageBox(message: messageController.currentMessage)
 
                 HStack {
-                    Button(action: {
-                        messageController.clearMessage()
-                    }) {
-                        Label("Clear", systemImage: "trash")
-                    }.buttonStyle(.borderedProminent)
+                    if !appSettings.hideClearButton {
+                        Button(action: {
+                            messageController.clearMessage()
+                        }) {
+                            Label("Clear", systemImage: "trash")
+                                .padding()
+                        }
+                        .buttonStyle(.borderedProminent)
+                        .clipShape(Capsule())
+                    }
 
                     SheetLink(destination: {
                         SettingsPage()
                     }, label: {
                         Label("Settings", systemImage: "gear")
+
                     })
                 }
             }

diff --git a/DragToSpeak/Components/SheetLink.swift b/DragToSpeak/Components/SheetLink.swift
@@ -20,6 +20,8 @@ struct SheetLink<DestinationContent: View, LabelContent: View>: View {
             label
         }).sheet(isPresented: $openSheet) {
             destination
-        }.buttonStyle(.borderedProminent)
+        }
+        .buttonStyle(BorderedButtonStyle())
+        .clipShape(Capsule())
     }
 }
diff --git a/DragToSpeak/Model/Cell.swift b/DragToSpeak/Model/Cell.swift
@@ -15,6 +15,7 @@ struct Cell: Equatable, Hashable {
         case finish
         case delete
         case blank
+        case clear
     }
 
     var type: CellType
@@ -23,6 +24,14 @@ struct Cell: Equatable, Hashable {
     var messageText: String
     var widthModifier: Double
 
+    init(isClear: Bool) {
+        type = .clear
+        displayText = "Clear"
+        messageText = ""
+        speakText = ""
+        widthModifier = 1
+    }
+
     init(isDelete: Bool) {
         type = .delete
         displayText = "Delete"

diff --git a/DragToSpeak/Model/Layout.swift b/DragToSpeak/Model/Layout.swift
@@ -29,7 +29,7 @@ enum Layout: Int {
                     [Cell(letter:"P"), Cell(letter: "Q"), Cell(letter: "R"), Cell(letter: "S"), Cell(letter: "T")],
                    [Cell(letter:"U"), Cell(letter: "V"), Cell(letter: "W"), Cell(letter: "X"), Cell(letter: "Y")],
                    [Cell(letter:"Z"), Cell(isSpace: true), Cell(word: "YES"), Cell(word: "NO"), Cell(isDelete: true)],
-                   [Cell(word:"Thank you"), Cell(word: "OK"), Cell(word: "The"), Cell(word: "Please"), Cell(isFinish: true)],
+                    [Cell(word:"Thank you"), Cell(word: "OK"), Cell(word: "Please"), Cell(isClear: true), Cell(isFinish: true)],
                    [Cell(letter:"0"), Cell(letter: "1"), Cell(letter: "2"), Cell(letter: "3"), Cell(letter: "4")],
                    [Cell(letter:"5"), Cell(letter: "6"), Cell(letter: "7"), Cell(letter: "8"), Cell(letter: "9")]]
        case .alphabeticalNoNumbers:
@@ -39,14 +39,14 @@ enum Layout: Int {
                    [Cell(letter:"P"), Cell(letter: "Q"), Cell(letter: "R"), Cell(letter: "S"), Cell(letter: "T")],
                    [Cell(letter:"U"), Cell(letter: "V"), Cell(letter: "W"), Cell(letter: "X"), Cell(letter: "Y")],
                    [Cell(letter:"Z"), Cell(isSpace: true), Cell(word: "YES"), Cell(word: "NO"), Cell(isDelete: true)],
-                   [Cell(word:"Thank you"), Cell(word: "OK"), Cell(word: "The"), Cell(word: "Please"), Cell(isFinish: true)]]
+                   [Cell(word:"Thank you"), Cell(word: "OK"), Cell(word: "Please"), Cell(isClear: true),  Cell(isFinish: true)]]
        case .frequency:
            return  [[Cell(letter:" Z"), Cell(letter: "V"), Cell(letter: "C"), Cell(letter: "H"), Cell(letter: "W"), Cell(letter: "K")],
                     [Cell(letter:"F"), Cell(letter: "I"), Cell(letter: "T"), Cell(letter: "A"), Cell(letter: "L"), Cell(letter: "Y")],
                     [Cell(letter:""), Cell(isSpace: true), Cell(letter: "N"), Cell(letter: "E"), Cell(isDelete: true), Cell(isFinish: true)],
                     [Cell(letter:"G"), Cell(letter: "D"), Cell(letter: "O"), Cell(letter: "R"), Cell(letter: "S"), Cell(letter: "B")],
                     [Cell(letter:"Q"), Cell(letter: "J"), Cell(letter: "U"), Cell(letter: "M"), Cell(letter: "P"), Cell(letter: "X")],
-                    [Cell(word:"Thank you"), Cell(word: "OK"), Cell(word: "The"), Cell(word: "Yes"), Cell(word: "NO"), Cell(word: "Please")],
+                    [Cell(word:"Thank you"), Cell(word: "OK"), Cell(isClear: true), Cell(word: "Yes"), Cell(word: "NO"), Cell(word: "Please")],
                     [Cell(letter:"0"), Cell(letter: "1"), Cell(letter: "2"), Cell(letter: "3"), Cell(letter: "4"), Cell(isBlank: true)],
                     [Cell(letter:"5"), Cell(letter: "6"), Cell(letter: "7"), Cell(letter: "8"), Cell(letter: "9"), Cell(isBlank: true)]]
        case .qwerty:
@@ -55,7 +55,7 @@ enum Layout: Int {
                    [Cell(letter:"Q"), Cell(letter: "W"), Cell(letter: "E"), Cell(letter: "R"), Cell(letter: "T"), Cell(letter: "Y"), Cell(letter: "U"), Cell(letter: "I"), Cell(letter: "O"), Cell(letter: "P")],
                    [Cell(letter:"A"), Cell(letter: "S"), Cell(letter: "D"), Cell(letter: "F"), Cell(letter: "G"), Cell(letter: "H"), Cell(letter: "J"), Cell(letter: "K"), Cell(letter: "L"), Cell(word: "Some word")],
                    [Cell(letter:"Z"), Cell(letter: "X"), Cell(letter: "C"), Cell(letter: "V"), Cell(letter: "B"), Cell(letter: "N"), Cell(letter: "M"), Cell(isBlank: true), Cell(letter: "?"), Cell(word: "I need the toilet")],
-                   [Cell(isFinish: true), Cell(isSpace: true), Cell(isDelete: true)]]
+                   [Cell(isFinish: true), Cell(isSpace: true), Cell(isDelete: true), Cell(isClear: true)]]
 
     }
 }

diff --git a/DragToSpeak/Observable/AppSettings.swift b/DragToSpeak/Observable/AppSettings.swift
@@ -21,4 +21,7 @@ class AppSettings: ObservableObject {
     @AppStorage("fontSize") var fontSize: Int = 10
     @AppStorage("finishOnDragEnd") var finishOnDragEnd: Bool = false
     @AppStorage("spacesColumn") var spacesColumn: SpacesColumn = .none
+    @AppStorage("readEachLetter") var readEachLetter: Bool = true
+    @AppStorage("hideClearButton") var hideClearButton: Bool = false
+
 }
diff --git a/DragToSpeak/Observable/GridController.swift b/DragToSpeak/Observable/GridController.swift
@@ -56,13 +56,18 @@ class GridController: ObservableObject {
 
         if
             let unwrappedMessageController = messageController,
-            let unwrappedVoiceEngine = voiceEngine
+            let unwrappedVoiceEngine = voiceEngine,
+            let unwrappedAppSettings = appSettings
         {
             if cell.type == .letter {
-                unwrappedVoiceEngine.speak(cell.speakText)
+                if unwrappedAppSettings.readEachLetter {
+                    unwrappedVoiceEngine.speak(cell.speakText)
+                }
                 unwrappedMessageController.currentMessage += cell.messageText
             } else if cell.type == .word {
-                unwrappedVoiceEngine.speak(cell.speakText)
+                if unwrappedAppSettings.readEachLetter {
+                    unwrappedVoiceEngine.speak(cell.speakText)
+                }
 
                 if unwrappedMessageController.currentMessage == "" {
                     unwrappedMessageController.currentMessage = cell.messageText + " "
@@ -76,6 +81,8 @@ class GridController: ObservableObject {
                 unwrappedMessageController.finish()
             } else if cell.type == .delete {
                 unwrappedMessageController.currentMessage = String(unwrappedMessageController.currentMessage.dropLast())
+            } else if cell.type == .clear {
+                unwrappedMessageController.currentMessage = ""
             }
 
         }

diff --git a/DragToSpeak/Pages/SettingsPage.swift b/DragToSpeak/Pages/SettingsPage.swift
@@ -23,6 +23,8 @@ struct SettingsPage: View {
                 }
                 Section {
                     Toggle("Show Trail", isOn: $settings.showTrail)
+                    Toggle("Hide clear button", isOn: $settings.hideClearButton)
+
                 }
                 Section(content: {
                     Toggle("Enlarge Keys on Hover", isOn: $settings.enlargeKeys)
@@ -50,6 +52,8 @@ struct SettingsPage: View {
                             Text("This will send all sentences to our server for correction. We do not store any sentences.").italic()
                         }
                     }
+                    Toggle("Read each letter as you type", isOn: $settings.readEachLetter)
+
                 }, header: {
                     Text("Message")
                 })