Skip to content

Commit 66010f9

Browse files
committed
Fix more pr comment and coroutine bug
1 parent 9319e1d commit 66010f9

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/TraceModeToggleSwitch.kt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ import androidx.compose.material.Switch
66
import androidx.compose.material.SwitchDefaults
77
import androidx.compose.material.Text
88
import androidx.compose.runtime.Composable
9-
import androidx.compose.runtime.getValue
10-
import androidx.compose.runtime.mutableStateOf
11-
import androidx.compose.runtime.remember
12-
import androidx.compose.runtime.setValue
139
import androidx.compose.ui.Alignment
1410
import androidx.compose.ui.Modifier
1511
import androidx.compose.ui.graphics.Color
@@ -24,19 +20,13 @@ internal fun TraceModeToggleSwitch(
2420
traceMode: TraceMode,
2521
modifier: Modifier = Modifier
2622
) {
27-
// File mode is unchecked by default, and live mode is checked.
28-
var checked by remember {
29-
mutableStateOf(traceMode is TraceMode.Live)
30-
}
31-
3223
Column(
3324
modifier = modifier.padding(16.dp),
3425
horizontalAlignment = Alignment.CenterHorizontally
3526
) {
3627
Switch(
37-
checked = checked,
28+
checked = traceMode is TraceMode.Live,
3829
onCheckedChange = {
39-
checked = it
4030
onToggle()
4131
},
4232
colors = SwitchDefaults.colors(

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/SocketClient.kt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.squareup.workflow1.traceviewer.util
22

3-
import kotlinx.coroutines.CoroutineScope
43
import kotlinx.coroutines.Dispatchers
54
import kotlinx.coroutines.awaitCancellation
65
import kotlinx.coroutines.channels.Channel
@@ -15,16 +14,18 @@ import java.net.Socket
1514
internal suspend fun streamRenderPassesFromDevice(parseOnNewRenderPass: (String) -> Unit) {
1615
val renderPassChannel: Channel<String> = Channel(Channel.BUFFERED)
1716
coroutineScope {
18-
try {
19-
pollSocket(onNewRenderPass = renderPassChannel::send)
20-
} finally {
21-
renderPassChannel.close()
17+
launch {
18+
try {
19+
pollSocket(onNewRenderPass = renderPassChannel::send)
20+
} finally {
21+
renderPassChannel.close()
22+
}
2223
}
23-
}
2424

25-
// Since channel implements ChannelIterator, we can for-loop through on the receiver end.
26-
for (renderPass in renderPassChannel) {
27-
parseOnNewRenderPass(renderPass)
25+
// Since channel implements ChannelIterator, we can for-loop through on the receiver end.
26+
for (renderPass in renderPassChannel) {
27+
parseOnNewRenderPass(renderPass)
28+
}
2829
}
2930
}
3031

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/TraceParser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ internal fun RenderTrace(
9090
}
9191

9292
if (error != null) {
93-
Text("Error parsing: ${error}")
93+
Text("Error parsing: $error")
9494
return
9595
}
9696

0 commit comments

Comments
 (0)