Skip to content

Commit b4027f2

Browse files
move codeAnswer view into the ScrollView
1 parent 58c407d commit b4027f2

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

Cheetah/Views/CoachView.swift

+16-11
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,26 @@ struct CoachView: View {
7878
.font(.footnote.italic())
7979
}
8080
ScrollView {
81-
NSTextFieldWrapper(text: $answer, selectedRange: $answerSelection)
82-
.onChange(of: viewModel.answer) {
83-
if let newAnswer = $0 {
84-
self.answer = newAnswer
81+
if answer != "" {
82+
NSTextFieldWrapper(text: $answer, selectedRange: $answerSelection)
83+
.onChange(of: viewModel.answer) {
84+
if let newAnswer = $0 {
85+
self.answer = newAnswer
86+
}
8587
}
88+
}
89+
if let solution = viewModel.codeAnswer {
90+
HStack {
91+
Text(solution)
92+
.textSelection(.enabled)
93+
.font(.footnote)
94+
.monospaced()
95+
.lineSpacing(1.2)
96+
Spacer()
8697
}
98+
}
8799
}
88100
.frame(maxHeight: 600)
89-
if let solution = viewModel.codeAnswer {
90-
Text(solution)
91-
.textSelection(.enabled)
92-
.font(.footnote)
93-
.monospaced()
94-
}
95-
Spacer()
96101
}
97102
Spacer()
98103
}

Cheetah/Views/ContentView.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct ContentView_Previews: PreviewProvider {
3737
let viewModel = AppViewModel()
3838
viewModel.devices = [CaptureDevice(id: 0, name: "Audio Loopback Device")]
3939
viewModel.buttonsAlwaysEnabled = true
40-
viewModel.authToken = ""
40+
viewModel.authToken = "x"
4141
viewModel.downloadState = .completed
4242
viewModel.transcript = "So how would we break this app down into components?"
4343
viewModel.answer = """
@@ -52,7 +52,7 @@ Props: message
5252
5353
• App Component: Renders the Header, Content, and Footer components
5454
"""
55-
return ContentView(viewModel: viewModel)
55+
return ContentView(viewModel: viewModel)
5656
.previewLayout(.fixed(width: 300, height: 500))
5757
.previewDisplayName("Cheetah")
5858
}

0 commit comments

Comments
 (0)