Skip to content

Commit e212736

Browse files
committed
Fix ktlint issues
1 parent 761c987 commit e212736

File tree

5 files changed

+45
-33
lines changed

5 files changed

+45
-33
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,32 @@ import androidx.compose.runtime.Composable
66
import androidx.compose.runtime.LaunchedEffect
77
import androidx.compose.runtime.mutableStateOf
88
import androidx.compose.runtime.remember
9+
import androidx.compose.ui.Modifier
910
import io.github.vinceglb.filekit.PlatformFile
1011
import io.github.vinceglb.filekit.readString
1112

1213
@Composable
13-
public fun App() {
14+
public fun App(
15+
modifier: Modifier = Modifier
16+
) {
1417
Box {
15-
val selectedFile = remember { mutableStateOf<PlatformFile?>(null)}
18+
val selectedFile = remember { mutableStateOf<PlatformFile?>(null) }
1619

17-
if (selectedFile.value != null){
20+
if (selectedFile.value != null) {
1821
SandboxBackground { WorkflowContent(selectedFile.value) }
1922
}
2023

21-
UploadFile{ selectedFile.value = it}
24+
UploadFile(onFileSelect = { selectedFile.value = it })
2225
}
2326
}
2427

2528
@Composable
2629
private fun WorkflowContent(file: PlatformFile?) {
2730
val jsonString = remember { mutableStateOf<String?>(null) }
28-
LaunchedEffect(file){
31+
LaunchedEffect(file) {
2932
jsonString.value = file?.readString()
3033
}
31-
val root = jsonString.value?.let { FetchRoot(it) }
34+
val root = jsonString.value?.let { fetchRoot(it) }
3235

3336
if (root != null) {
3437
DrawWorkflowTree(root)

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxSize
66
import androidx.compose.foundation.layout.wrapContentSize
77
import androidx.compose.runtime.Composable
88
import androidx.compose.runtime.getValue
9+
import androidx.compose.runtime.mutableFloatStateOf
910
import androidx.compose.runtime.mutableStateOf
1011
import androidx.compose.runtime.remember
1112
import androidx.compose.runtime.setValue
@@ -25,15 +26,17 @@ import androidx.compose.ui.input.pointer.pointerInput
2526
*/
2627
@Composable
2728
public fun SandboxBackground(
28-
content: @Composable () -> Unit
29+
modifier: Modifier = Modifier,
30+
content: @Composable () -> Unit,
2931
) {
30-
var scale by remember { mutableStateOf(1f) }
32+
var scale by remember { mutableFloatStateOf(1f) }
3133
var offset by remember { mutableStateOf(Offset.Zero) }
3234

33-
Box (
34-
modifier = Modifier
35+
Box(
36+
modifier
3537
.fillMaxSize()
36-
.pointerInput(Unit) { // this allows for user's panning to view different parts of content
38+
.pointerInput(Unit) {
39+
// this allows for user's panning to view different parts of content
3740
awaitEachGesture {
3841
val event = awaitPointerEvent()
3942

@@ -63,7 +66,7 @@ public fun SandboxBackground(
6366
}
6467
}
6568
}
66-
){
69+
) {
6770
Box(
6871
modifier = Modifier
6972
.wrapContentSize(unbounded = true, align = Alignment.Center)

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,20 @@ import io.github.vinceglb.filekit.dialogs.FileKitType
1818
import io.github.vinceglb.filekit.dialogs.compose.rememberFilePickerLauncher
1919

2020
@Composable
21-
public fun UploadFile(onFileSelected: (PlatformFile?) -> Unit) {
22-
Box (modifier = Modifier
23-
.padding(16.dp)
24-
.fillMaxSize()
25-
){
21+
public fun UploadFile(
22+
onFileSelect: (PlatformFile?) -> Unit,
23+
modifier: Modifier = Modifier,
24+
) {
25+
Box(
26+
modifier
27+
.padding(16.dp)
28+
.fillMaxSize()
29+
) {
2630
val launcher = rememberFilePickerLauncher(
27-
type = FileKitType.File(listOf("json","txt")),
31+
type = FileKitType.File(listOf("json", "txt")),
2832
title = "Select Workflow Trace File"
2933
) {
30-
onFileSelected(it)
34+
onFileSelect(it)
3135
}
3236
Button(
3337
onClick = { launcher.launch() },

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ import java.io.IOException
1111
* All the caught exceptions should be handled by the caller, and appropriate UI feedback should be
1212
* provided to user
1313
*/
14-
public fun FetchRoot(json: String): WorkflowNode? {
15-
return try{
14+
public fun fetchRoot(
15+
json: String
16+
): WorkflowNode? {
17+
return try {
1618
val moshi = Moshi.Builder()
1719
.add(KotlinJsonAdapterFactory())
1820
.build()
@@ -21,8 +23,7 @@ public fun FetchRoot(json: String): WorkflowNode? {
2123
root
2224
} catch (e: JsonDataException) {
2325
throw JsonDataException("Failed to parse JSON: ${e.message}", e)
24-
} catch (e: IOException){
26+
} catch (e: IOException) {
2527
throw IOException("Malformed JSON: ${e.message}", e)
2628
}
2729
}
28-

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp
2424
*
2525
* TBD what more metadata should be involved with each node, e.g. (props, states, # of render passes)
2626
*/
27-
public data class WorkflowNode (
27+
public data class WorkflowNode(
2828
val id: String,
2929
val name: String,
3030
val children: List<WorkflowNode>
@@ -37,24 +37,25 @@ public data class WorkflowNode (
3737
@Composable
3838
public fun DrawWorkflowTree(
3939
node: WorkflowNode,
40+
modifier: Modifier = Modifier,
4041
) {
4142
Column(
42-
modifier = Modifier
43+
modifier
4344
.padding(5.dp)
44-
.border(1.dp,Color.Black)
45+
.border(1.dp, Color.Black)
4546
.fillMaxSize(),
4647
horizontalAlignment = Alignment.CenterHorizontally,
4748
) {
4849
// draws itself
49-
drawNode(node)
50+
DrawNode(node)
5051

5152
// draws children recursively
52-
Row (
53+
Row(
5354
horizontalArrangement = Arrangement.Center,
5455
verticalAlignment = Alignment.Top
5556
) {
5657
node.children.forEach { childNode ->
57-
DrawWorkflowTree (childNode)
58+
DrawWorkflowTree(childNode)
5859
}
5960
}
6061
}
@@ -64,16 +65,16 @@ public fun DrawWorkflowTree(
6465
* A basic box that represents a workflow node
6566
*/
6667
@Composable
67-
private fun drawNode(
68+
private fun DrawNode(
6869
node: WorkflowNode,
6970
) {
7071
val open = remember { mutableStateOf(false) }
71-
Box (
72+
Box(
7273
modifier = Modifier
7374
.clickable { open.value = !open.value }
7475
.padding(10.dp)
75-
){
76-
Column (horizontalAlignment = Alignment.CenterHorizontally) {
76+
) {
77+
Column(horizontalAlignment = Alignment.CenterHorizontally) {
7778
Text(text = node.name)
7879
Text(text = "ID: ${node.id}")
7980
if (open.value) {

0 commit comments

Comments
 (0)