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 @@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.selection.DisableSelection
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -706,21 +707,23 @@ private fun inlineJsonOutlineActions(
): (@Composable RowScope.(JsonOutlineNode) -> Unit)? {
if (!enabled) return null
return { _ ->
Row(
horizontalArrangement = Arrangement.spacedBy(Spacings.sm),
verticalAlignment = Alignment.CenterVertically,
) {
if (hasToggle) {
InspectorInlineTextToggle(
label = if (localPretty) "PRETTY" else "RAW",
onClick = onTogglePretty,
)
}
if (hasCopy) {
InspectorInlineCopyButton(
isCopied = didCopy,
onCopy = onCopy,
)
DisableSelection {
Row(
horizontalArrangement = Arrangement.spacedBy(Spacings.sm),
verticalAlignment = Alignment.CenterVertically,
) {
if (hasToggle) {
InspectorInlineTextToggle(
label = if (localPretty) "PRETTY" else "RAW",
onClick = onTogglePretty,
)
}
if (hasCopy) {
InspectorInlineCopyButton(
isCopied = didCopy,
onCopy = onCopy,
)
}
}
}
}
Expand All @@ -737,26 +740,28 @@ private fun ControlsRow(
) {
if (!hasToggle && !showsCopyButton) return

Row(
horizontalArrangement = Arrangement.End,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth(),
) {
DisableSelection {
Row(
horizontalArrangement = Arrangement.spacedBy(Spacings.sm),
horizontalArrangement = Arrangement.End,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth(),
) {
if (hasToggle) {
InspectorInlineTextToggle(
label = if (prettyChecked) "PRETTY" else "RAW",
onClick = onPrettyToggle,
)
}
if (showsCopyButton) {
InspectorInlineCopyButton(
isCopied = didCopy,
onCopy = onCopy,
)
Row(
horizontalArrangement = Arrangement.spacedBy(Spacings.sm),
verticalAlignment = Alignment.CenterVertically,
) {
if (hasToggle) {
InspectorInlineTextToggle(
label = if (prettyChecked) "PRETTY" else "RAW",
onClick = onPrettyToggle,
)
}
if (showsCopyButton) {
InspectorInlineCopyButton(
isCopied = didCopy,
onCopy = onCopy,
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -47,6 +48,8 @@ fun RequestDetailView(

var requestBodyPretty by remember(request.id) { mutableStateOf(request.requestBody?.prettyPrintedText != null) }
var responseBodyPretty by remember(request.id) { mutableStateOf(request.responseBody?.prettyPrintedText != null) }
var requestBodyPrettyTouched by remember(request.id) { mutableStateOf(false) }
var responseBodyPrettyTouched by remember(request.id) { mutableStateOf(false) }

var didCopyAllEvents by remember(request.id) { mutableStateOf(false) }

Expand All @@ -70,8 +73,14 @@ fun RequestDetailView(
onResponseHeadersExpandedChange = { uiState.responseHeadersExpanded = it },
onResponseBodyExpandedChange = { uiState.responseBodyExpanded = it },
onStreamExpandedChange = { uiState.streamExpanded = it },
onRequestBodyPrettyChange = { requestBodyPretty = it },
onResponseBodyPrettyChange = { responseBodyPretty = it },
onRequestBodyPrettyChange = {
requestBodyPrettyTouched = true
requestBodyPretty = it
},
onResponseBodyPrettyChange = {
responseBodyPrettyTouched = true
responseBodyPretty = it
},
onCopyAllEvents = {
NetworkInspectorCopyExporter.copyStreamEventsRaw(request.streamEvents)
didCopyAllEvents = true
Expand All @@ -82,11 +91,47 @@ fun RequestDetailView(
state = state,
actions = actions,
)
RequestDetailEffects(
request = request,
requestBodyPrettyTouched = requestBodyPrettyTouched,
responseBodyPrettyTouched = responseBodyPrettyTouched,
onRequestBodyPrettyAvailable = { requestBodyPretty = true },
onResponseBodyPrettyAvailable = { responseBodyPretty = true },
didCopyAllEvents = didCopyAllEvents,
onClearCopyAllEvents = { didCopyAllEvents = false },
)
}

@Composable
private fun RequestDetailEffects(
request: NetworkInspectorRequestUiModel,
requestBodyPrettyTouched: Boolean,
responseBodyPrettyTouched: Boolean,
onRequestBodyPrettyAvailable: () -> Unit,
onResponseBodyPrettyAvailable: () -> Unit,
didCopyAllEvents: Boolean,
onClearCopyAllEvents: () -> Unit,
) {
val latestOnRequestBodyPrettyAvailable by rememberUpdatedState(onRequestBodyPrettyAvailable)
val latestOnResponseBodyPrettyAvailable by rememberUpdatedState(onResponseBodyPrettyAvailable)
val latestOnClearCopyAllEvents by rememberUpdatedState(onClearCopyAllEvents)

LaunchedEffect(request.id, request.requestBody?.prettyPrintedText) {
if (request.requestBody?.prettyPrintedText != null && !requestBodyPrettyTouched) {
latestOnRequestBodyPrettyAvailable()
}
}

LaunchedEffect(request.id, request.responseBody?.prettyPrintedText) {
if (request.responseBody?.prettyPrintedText != null && !responseBodyPrettyTouched) {
latestOnResponseBodyPrettyAvailable()
}
}

if (didCopyAllEvents) {
LaunchedEffect(request.id, didCopyAllEvents) {
delay(1_000)
didCopyAllEvents = false
latestOnClearCopyAllEvents()
}
}
}
Expand Down Expand Up @@ -345,6 +390,9 @@ private fun LazyListScope.bodySectionItems(
keyPrefix = "$keyPrefix:payload",
)
}
item(key = "$keyPrefix:bottom-gap") {
Spacer(modifier = Modifier.size(Spacings.md))
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,21 +491,23 @@ private fun MessageHeaderActions(
NetworkInspectorCopyExporter.copyText(displayText)
copyToken += 1
}
Row(
horizontalArrangement = Arrangement.spacedBy(Spacings.sm),
verticalAlignment = Alignment.CenterVertically,
) {
if (prettyText != null) {
InspectorInlineTextToggle(
label = if (pretty) "PRETTY" else "RAW",
onClick = onPrettyToggle,
)
}
if (displayText.isNotEmpty()) {
InspectorInlineCopyButton(
isCopied = didCopy,
onCopy = onCopy,
)
DisableSelection {
Row(
horizontalArrangement = Arrangement.spacedBy(Spacings.sm),
verticalAlignment = Alignment.CenterVertically,
) {
if (prettyText != null) {
InspectorInlineTextToggle(
label = if (pretty) "PRETTY" else "RAW",
onClick = onPrettyToggle,
)
}
if (displayText.isNotEmpty()) {
InspectorInlineCopyButton(
isCopied = didCopy,
onCopy = onCopy,
)
}
}
}
}
Expand Down
Loading