Skip to content

Show loading bar when webview is initializing #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2025
Merged

Show loading bar when webview is initializing #738

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 39 additions & 14 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/ui/measurement/MeasurementScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.ooni.probe.ui.measurement
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
Expand Down Expand Up @@ -59,7 +60,10 @@ fun MeasurementScreen(
Text(stringResource(Res.string.Measurement_Title))
},
navigationIcon = {
IconButton(onClick = { onEvent(MeasurementViewModel.Event.BackClicked) }, modifier = Modifier.testTag("Back")) {
IconButton(
onClick = { onEvent(MeasurementViewModel.Event.BackClicked) },
modifier = Modifier.testTag("Back"),
) {
Icon(
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(Res.string.Common_Back),
Expand Down Expand Up @@ -100,19 +104,13 @@ fun MeasurementScreen(
},
)

LinearProgressIndicator(
progress = {
(controller.state as? OoniWebViewController.State.Loading)?.progress ?: 0f
},
color = MaterialTheme.colorScheme.onPrimary,
trackColor = Color.Transparent,
drawStopIndicator = {},
modifier = Modifier
.fillMaxWidth()
.align(Alignment.BottomCenter)
.padding(bottom = 2.dp)
.height(2.dp),
)
if (controller.state is OoniWebViewController.State.Initializing ||
controller.state is OoniWebViewController.State.Loading
) {
ProgressIndicator(
(controller.state as? OoniWebViewController.State.Loading)?.progress ?: 0f,
)
}
}

if (state !is MeasurementViewModel.State.ShowMeasurement) return@Column
Expand Down Expand Up @@ -163,3 +161,30 @@ fun MeasurementScreen(
url?.let(controller::load)
}
}

@Composable
private fun BoxScope.ProgressIndicator(progress: Float) {
val progressColor = MaterialTheme.colorScheme.onPrimary
val progressTrackColor = Color.Transparent
val progressModifier = Modifier
.fillMaxWidth()
.align(Alignment.BottomCenter)
.padding(bottom = 2.dp)
.height(2.dp)

if (progress == 0f) {
LinearProgressIndicator(
color = progressColor,
trackColor = progressTrackColor,
modifier = progressModifier,
)
} else {
LinearProgressIndicator(
progress = { progress },
color = progressColor,
trackColor = progressTrackColor,
drawStopIndicator = {},
modifier = progressModifier,
)
}
}
Loading