fix transcription confidence must > 0,5

xqsadness · Sep 19, 2023 · 143e566 · 143e566
1 parent 36202a1
commit 143e566
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 7 deletions.
diff --git a/DefaultProject.xcodeproj/xcshareddata/xcschemes/DefaultProject.xcscheme b/DefaultProject.xcodeproj/xcshareddata/xcschemes/DefaultProject.xcscheme
@@ -34,7 +34,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = "ru"
+      language = "en"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/DefaultProject.xcworkspace/xcuserdata/darktech4.xcuserdatad/UserInterfaceState.xcuserstate b/DefaultProject.xcworkspace/xcuserdata/darktech4.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/DefaultProject/DEFAULT_SOURCE/CONTROLL_APP/Launch Screen.storyboard b/DefaultProject/DEFAULT_SOURCE/CONTROLL_APP/Launch Screen.storyboard
@@ -24,7 +24,7 @@
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Quiz App" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DyQ-ie-krj">
-                                <rect key="frame" x="130" y="474" width="132" height="48"/>
+                                <rect key="frame" x="130" y="482" width="132" height="48"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="48" id="B8B-I9-O1Y"/>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="222" id="YWW-zZ-ifn"/>

diff --git a/DefaultProject/DEFAULT_SOURCE/DefaultView/LoginDefaultView.swift b/DefaultProject/DEFAULT_SOURCE/DefaultView/LoginDefaultView.swift
@@ -11,6 +11,12 @@ struct LoginDefaultView: View {
     @StateObject var appController = APPCONTROLLER.shared
     @StateObject var authManagerViewModel = AuthManagerViewModel.shared
     @EnvironmentObject var coordinator: Coordinator
+    @FocusState private var focusedField: FocusedField?
+    @State var name: String = ""
+
+    enum FocusedField {
+        case username, password
+    }
 
     var body: some View {
         VStack{
@@ -30,6 +36,7 @@ struct LoginDefaultView: View {
                     }
                     .keyboardType(.emailAddress)
                     .foregroundColor(.background)
+                    .focused($focusedField, equals: .username)
             }
             .padding(16)
             .background(Color.gray.opacity(0.1))
@@ -43,13 +50,15 @@ struct LoginDefaultView: View {
                         }
                         .font(.regular(size: 15))
                         .foregroundColor(.background)
+                        .focused($focusedField, equals: .password)
                 } else {
                     SecureField("Password ...", text: $authManagerViewModel.pswd)
                         .placeholder(when: authManagerViewModel.pswd.isEmpty) {
                             Text("Password").foregroundColor(.gray)
                         }
                         .font(.regular(size: 15))
                         .foregroundColor(.background)
+                        .focused($focusedField, equals: .password)
                 }
 
                 Button(action: {
@@ -68,6 +77,7 @@ struct LoginDefaultView: View {
 
             Button(action: {
                 if authManagerViewModel.isSignin{
+                    focusedField = nil
                     authManagerViewModel.login()
                 }else{
                     authManagerViewModel.registerUser()
@@ -106,6 +116,7 @@ struct LoginDefaultView: View {
         .background(Color.text)
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .background(Color.text)
+        .ignoresSafeArea(.keyboard)
         .overlay {
             LoadingView(show: $authManagerViewModel.isLoading)
         }

diff --git a/DefaultProject/View/CreateUsernameView.swift b/DefaultProject/View/CreateUsernameView.swift
@@ -9,13 +9,19 @@ import SwiftUI
 
 struct CreateUsernameView: View {
     @AppStorage("Language") var language: String = "en"
-    @State var name: String = ""
     @EnvironmentObject var coordinator: Coordinator
+    @FocusState private var focusedField: FocusedField?
+    @State var name: String = ""
+
+    enum FocusedField {
+        case name
+    }
 
     var body: some View {
         VStack{
             HStack{
                 Button {
+                    focusedField = nil
                     coordinator.pop()
                 } label: {
                     Image(systemName: "chevron.left")
@@ -30,7 +36,7 @@ struct CreateUsernameView: View {
                 Spacer()
             }
             .padding(.horizontal)
-                        
+
             VStack{
                 Text("Quiz kid app")
                     .font(.bold(size: 22))
@@ -59,6 +65,18 @@ struct CreateUsernameView: View {
                         TextField("", text: $name)
                             .foregroundColor(Color.text2)
                             .padding(.horizontal)
+                            .focused($focusedField, equals: .name)
+                            .onSubmit {
+                                if name.isEmpty || name.count < 2 || name.count > 18{
+                                    LocalNotification.shared.message("Name must be >= 2, <= 18 characters", .warning)
+                                }else{
+                                    focusedField = nil
+                                    User.shared.userEmail = name
+                                    if User.shared.userEmail != "" {
+                                        coordinator.push(.homeView)
+                                    }
+                                }
+                            }
                     }
                     .overlay(
                         RoundedRectangle(cornerRadius: 6)
@@ -82,6 +100,7 @@ struct CreateUsernameView: View {
                                 if name.isEmpty || name.count < 2 || name.count > 18{
                                     LocalNotification.shared.message("Name must be >= 2, <= 18 characters", .warning)
                                 }else{
+                                    focusedField = nil
                                     User.shared.userEmail = name
                                     if User.shared.userEmail != "" {
                                         coordinator.push(.homeView)
@@ -100,5 +119,9 @@ struct CreateUsernameView: View {
         .hAlign(.center)
         .vAlign(.top)
         .background(Color.accentColor)
+        .onAppear{
+            focusedField = .name
+        }
+        .ignoresSafeArea(.keyboard)
     }
 }
diff --git a/DefaultProject/View/Writing/QuizWritingContentView.swift b/DefaultProject/View/Writing/QuizWritingContentView.swift
@@ -102,6 +102,7 @@ struct QuizWritingContentView: View {
                 RoundedRectangle(cornerRadius: 10)
                     .stroke(Color.text2, lineWidth: 2)
                     .opacity(selectedTab == CONSTANT.SHARED.DATA_WRITING.count - 1 && (countWrong + countCorrect == CONSTANT.SHARED.DATA_WRITING.count) ? 0.6 : 1)
+                    .contentShape(Rectangle())
                     .simultaneousGesture(DragGesture())
             }
             .padding(.horizontal)

diff --git a/DefaultProject/View/Writing/WritingView.swift b/DefaultProject/View/Writing/WritingView.swift
@@ -12,6 +12,7 @@ import Speech
 enum FocusedField {
     case textWriting
 }
+
 struct WritingView: View {
     @AppStorage("Language") var language: String = "en"
     @EnvironmentObject var coordinator: Coordinator
@@ -61,6 +62,8 @@ struct WritingView: View {
                                         }
                                     })
                                 }
+                                .contentShape(Rectangle())
+                                .simultaneousGesture(DragGesture())
                         }
                     }
                     .tabViewStyle(.page(indexDisplayMode: .never))

diff --git a/DefaultProject/ViewModel/SpeechRecognizer.swift b/DefaultProject/ViewModel/SpeechRecognizer.swift
@@ -96,9 +96,20 @@ class SpeechRecognizer: ObservableObject {
                     }
 
                     if let result = result {
-                        self.speak(result.bestTranscription.formattedString)
-
-                        print(result.bestTranscription.segments)
+//                        self.speak(result.bestTranscription.formattedString)
+
+                        var bestTranscription: SFTranscription?
+
+                        for transcription in result.transcriptions {
+                            //find the largest confidence value and confidence > 0.5
+                            if let bestSegment = transcription.segments.max(by: { $0.confidence < $1.confidence }), bestSegment.confidence > 0.5 {
+                                bestTranscription = transcription
+                            }
+                        }
+
+                        if let bestTranscription = bestTranscription {
+                            self.speak(bestTranscription.formattedString)
+                        }
                     }
                 }
             } catch {