Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ package com.openai.snapo.desktop.ui.inspector

import androidx.compose.foundation.ContextMenuArea
import androidx.compose.foundation.ContextMenuItem
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -25,7 +22,6 @@ import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.toComposeImageBitmap
import com.openai.snapo.desktop.inspector.NetworkInspectorRequestUiModel
import com.openai.snapo.desktop.ui.TriangleIndicator
import com.openai.snapo.desktop.ui.json.JsonOutlineExpansionState
import com.openai.snapo.desktop.ui.theme.Spacings
import java.awt.FileDialog
import java.awt.Frame
Expand All @@ -38,42 +34,8 @@ import java.io.FileOutputStream
import javax.imageio.ImageIO
import org.jetbrains.skia.Image as SkiaImage

@OptIn(ExperimentalFoundationApi::class)
@Composable
fun BodySection(
title: String,
payload: NetworkInspectorRequestUiModel.BodyPayload,
isExpanded: Boolean,
onExpandedChange: (Boolean) -> Unit,
usePrettyPrinted: Boolean,
onPrettyPrintedChange: (Boolean) -> Unit,
modifier: Modifier = Modifier,
jsonOutlineState: JsonOutlineExpansionState? = null,
) {
Column(
verticalArrangement = Arrangement.spacedBy(Spacings.sm),
modifier = modifier,
) {
BodySectionHeader(
title = title,
payload = payload,
isExpanded = isExpanded,
onExpandedChange = onExpandedChange,
)

if (isExpanded) {
BodySectionContent(
payload = payload,
usePrettyPrinted = usePrettyPrinted,
onPrettyPrintedChange = onPrettyPrintedChange,
jsonOutlineState = jsonOutlineState,
)
}
}
}

@Composable
private fun BodySectionHeader(
internal fun BodySectionHeader(
title: String,
payload: NetworkInspectorRequestUiModel.BodyPayload,
isExpanded: Boolean,
Expand Down Expand Up @@ -106,32 +68,7 @@ private fun BodySectionHeader(
}

@Composable
private fun BodySectionContent(
payload: NetworkInspectorRequestUiModel.BodyPayload,
usePrettyPrinted: Boolean,
onPrettyPrintedChange: (Boolean) -> Unit,
jsonOutlineState: JsonOutlineExpansionState?,
) {
val imageBitmap = remember(payload.data) { payload.data?.let(::decodeImageBitmap) }
val bytes = payload.data
if (imageBitmap != null && bytes != null) {
BodyImagePreview(
payload = payload,
imageBitmap = imageBitmap,
bytes = bytes,
)
} else {
BodyTextPayload(
payload = payload,
usePrettyPrinted = usePrettyPrinted,
onPrettyPrintedChange = onPrettyPrintedChange,
jsonOutlineState = jsonOutlineState,
)
}
}

@Composable
private fun BodyImagePreview(
internal fun BodyImagePreview(
payload: NetworkInspectorRequestUiModel.BodyPayload,
imageBitmap: ImageBitmap,
bytes: ByteArray,
Expand Down Expand Up @@ -169,26 +106,6 @@ private fun BodyImagePreview(
}
}

@Composable
private fun BodyTextPayload(
payload: NetworkInspectorRequestUiModel.BodyPayload,
usePrettyPrinted: Boolean,
onPrettyPrintedChange: (Boolean) -> Unit,
jsonOutlineState: JsonOutlineExpansionState?,
) {
InspectorCard {
InspectorPayloadView(
rawText = payload.rawText,
prettyText = payload.prettyPrintedText,
isLikelyJson = payload.isLikelyJson,
usePrettyPrinted = usePrettyPrinted,
onPrettyPrintedChange = onPrettyPrintedChange,
jsonOutlineState = jsonOutlineState,
modifier = Modifier.fillMaxWidth(),
)
}
}

private fun metadataText(payload: NetworkInspectorRequestUiModel.BodyPayload): String? {
val parts = mutableListOf<String>()

Expand Down Expand Up @@ -226,7 +143,7 @@ private fun formatBytes(byteCount: Long): String {
}
}

private fun decodeImageBitmap(bytes: ByteArray): ImageBitmap? {
internal fun decodeImageBitmap(bytes: ByteArray): ImageBitmap? {
return try {
SkiaImage.makeFromEncoded(bytes).toComposeImageBitmap()
} catch (_: Throwable) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
package com.openai.snapo.desktop.ui.inspector

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.text.selection.DisableSelection
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -54,17 +52,12 @@ import kotlin.math.max
import java.awt.datatransfer.Clipboard as AwtClipboard

@Composable
fun HeadersSection(
internal fun HeadersSectionHeader(
title: String,
headers: List<Header>,
isExpanded: Boolean,
onExpandedChange: (Boolean) -> Unit,
modifier: Modifier = Modifier,
) {
Column(
verticalArrangement = Arrangement.spacedBy(Spacings.sm),
modifier = modifier,
) {
DisableSelection {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
Expand All @@ -80,21 +73,20 @@ fun HeadersSection(
style = MaterialTheme.typography.titleSmallEmphasized,
)
}

if (isExpanded) {
HeadersSectionBody(headers = headers)
Spacer(modifier = Modifier.size(Spacings.xs))
}
}
}

@Composable
private fun HeadersSectionBody(headers: List<Header>) {
internal fun HeadersSectionBody(
headers: List<Header>,
modifier: Modifier = Modifier,
) {
if (headers.isEmpty()) {
Text(
text = "None",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = modifier,
)
return
}
Expand All @@ -111,7 +103,7 @@ private fun HeadersSectionBody(headers: List<Header>) {
SelectionContainer {
HeaderGridLayout(
rowGap = Spacings.sm,
modifier = Modifier.fillMaxWidth(),
modifier = modifier.fillMaxWidth(),
) {
headers.forEach { header ->
HeaderNameCell(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ package com.openai.snapo.desktop.ui.inspector

import androidx.compose.foundation.VerticalScrollbar
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollbarAdapter
import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -27,19 +26,28 @@ internal val InspectorDetailContentPadding = PaddingValues(
fun InspectorDetailScaffold(
modifier: Modifier = Modifier,
contentPadding: PaddingValues = InspectorDetailContentPadding,
content: @Composable ColumnScope.() -> Unit,
selectionEnabled: Boolean = true,
content: LazyListScope.() -> Unit,
) {
val scrollState = rememberScrollState()
val listState = rememberLazyListState()
Box(modifier = modifier.fillMaxSize()) {
Column(
modifier = Modifier
.fillMaxSize()
.verticalScroll(scrollState)
.padding(contentPadding),
content = content,
)
val list = @Composable {
LazyColumn(
modifier = Modifier.fillMaxSize(),
state = listState,
contentPadding = contentPadding,
content = content,
)
}
if (selectionEnabled) {
SelectionContainer {
list()
}
} else {
list()
}
VerticalScrollbar(
adapter = rememberScrollbarAdapter(scrollState),
adapter = rememberScrollbarAdapter(listState),
modifier = Modifier
.align(Alignment.CenterEnd)
.fillMaxHeight(),
Expand Down
Loading