From 7fa2baf90369d14447693d17f446f05c392e8a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Santos?= Date: Mon, 18 Nov 2024 18:24:58 +0000 Subject: [PATCH] Make result summary scrollable --- .../org/ooni/probe/ui/result/ResultScreen.kt | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/result/ResultScreen.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/result/ResultScreen.kt index 2d0e83856..3127dc6ba 100644 --- a/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/result/ResultScreen.kt +++ b/composeApp/src/commonMain/kotlin/org/ooni/probe/ui/result/ResultScreen.kt @@ -121,23 +121,28 @@ fun ResultScreen( ) if (state.result == null) return@Column - - if (!isHeightCompact()) { - Surface( - color = descriptorColor, - contentColor = onDescriptorColor, - ) { - Summary(state.result) - } - } - - if (state.result.anyMeasurementMissingUpload) { - UploadResults(onUploadClick = { onEvent(ResultViewModel.Event.UploadClicked) }) - } + val showSummary = !isHeightCompact() LazyColumn( contentPadding = WindowInsets.navigationBars.asPaddingValues(), ) { + if (showSummary) { + item("summary") { + Surface( + color = descriptorColor, + contentColor = onDescriptorColor, + ) { + Summary(state.result) + } + } + } + + if (state.result.anyMeasurementMissingUpload) { + stickyHeader("upload_results") { + UploadResults(onUploadClick = { onEvent(ResultViewModel.Event.UploadClicked) }) + } + } + items(state.result.measurements, key = { it.measurement.idOrThrow.value }) { item -> ResultMeasurementCell( item = item,