Skip to content

Commit 688688e

Browse files
wenli-caiwenli-cai
committed
Refactor directories
1 parent 325b239 commit 688688e

File tree

12 files changed

+37
-30
lines changed

12 files changed

+37
-30
lines changed

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,20 @@ import androidx.compose.runtime.snapshots.SnapshotStateMap
1616
import androidx.compose.ui.Alignment
1717
import androidx.compose.ui.Modifier
1818
import androidx.compose.ui.geometry.Offset
19+
import com.squareup.workflow1.traceviewer.TraceMode.File
20+
import com.squareup.workflow1.traceviewer.TraceMode.Live
1921
import com.squareup.workflow1.traceviewer.model.Node
2022
import com.squareup.workflow1.traceviewer.model.NodeUpdate
2123
import com.squareup.workflow1.traceviewer.ui.ColorLegend
22-
import com.squareup.workflow1.traceviewer.ui.DisplayDevices
23-
import com.squareup.workflow1.traceviewer.ui.FrameSelectTab
2424
import com.squareup.workflow1.traceviewer.ui.RightInfoPanel
25-
import com.squareup.workflow1.traceviewer.ui.SearchBox
26-
import com.squareup.workflow1.traceviewer.ui.TraceModeToggleSwitch
27-
import com.squareup.workflow1.traceviewer.util.FileDump
28-
import com.squareup.workflow1.traceviewer.util.RenderTrace
25+
import com.squareup.workflow1.traceviewer.ui.control.DisplayDevices
26+
import com.squareup.workflow1.traceviewer.ui.control.FileDump
27+
import com.squareup.workflow1.traceviewer.ui.control.FrameSelectTab
28+
import com.squareup.workflow1.traceviewer.ui.control.SearchBox
29+
import com.squareup.workflow1.traceviewer.ui.control.TraceModeToggleSwitch
30+
import com.squareup.workflow1.traceviewer.ui.control.UploadFile
2931
import com.squareup.workflow1.traceviewer.util.SandboxBackground
30-
import com.squareup.workflow1.traceviewer.util.UploadFile
32+
import com.squareup.workflow1.traceviewer.util.parser.RenderTrace
3133
import io.github.vinceglb.filekit.PlatformFile
3234

3335
/**
@@ -124,16 +126,16 @@ internal fun App(
124126
TraceModeToggleSwitch(
125127
onToggle = {
126128
resetStates()
127-
traceMode = if (traceMode is TraceMode.Live) {
129+
traceMode = if (traceMode is Live) {
128130
frameIndex = 0
129-
TraceMode.File(null)
131+
File(null)
130132
} else {
131133
/*
132134
We set the frame to -1 here since we always increment it during Live mode as the list of
133135
frames get populated, so we avoid off by one when indexing into the frames.
134136
*/
135137
frameIndex = -1
136-
TraceMode.Live()
138+
Live()
137139
}
138140
},
139141
traceMode = traceMode,
@@ -146,7 +148,7 @@ internal fun App(
146148
resetOnFileSelect = {
147149
resetStates()
148150
selectedTraceFile = it
149-
traceMode = TraceMode.File(it)
151+
traceMode = File(it)
150152
},
151153
modifier = Modifier.align(Alignment.BottomStart)
152154
)
@@ -156,7 +158,7 @@ internal fun App(
156158
if ((traceMode as TraceMode.Live).device == null) {
157159
DisplayDevices(
158160
onDeviceSelect = { selectedDevice ->
159-
traceMode = TraceMode.Live(selectedDevice)
161+
traceMode = Live(selectedDevice)
160162
},
161163
devices = listDevices(),
162164
modifier = Modifier.align(Alignment.Center)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import androidx.compose.ui.text.style.TextOverflow
3434
import androidx.compose.ui.unit.dp
3535
import com.squareup.workflow1.traceviewer.model.Node
3636
import com.squareup.workflow1.traceviewer.model.NodeUpdate
37-
import com.squareup.workflow1.traceviewer.util.computeAnnotatedDiff
37+
import com.squareup.workflow1.traceviewer.util.parser.computeAnnotatedDiff
3838

3939
/**
4040
* A panel that displays information about the selected workflow node.

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/DisplayDevices.kt renamed to ‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/control/DisplayDevices.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.squareup.workflow1.traceviewer.ui
1+
package com.squareup.workflow1.traceviewer.ui.control
22

33
import androidx.compose.foundation.BorderStroke
44
import androidx.compose.foundation.layout.Box

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/FileDump.kt renamed to ‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/control/FileDump.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.squareup.workflow1.traceviewer.util
1+
package com.squareup.workflow1.traceviewer.ui.control
22

33
import androidx.compose.foundation.layout.padding
44
import androidx.compose.foundation.shape.CircleShape

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/FrameSelectTab.kt renamed to ‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/control/FrameSelectTab.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.squareup.workflow1.traceviewer.ui
1+
package com.squareup.workflow1.traceviewer.ui.control
22

33
import androidx.compose.foundation.MutatePriority
44
import androidx.compose.foundation.clickable

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/SearchBox.kt renamed to ‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/control/SearchBox.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.squareup.workflow1.traceviewer.ui
1+
package com.squareup.workflow1.traceviewer.ui.control
22

33
import androidx.compose.foundation.clickable
44
import androidx.compose.foundation.layout.Column

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.squareup.workflow1.traceviewer.ui
1+
package com.squareup.workflow1.traceviewer.ui.control
22

33
import androidx.compose.foundation.layout.Column
44
import androidx.compose.foundation.layout.padding

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/UploadFile.kt renamed to ‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/ui/control/UploadFile.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.squareup.workflow1.traceviewer.util
1+
package com.squareup.workflow1.traceviewer.ui.control
22

33
import androidx.compose.foundation.layout.padding
44
import androidx.compose.foundation.shape.CircleShape

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/DiffUtils.kt renamed to ‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/parser/DiffUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.squareup.workflow1.traceviewer.util
1+
package com.squareup.workflow1.traceviewer.util.parser
22

33
import androidx.compose.ui.graphics.Color
44
import androidx.compose.ui.text.AnnotatedString
55
import androidx.compose.ui.text.SpanStyle
66
import androidx.compose.ui.text.buildAnnotatedString
77
import com.github.difflib.text.DiffRow.Tag
88
import com.github.difflib.text.DiffRowGenerator
9-
import com.squareup.workflow1.traceviewer.util.DiffStyles.buildStringWithStyle
9+
import com.squareup.workflow1.traceviewer.util.parser.DiffStyles.buildStringWithStyle
1010

1111
/**
1212
* Generates a field-level word-diff for each node's states.

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/JsonParser.kt renamed to ‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/parser/JsonParser.kt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.squareup.workflow1.traceviewer.util
1+
package com.squareup.workflow1.traceviewer.util.parser
22

33
import com.squareup.moshi.JsonAdapter
44
import com.squareup.moshi.Moshi
@@ -7,6 +7,8 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
77
import com.squareup.workflow1.traceviewer.model.Node
88
import com.squareup.workflow1.traceviewer.model.addChild
99
import com.squareup.workflow1.traceviewer.model.replaceChild
10+
import com.squareup.workflow1.traceviewer.util.parser.ParseResult.Failure
11+
import com.squareup.workflow1.traceviewer.util.parser.ParseResult.Success
1012
import io.github.vinceglb.filekit.PlatformFile
1113
import io.github.vinceglb.filekit.readString
1214
import kotlin.reflect.jvm.javaType
@@ -31,11 +33,11 @@ internal suspend fun parseFileTrace(
3133
val jsonString = file.readString()
3234
val workflowAdapter = createMoshiAdapter<List<Node>>()
3335
val parsedRenderPasses = try {
34-
workflowAdapter.fromJson(jsonString) ?: return ParseResult.Failure(
36+
workflowAdapter.fromJson(jsonString) ?: return Failure(
3537
IllegalArgumentException("Provided trace file is empty or malformed.")
3638
)
3739
} catch (e: Exception) {
38-
return ParseResult.Failure(e)
40+
return Failure(e)
3941
}
4042

4143
val parsedFrames = parsedRenderPasses.map { renderPass -> getFrameFromRenderPass(renderPass) }
@@ -45,7 +47,7 @@ internal suspend fun parseFileTrace(
4547
frameTrees.add(mergedTree)
4648
mergedTree
4749
}
48-
return ParseResult.Success(
50+
return Success(
4951
trace = parsedFrames,
5052
trees = frameTrees,
5153
affectedNodes = parsedRenderPasses
@@ -64,11 +66,11 @@ internal fun parseLiveTrace(
6466
currentTree: Node? = null
6567
): ParseResult {
6668
val parsedRenderPass = try {
67-
adapter.fromJson(renderPass) ?: return ParseResult.Failure(
69+
adapter.fromJson(renderPass) ?: return Failure(
6870
IllegalArgumentException("Provided trace data is empty or malformed.")
6971
)
7072
} catch (e: Exception) {
71-
return ParseResult.Failure(e)
73+
return Failure(e)
7274
}
7375

7476
val parsedFrame = getFrameFromRenderPass(parsedRenderPass)
@@ -81,7 +83,7 @@ internal fun parseLiveTrace(
8183
}
8284

8385
// Since live tracing handles one frame at a time, we generalize and return listOf for each.
84-
return ParseResult.Success(
86+
return Success(
8587
trace = listOf(parsedFrame),
8688
trees = listOf(mergedTree),
8789
affectedNodes = listOf(parsedRenderPass)
@@ -153,7 +155,8 @@ internal fun mergeFrameIntoMainTree(
153155
}
154156

155157
internal sealed interface ParseResult {
156-
class Success(val trace: List<Node>, val trees: List<Node>, affectedNodes: List<List<Node>>) : ParseResult {
158+
class Success(val trace: List<Node>, val trees: List<Node>, affectedNodes: List<List<Node>>) :
159+
ParseResult {
157160
val affectedNodes = affectedNodes.map { it.toSet() }
158161
}
159162
class Failure(val error: Throwable) : ParseResult

0 commit comments

Comments
 (0)