Skip to content
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

Choose websites #177

Merged
merged 3 commits into from
Oct 15, 2024
Merged

Choose websites #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96f1c93
Choose websites
sdsantos Oct 14, 2024
6625eda
Confirm choose websites back
sdsantos Oct 15, 2024
9cb2c69
Avoid overlap between add website and run test buttons
sdsantos Oct 15, 2024
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
9 changes: 9 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_add.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FF000000"
android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z"/>
</vector>
9 changes: 9 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_cancel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FF000000"
android:pathData="M336,680L480,536L624,680L680,624L536,480L680,336L624,280L480,424L336,280L280,336L424,480L280,624L336,680ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
</vector>
10 changes: 10 additions & 0 deletions composeApp/src/commonMain/composeResources/values/strings-common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<string name="Dashboard_Overview_LatestTest">Last test:</string>
<string name="Dashboard_Overview_Estimated">Estimated:</string>
<string name="Dashboard_Overview_LastRun_Never">N/A</string>
<string name="Dashboard_Overview_ChooseWebsites">Choose websites</string>

<string name="Dashboard_Running_Running">Running:</string>
<string name="Dashboard_Running_EstimatedTimeLeft">Estimated time left:</string>
Expand Down Expand Up @@ -214,6 +215,15 @@
<string name="Dashboard_RunV2_UpdatedTag">UPDATED</string>
<string name="Dashboard_RunV2_UpdateTag">UPDATE</string>

<string name="Settings_Websites_CustomURL_Title">Choose websites to test</string>
<string name="Settings_Websites_CustomURL_URL">URL</string>
<string name="Settings_Websites_CustomURL_NoURLEntered">No URLs entered</string>
<string name="Settings_Websites_CustomURL_Run">Run</string>
<string name="Settings_Websites_CustomURL_Add">Add website</string>
<string name="CustomWebsites_Fab_Text">Test %1$d URLs</string>
<string name="Modal_CustomURL_Title_NotSaved">Are you sure?</string>
<string name="Modal_CustomURL_NotSaved">Your URLs will not be saved when you leave this screen. Are you sure you want to leave this screen?</string>

<!-- New Strings -->
<string name="back">Back</string>
<string name="refresh">refresh</string>
Expand Down
12 changes: 12 additions & 0 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ import org.ooni.probe.domain.UploadMissingMeasurements
import org.ooni.probe.shared.PlatformInfo
import org.ooni.probe.shared.monitoring.AppLogger
import org.ooni.probe.shared.monitoring.CrashMonitoring
import org.ooni.probe.ui.choosewebsites.ChooseWebsitesViewModel
import org.ooni.probe.ui.dashboard.DashboardViewModel
import org.ooni.probe.ui.descriptor.DescriptorViewModel
import org.ooni.probe.ui.descriptor.add.AddDescriptorViewModel
Expand Down Expand Up @@ -351,6 +352,15 @@ class Dependencies(
fetchDescriptor = { fetchDescriptor(descriptorId) },
)

fun chooseWebsitesViewModel(
onBack: () -> Unit,
goToDashboard: () -> Unit,
) = ChooseWebsitesViewModel(
onBack = onBack,
goToDashboard = goToDashboard,
startBackgroundRun = startSingleRunInner,
)

fun dashboardViewModel(
goToOnboarding: () -> Unit,
goToResults: () -> Unit,
Expand Down Expand Up @@ -380,10 +390,12 @@ class Dependencies(
descriptorKey: String,
onBack: () -> Unit,
goToReviewDescriptorUpdates: () -> Unit,
goToChooseWebsites: () -> Unit,
) = DescriptorViewModel(
descriptorKey = descriptorKey,
onBack = onBack,
goToReviewDescriptorUpdates = goToReviewDescriptorUpdates,
goToChooseWebsites = goToChooseWebsites,
getTestDescriptors = getTestDescriptors::invoke,
getDescriptorLastResult = resultRepository::getLatestByDescriptor,
preferenceRepository = preferenceRepository,
Expand Down
14 changes: 5 additions & 9 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/domain/GetTestDescriptorsBySpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@ class GetTestDescriptorsBySpec(
.mapNotNull { descriptor ->
val specTest = spec.forDescriptor(descriptor) ?: return@mapNotNull null

val specDescriptor =
descriptor.copy(
netTests =
descriptor.netTests
.filter { specTest.netTests.contains(it) },
longRunningTests =
descriptor.longRunningTests
.filter { specTest.netTests.contains(it) },
)
val specDescriptor = descriptor.copy(
netTests = specTest.netTests,
// long running are already inside netTests
longRunningTests = emptyList(),
)

if (specDescriptor.netTests.isEmpty() && specDescriptor.longRunningTests.isEmpty()) {
return@mapNotNull null
Expand Down
175 changes: 175 additions & 0 deletions composeApp/src/commonMain/kotlin/org/ooni/probe/ui/choosewebsites/ChooseWebsitesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
package org.ooni.probe.ui.choosewebsites

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import ooniprobe.composeapp.generated.resources.CustomWebsites_Fab_Text
import ooniprobe.composeapp.generated.resources.Modal_Cancel
import ooniprobe.composeapp.generated.resources.Modal_CustomURL_NotSaved
import ooniprobe.composeapp.generated.resources.Modal_CustomURL_Title_NotSaved
import ooniprobe.composeapp.generated.resources.Modal_Delete
import ooniprobe.composeapp.generated.resources.Modal_OK
import ooniprobe.composeapp.generated.resources.Res
import ooniprobe.composeapp.generated.resources.Settings_Websites_CustomURL_Add
import ooniprobe.composeapp.generated.resources.Settings_Websites_CustomURL_Title
import ooniprobe.composeapp.generated.resources.Settings_Websites_CustomURL_URL
import ooniprobe.composeapp.generated.resources.back
import ooniprobe.composeapp.generated.resources.ic_add
import ooniprobe.composeapp.generated.resources.ic_cancel
import ooniprobe.composeapp.generated.resources.ic_timer
import org.jetbrains.compose.resources.painterResource
import org.jetbrains.compose.resources.stringResource
import org.ooni.probe.ui.shared.ColorDefaults

@Composable
fun ChooseWebsitesScreen(
state: ChooseWebsitesViewModel.State,
onEvent: (ChooseWebsitesViewModel.Event) -> Unit,
) {
Column(
modifier = Modifier.padding(WindowInsets.navigationBars.asPaddingValues()),
) {
TopAppBar(
title = { Text(stringResource(Res.string.Settings_Websites_CustomURL_Title)) },
navigationIcon = {
IconButton(onClick = { onEvent(ChooseWebsitesViewModel.Event.BackClicked) }) {
Icon(
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(Res.string.back),
)
}
},
colors = ColorDefaults.topAppBar(),
)

Box(Modifier.fillMaxSize()) {
LazyColumn(
contentPadding = PaddingValues(
bottom = WindowInsets.navigationBars.asPaddingValues()
.calculateBottomPadding() + 64.dp,
),
) {
itemsIndexed(state.websites) { index, item ->
OutlinedTextField(
value = item.url,
onValueChange = {
onEvent(
ChooseWebsitesViewModel.Event.UrlChanged(
index,
it,
),
)
},
label = { stringResource(Res.string.Settings_Websites_CustomURL_URL) },
isError = item.hasError,
trailingIcon = {
if (state.canRemoveUrls) {
IconButton(
onClick = {
onEvent(
ChooseWebsitesViewModel.Event.DeleteWebsiteClicked(
index,
),
)
},
) {
Icon(
painterResource(Res.drawable.ic_cancel),
contentDescription = stringResource(Res.string.Modal_Delete),
)
}
}
},
modifier = Modifier.fillMaxWidth()
.padding(horizontal = 16.dp)
.padding(top = 16.dp),
)
}

item(key = "Add") {
TextButton(
onClick = { onEvent(ChooseWebsitesViewModel.Event.AddWebsiteClicked) },
modifier = Modifier.padding(16.dp),
) {
Icon(
painterResource(Res.drawable.ic_add),
contentDescription = null,
modifier = Modifier.padding(end = 8.dp),
)
Text(stringResource(Res.string.Settings_Websites_CustomURL_Add))
}
}
}

Button(
onClick = { onEvent(ChooseWebsitesViewModel.Event.RunClicked) },
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(WindowInsets.navigationBars.asPaddingValues())
.padding(bottom = 16.dp),
) {
Icon(
painterResource(Res.drawable.ic_timer),
contentDescription = null,
modifier = Modifier.padding(end = 8.dp),
)
Text(
stringResource(Res.string.CustomWebsites_Fab_Text, state.websites.size),
style = MaterialTheme.typography.bodyLarge,
)
}
}
}

if (state.showBackConfirmation) {
BackConfirmationDialog(
onConfirm = { onEvent(ChooseWebsitesViewModel.Event.BackConfirmed) },
onDismiss = { onEvent(ChooseWebsitesViewModel.Event.BackCancelled) },
)
}
}

@Composable
private fun BackConfirmationDialog(
onConfirm: () -> Unit,
onDismiss: () -> Unit,
) {
AlertDialog(
onDismissRequest = { onDismiss() },
title = { Text(stringResource(Res.string.Modal_CustomURL_Title_NotSaved)) },
text = { Text(stringResource(Res.string.Modal_CustomURL_NotSaved)) },
confirmButton = {
TextButton(onClick = { onConfirm() }) {
Text(stringResource(Res.string.Modal_OK))
}
},
dismissButton = {
TextButton(onClick = { onDismiss() }) {
Text(stringResource(Res.string.Modal_Cancel))
}
},
)
}
Loading
Loading