File tree Expand file tree Collapse file tree 3 files changed +9
-9
lines changed
main/java/org/kabiri/android/usbterminal
test/java/org/kabiri/android/usbterminal/viewmodel Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ class MainActivity : AppCompatActivity() {
64
64
UsbTerminalTheme {
65
65
val autoScrollEnabled = settingViewModel.currentAutoScroll.collectAsState(initial = true ).value
66
66
TerminalOutput (
67
- logs = viewModel.output2 ,
67
+ logs = viewModel.output ,
68
68
autoScroll = autoScrollEnabled,
69
69
)
70
70
}
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ internal class MainActivityViewModel
46
46
val errorMessage: StateFlow <String >
47
47
get() = _errorMessageFlow
48
48
49
- val output2 = SnapshotStateList <OutputText >()
49
+ val output = SnapshotStateList <OutputText >()
50
50
51
51
internal fun startObservingUsbDevice () {
52
52
// Subscribe to USB device changes.
@@ -110,7 +110,7 @@ internal class MainActivityViewModel
110
110
111
111
fun serialWrite (command : String ): Boolean {
112
112
val outputText = OutputText (command, OutputText .OutputType .TYPE_NORMAL )
113
- output2 .add(outputText)
113
+ output .add(outputText)
114
114
return arduinoUseCase.serialWrite(command)
115
115
}
116
116
@@ -156,7 +156,7 @@ internal class MainActivityViewModel
156
156
arduinoDefaultOutput,
157
157
arduinoInfoOutput,
158
158
arduinoErrorOutput,
159
- ).onEach { output2 .add(it) }
159
+ ).onEach { output .add(it) }
160
160
.launchIn(viewModelScope)
161
161
}
162
162
}
Original file line number Diff line number Diff line change @@ -241,7 +241,7 @@ internal class MainActivityViewModelTest {
241
241
// assert
242
242
verify { mockArduinoUsecase.serialWrite(expected) }
243
243
assertThat(result).isTrue()
244
- val outputText = sut.output2 .last().text
244
+ val outputText = sut.output .last().text
245
245
assertThat(outputText).contains(expected)
246
246
}
247
247
@@ -265,8 +265,8 @@ internal class MainActivityViewModelTest {
265
265
advanceUntilIdle()
266
266
267
267
// assert
268
- assertThat(sut.output2 ).isNotEmpty()
269
- val last = sut.output2 .last()
268
+ assertThat(sut.output ).isNotEmpty()
269
+ val last = sut.output .last()
270
270
assertThat(last.text).isEqualTo(" arduino info message" )
271
271
assertThat(last.type).isEqualTo(OutputText .OutputType .TYPE_INFO )
272
272
}
@@ -291,8 +291,8 @@ internal class MainActivityViewModelTest {
291
291
advanceUntilIdle()
292
292
293
293
// assert
294
- assertThat(sut.output2 ).isNotEmpty()
295
- val last = sut.output2 .last()
294
+ assertThat(sut.output ).isNotEmpty()
295
+ val last = sut.output .last()
296
296
assertThat(last.text).isEqualTo(" default message" )
297
297
assertThat(last.type).isEqualTo(OutputText .OutputType .TYPE_NORMAL )
298
298
}
You can’t perform that action at this time.
0 commit comments