Simplify speech demo (#1218)

* Simplify speech demo

* wip

* fix flakey test

* increase timeout

* wip

Author: mbrandonw

Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift

@@ -18,7 +18,7 @@ struct AppState: Equatable {
 enum AppAction: Equatable {
   case dismissAuthorizationStateAlert
   case recordButtonTapped
-  case speech(Result<SpeechRecognitionResult, SpeechClient.Error>)
+  case speech(Result<String, SpeechClient.Error>)
   case speechRecognizerAuthorizationStatusResponse(SFSpeechRecognizerAuthorizationStatus)
 }
 
@@ -49,14 +49,9 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, e
         .fireAndForget()
     }
 
-  case let .speech(.success(result)):
-    state.transcribedText = result.bestTranscription.formattedString
-    if result.isFinal {
-      return environment.speechClient.finishTask()
-        .fireAndForget()
-    } else {
-      return .none
-    }
+  case let .speech(.success(transcribedText)):
+    state.transcribedText = transcribedText
+    return .none
 
   case let .speech(.failure(error)):
     state.alert = AlertState(
@@ -92,6 +87,7 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, e
       request.shouldReportPartialResults = true
       request.requiresOnDeviceRecognition = false
       return environment.speechClient.startTask(request)
+        .map(\.bestTranscription.formattedString)
         .animation()
         .catchToEffect(AppAction.speech)
 
@@ -100,7 +96,7 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, e
     }
   }
 }
-.debug(actionFormat: .labelsOnly)
+.debug()
 
 struct AuthorizationStateAlert: Equatable, Identifiable {
   var title: String

Examples/SpeechRecognition/SpeechRecognitionTests/SpeechRecognitionTests.swift

@@ -65,33 +65,36 @@ class SpeechRecognitionTests: XCTestCase {
     store.environment.speechClient.requestAuthorization = { Effect(value: .authorized) }
     store.environment.speechClient.startTask = { _ in self.recognitionTaskSubject.eraseToEffect() }
 
-    let result = SpeechRecognitionResult(
+    let firstResult = SpeechRecognitionResult(
       bestTranscription: Transcription(
         formattedString: "Hello",
         segments: []
       ),
       isFinal: false,
       transcriptions: []
     )
-    var finalResult = result
-    finalResult.bestTranscription.formattedString = "Hello world"
-    finalResult.isFinal = true
+    var secondResult = firstResult
+    secondResult.bestTranscription.formattedString = "Hello world"
 
     store.send(.recordButtonTapped) {
       $0.isRecording = true
     }
 
     store.receive(.speechRecognizerAuthorizationStatusResponse(.authorized))
 
-    self.recognitionTaskSubject.send(result)
-    store.receive(.speech(.success(result))) {
+    self.recognitionTaskSubject.send(firstResult)
+    store.receive(.speech(.success("Hello"))) {
       $0.transcribedText = "Hello"
     }
 
-    self.recognitionTaskSubject.send(finalResult)
-    store.receive(.speech(.success(finalResult))) {
+    self.recognitionTaskSubject.send(secondResult)
+    store.receive(.speech(.success("Hello world"))) {
       $0.transcribedText = "Hello world"
     }
+
+    store.send(.recordButtonTapped) {
+      $0.isRecording = false
+    }
   }
 
   func testAudioSessionFailure() {

Tests/ComposableArchitectureTests/RuntimeWarningTests.swift

@@ -153,11 +153,11 @@ final class RuntimeWarningTests: XCTestCase {
         switch action {
         case .tap:
           return .run { subscriber in
-            DispatchQueue(label: "background").async {
+            Thread.detachNewThread {
+              XCTAssertFalse(Thread.isMainThread, "Effect should send on non-main thread.")
               subscriber.send(.response)
             }
-            return AnyCancellable {
-            }
+            return AnyCancellable {}
           }
         case .response:
           return .none
@@ -166,7 +166,7 @@ final class RuntimeWarningTests: XCTestCase {
       environment: ()
     )
     ViewStore(store).send(.tap)
-    _ = XCTWaiter.wait(for: [.init()], timeout: 2)
+    _ = XCTWaiter.wait(for: [.init()], timeout: 4)
   }
 
   func testBindingUnhandledAction() {