From b4027f260dbf2780d013051b55bc287c0d7049ed Mon Sep 17 00:00:00 2001 From: leetcode-mafia Date: Wed, 26 Apr 2023 12:13:57 -0400 Subject: [PATCH] move codeAnswer view into the ScrollView --- Cheetah/Views/CoachView.swift | 27 ++++++++++++++++----------- Cheetah/Views/ContentView.swift | 4 ++-- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Cheetah/Views/CoachView.swift b/Cheetah/Views/CoachView.swift index 901f3cf..79b9ab6 100644 --- a/Cheetah/Views/CoachView.swift +++ b/Cheetah/Views/CoachView.swift @@ -78,21 +78,26 @@ struct CoachView: View { .font(.footnote.italic()) } ScrollView { - NSTextFieldWrapper(text: $answer, selectedRange: $answerSelection) - .onChange(of: viewModel.answer) { - if let newAnswer = $0 { - self.answer = newAnswer + if answer != "" { + NSTextFieldWrapper(text: $answer, selectedRange: $answerSelection) + .onChange(of: viewModel.answer) { + if let newAnswer = $0 { + self.answer = newAnswer + } } + } + if let solution = viewModel.codeAnswer { + HStack { + Text(solution) + .textSelection(.enabled) + .font(.footnote) + .monospaced() + .lineSpacing(1.2) + Spacer() } + } } .frame(maxHeight: 600) - if let solution = viewModel.codeAnswer { - Text(solution) - .textSelection(.enabled) - .font(.footnote) - .monospaced() - } - Spacer() } Spacer() } diff --git a/Cheetah/Views/ContentView.swift b/Cheetah/Views/ContentView.swift index d16357a..fe44036 100644 --- a/Cheetah/Views/ContentView.swift +++ b/Cheetah/Views/ContentView.swift @@ -37,7 +37,7 @@ struct ContentView_Previews: PreviewProvider { let viewModel = AppViewModel() viewModel.devices = [CaptureDevice(id: 0, name: "Audio Loopback Device")] viewModel.buttonsAlwaysEnabled = true - viewModel.authToken = "" + viewModel.authToken = "x" viewModel.downloadState = .completed viewModel.transcript = "So how would we break this app down into components?" viewModel.answer = """ @@ -52,7 +52,7 @@ Props: message • App Component: Renders the Header, Content, and Footer components """ - return ContentView(viewModel: viewModel) + return ContentView(viewModel: viewModel) .previewLayout(.fixed(width: 300, height: 500)) .previewDisplayName("Cheetah") }