Skip to content

Don't show Install & Run when installing expired tests #998

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
Nov 18, 2025
Merged

Don't show Install & Run when installing expired tests #998

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/InstalledTestDescriptorModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import org.ooni.engine.models.SummaryType
import org.ooni.probe.data.TestDescriptor
import org.ooni.probe.shared.InstalledDescriptorIcons
import org.ooni.probe.shared.hexToColor
import org.ooni.probe.shared.now
import org.ooni.probe.shared.stringMonthArrayResource
import org.ooni.probe.shared.toEpoch

Expand Down Expand Up @@ -61,6 +62,8 @@ data class InstalledTestDescriptorModel(

val previousRevisions
get() = if (revision <= 1) emptyList() else (1 until revision).toList().reversed()

val isExpired get() = expirationDate != null && expirationDate < LocalDateTime.now()
}

fun InstalledTestDescriptorModel.toDescriptor(updateStatus: UpdateStatus = UpdateStatus.Unknown) =
Expand Down
54 changes: 36 additions & 18 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/ui/descriptor/add/AddDescriptorScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.state.ToggleableState
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import ooniprobe.composeapp.generated.resources.AddDescriptor_AutoRun
import ooniprobe.composeapp.generated.resources.AddDescriptor_AutoUpdate
Expand Down Expand Up @@ -174,26 +175,43 @@ fun AddDescriptorScreen(
.padding(horizontal = 16.dp)
.padding(WindowInsets.navigationBars.asPaddingValues())
.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
horizontalArrangement =
if (!descriptor.isExpired) Arrangement.SpaceBetween else Arrangement.Center,
) {
TextButton(
onClick = { onEvent(AddDescriptorViewModel.Event.InstallClicked) },
) {
Text(stringResource(Res.string.AddDescriptor_InstallForLater))
}
if (!descriptor.isExpired) {
TextButton(
onClick = { onEvent(AddDescriptorViewModel.Event.InstallClicked) },
) {
Text(
stringResource(Res.string.AddDescriptor_InstallForLater),
textAlign = TextAlign.Center,
)
}

Button(
onClick = { onEvent(AddDescriptorViewModel.Event.RunClicked) },
) {
Text(
stringResource(Res.string.AddDescriptor_InstallAndRun),
style = MaterialTheme.typography.titleLarge,
)
Icon(
painterResource(Res.drawable.ic_timer),
contentDescription = null,
modifier = Modifier.padding(start = 8.dp),
)
Button(
onClick = { onEvent(AddDescriptorViewModel.Event.RunClicked) },
) {
Text(
stringResource(Res.string.AddDescriptor_InstallAndRun),
style = MaterialTheme.typography.titleLarge,
textAlign = TextAlign.Center,
)
Icon(
painterResource(Res.drawable.ic_timer),
contentDescription = null,
modifier = Modifier.padding(start = 8.dp),
)
}
} else {
Button(
onClick = { onEvent(AddDescriptorViewModel.Event.InstallClicked) },
) {
Text(
stringResource(Res.string.AddDescriptor_InstallForLater),
style = MaterialTheme.typography.titleLarge,
textAlign = TextAlign.Center,
)
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jetbrainsComposeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "13.1.0" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "14.0.1" }
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
javafx = { id = "org.openjfx.javafxplugin", version = "0.1.0" }

Expand Down
Loading