Skip to content

Commit 70d22fe

Browse files
committed
refactor: rename output2 to output
1 parent 56cdabc commit 70d22fe

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class MainActivity : AppCompatActivity() {
6464
UsbTerminalTheme {
6565
val autoScrollEnabled = settingViewModel.currentAutoScroll.collectAsState(initial = true).value
6666
TerminalOutput(
67-
logs = viewModel.output2,
67+
logs = viewModel.output,
6868
autoScroll = autoScrollEnabled,
6969
)
7070
}

app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ internal class MainActivityViewModel
4646
val errorMessage: StateFlow<String>
4747
get() = _errorMessageFlow
4848

49-
val output2 = SnapshotStateList<OutputText>()
49+
val output = SnapshotStateList<OutputText>()
5050

5151
internal fun startObservingUsbDevice() {
5252
// Subscribe to USB device changes.
@@ -110,7 +110,7 @@ internal class MainActivityViewModel
110110

111111
fun serialWrite(command: String): Boolean {
112112
val outputText = OutputText(command, OutputText.OutputType.TYPE_NORMAL)
113-
output2.add(outputText)
113+
output.add(outputText)
114114
return arduinoUseCase.serialWrite(command)
115115
}
116116

@@ -156,7 +156,7 @@ internal class MainActivityViewModel
156156
arduinoDefaultOutput,
157157
arduinoInfoOutput,
158158
arduinoErrorOutput,
159-
).onEach { output2.add(it) }
159+
).onEach { output.add(it) }
160160
.launchIn(viewModelScope)
161161
}
162162
}

app/src/test/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModelTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ internal class MainActivityViewModelTest {
241241
// assert
242242
verify { mockArduinoUsecase.serialWrite(expected) }
243243
assertThat(result).isTrue()
244-
val outputText = sut.output2.last().text
244+
val outputText = sut.output.last().text
245245
assertThat(outputText).contains(expected)
246246
}
247247

@@ -265,8 +265,8 @@ internal class MainActivityViewModelTest {
265265
advanceUntilIdle()
266266

267267
// assert
268-
assertThat(sut.output2).isNotEmpty()
269-
val last = sut.output2.last()
268+
assertThat(sut.output).isNotEmpty()
269+
val last = sut.output.last()
270270
assertThat(last.text).isEqualTo("arduino info message")
271271
assertThat(last.type).isEqualTo(OutputText.OutputType.TYPE_INFO)
272272
}
@@ -291,8 +291,8 @@ internal class MainActivityViewModelTest {
291291
advanceUntilIdle()
292292

293293
// assert
294-
assertThat(sut.output2).isNotEmpty()
295-
val last = sut.output2.last()
294+
assertThat(sut.output).isNotEmpty()
295+
val last = sut.output.last()
296296
assertThat(last.text).isEqualTo("default message")
297297
assertThat(last.type).isEqualTo(OutputText.OutputType.TYPE_NORMAL)
298298
}

0 commit comments

Comments
 (0)