Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ class ResultRepository(
}
}

suspend fun markAsViewed(resultId: ResultModel.Id) =
withContext(backgroundDispatcher) {
database.resultQueries.markAsViewed(resultId.value)
}

private fun Result.toModel(): ResultModel? {
return ResultModel(
id = ResultModel.Id(id),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,13 @@ class Dependencies(
resultId: ResultModel.Id,
onBack: () -> Unit,
goToMeasurement: (MeasurementModel.ReportId, String?) -> Unit,
) = ResultViewModel(resultId, onBack, goToMeasurement, getResult::invoke)
) = ResultViewModel(
resultId = resultId,
onBack = onBack,
goToMeasurement = goToMeasurement,
getResult = getResult::invoke,
markResultAsViewed = resultRepository::markAsViewed,
)

companion object {
@VisibleForTesting
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.filterIsInstance
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.take
import kotlinx.coroutines.flow.update
import org.ooni.probe.data.models.MeasurementModel
import org.ooni.probe.data.models.ResultItem
Expand All @@ -19,6 +22,7 @@ class ResultViewModel(
onBack: () -> Unit,
goToMeasurement: (MeasurementModel.ReportId, String?) -> Unit,
getResult: (ResultModel.Id) -> Flow<ResultItem?>,
markResultAsViewed: suspend (ResultModel.Id) -> Unit,
) : ViewModel() {
private val events = MutableSharedFlow<Event>(extraBufferCapacity = 1)

Expand All @@ -27,7 +31,23 @@ class ResultViewModel(

init {
getResult(resultId)
.onEach { result -> _state.update { it.copy(result = result) } }
.onEach { result ->
_state.update { it.copy(result = result) }
if (result?.result?.isViewed == false) {
markResultAsViewed(resultId)
}
}
.launchIn(viewModelScope)

_state
.map { it.result }
.filterNotNull()
.take(1)
.onEach {
if (!it.result.isViewed) {
markResultAsViewed(resultId)
}
}
.launchIn(viewModelScope)

events
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,11 @@ private fun ResultItem(
onResultClick: () -> Unit,
) {
Surface(
color =
if (item.result.isViewed) {
MaterialTheme.colorScheme.surface
} else {
MaterialTheme.colorScheme.surfaceVariant
},
color = if (item.result.isViewed) {
MaterialTheme.colorScheme.surface
} else {
MaterialTheme.colorScheme.surfaceVariant
},
modifier = Modifier.padding(top = 1.dp),
) {
Row(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,6 @@ FROM Result
LEFT JOIN Network ON Result.network_id = Network.id
WHERE Result.id = ?
LIMIT 1;

markAsViewed:
UPDATE Result SET is_viewed = 1 WHERE id = ?;
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ class ResultViewModelTest {
onBack: () -> Unit = {},
goToMeasurement: (MeasurementModel.ReportId, String?) -> Unit = { _, _ -> },
getResult: (ResultModel.Id) -> Flow<ResultItem?> = { flowOf(null) },
markResultAsViewed: (ResultModel.Id) -> Unit = {},
) = ResultViewModel(
resultId = resultId,
onBack = onBack,
goToMeasurement = goToMeasurement,
getResult = getResult,
markResultAsViewed = markResultAsViewed,
)
}