Merge pull request #63 from ooni/ooni-tests

Setup default OONI tests

Author: sdsantos

composeApp/src/commonMain/composeResources/drawable/.gitignore

@@ -1,2 +1,7 @@
 
-logo.xml
+logo.xml
+test_experimental.xml
+test_performance.xml
+test_instant_messaging.xml
+test_websites.xml
+test_circumvention.xml

composeApp/src/commonMain/composeResources/drawable/ic_chevron_right.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="#000"
+        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+</vector>

composeApp/src/commonMain/composeResources/values/strings-common.xml

@@ -4,7 +4,11 @@
     <string name="dashboard">Dashboard</string>
     <string name="settings">Settings</string>
 
+    <string name="Dashboard_RunV2_Ooni_Title">OONI Tests</string>
+    <string name="Dashboard_RunV2_Title">OONI Run Links</string>
+
     <string name="TestResults_Overview_Title">Test Results</string>
     <string name="TestResults_Overview_Tab_Label">Test Results</string>
     <string name="TestResults_UnknownASN">Unknown</string>
+    <string name="TestResults_NotAvailable">N/A</string>
 </resources>

composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/DefaultTestDescriptor.kt

@@ -0,0 +1,18 @@
+package org.ooni.probe.data.models
+
+import androidx.compose.ui.graphics.Color
+import org.jetbrains.compose.resources.DrawableResource
+import org.jetbrains.compose.resources.StringResource
+
+data class DefaultTestDescriptor(
+    val label: String,
+    val title: StringResource,
+    val shortDescription: StringResource,
+    val description: StringResource,
+    val icon: DrawableResource,
+    val color: Color,
+    val animation: String,
+    val dataUsage: StringResource,
+    var netTests: List<NetTest>,
+    var longRunningTests: List<NetTest> = emptyList(),
+)

composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/Descriptor.kt

@@ -0,0 +1,25 @@
+package org.ooni.probe.data.models
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import org.jetbrains.compose.resources.DrawableResource
+
+data class Descriptor(
+    val name: String,
+    val title: @Composable () -> String,
+    val shortDescription: @Composable () -> String?,
+    val description: @Composable () -> String?,
+    val icon: DrawableResource?,
+    val color: Color?,
+    val animation: String?,
+    val dataUsage: @Composable () -> String?,
+    val netTests: List<NetTest>,
+    val longRunningTests: List<NetTest>? = null,
+    val source: Source,
+) {
+    sealed interface Source {
+        data class Default(val value: DefaultTestDescriptor) : Source
+
+        data class Installed(val value: InstalledTestDescriptorModel) : Source
+    }
+}

composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/TestDescriptorModel.kt renamed to composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/InstalledTestDescriptorModel.kt

@@ -2,9 +2,9 @@ package org.ooni.probe.data.models
 
 import kotlinx.datetime.Instant
 
-data class TestDescriptorModel(
+data class InstalledTestDescriptorModel(
     val id: Id,
-    val name: String?,
+    val name: String,
     val shortDescription: String?,
     val description: String?,
     val author: String?,
@@ -19,7 +19,6 @@ data class TestDescriptorModel(
     val dateCreated: Instant?,
     val dateUpdated: Instant?,
     val revision: String?,
-    val previousRevision: String?,
     val isExpired: Boolean,
     val autoUpdate: Boolean,
 ) {

composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/LocalizationString.kt

@@ -1,3 +1,7 @@
 package org.ooni.probe.data.models
 
+import androidx.compose.ui.text.intl.Locale
+
 typealias LocalizationString = Map<String, String>
+
+fun LocalizationString.getCurrent() = get(Locale.current.language)

composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/NetTest.kt

@@ -7,5 +7,5 @@ import kotlinx.serialization.Serializable
 data class NetTest(
     @SerialName("test_name")
     val name: String,
-    val inputs: List<String>?,
+    val inputs: List<String>? = null,
 )

composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/ResultModel.kt

@@ -12,7 +12,7 @@ data class ResultModel(
     val dataUsageDown: Long?,
     val failureMessage: String?,
     val networkId: NetworkModel.Id?,
-    val testDescriptorId: TestDescriptorModel.Id?,
+    val testDescriptorId: InstalledTestDescriptorModel.Id?,
 ) {
     data class Id(
         val value: Long,

composeApp/src/commonMain/kotlin/org/ooni/probe/data/repositories/ResultRepository.kt

@@ -10,10 +10,10 @@ import org.ooni.probe.Database
 import org.ooni.probe.data.Network
 import org.ooni.probe.data.Result
 import org.ooni.probe.data.SelectAllWithNetwork
+import org.ooni.probe.data.models.InstalledTestDescriptorModel
 import org.ooni.probe.data.models.NetworkModel
 import org.ooni.probe.data.models.ResultListItem
 import org.ooni.probe.data.models.ResultModel
-import org.ooni.probe.data.models.TestDescriptorModel
 import org.ooni.probe.shared.toEpoch
 import org.ooni.probe.shared.toLocalDateTime
 
@@ -71,7 +71,7 @@ private fun Result.toModel(): ResultModel? {
         dataUsageDown = data_usage_down,
         failureMessage = failure_msg,
         networkId = network_id?.let(NetworkModel::Id),
-        testDescriptorId = descriptor_runId?.let(TestDescriptorModel::Id),
+        testDescriptorId = descriptor_runId?.let(InstalledTestDescriptorModel::Id),
     )
 }