yan/archived-matedroid
1
0
Fork 0
mirror of https://github.com/vide/matedroid.git synced 2026-01-20 00:03:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(drives): apply distance filter to summary card and charts (#34)

Browse Source 
The distance filter (Commute/Day trip/Road trip) now affects all
components in the Drives view:
- Summary card shows totals for filtered distance category only
- Histogram charts display data for filtered distance category only
- Drive list continues to show filtered results

This provides a consistent view when analyzing specific trip types.

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Davide Ferrari
2026-01-11 10:12:50 +01:00
committed by GitHub
parent ebff335976
commit 2cbef9d887
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/matedroid/ui/screens/drives/DrivesViewModel.kt
View File

@@ -157,16 +157,11 @@ class DrivesViewModel @Inject constructor(
when (val result = repository.getDrives(id, startDateStr, endDateStr)) {
is ApiResult.Success -> {
allDrives = result.data
// Calculate summary and chart from ALL drives (including short ones)
val summary = calculateSummary(allDrives)
val granularity = determineGranularity(startDate, endDate)
val chartData = calculateChartData(allDrives, granularity)
_uiState.update {
it.copy(
chartData = chartData,
chartGranularity = granularity,
summary = summary,
error = null
)
}
@@ -189,6 +184,7 @@ class DrivesViewModel @Inject constructor(
private fun applyFiltersAndUpdateState() {
val state = _uiState.value
val distanceFilter = state.distanceFilter
val granularity = state.chartGranularity
// First apply short drives filter
var filteredDrives = if (showShortDrivesCharges) {
@@ -200,19 +196,33 @@ class DrivesViewModel @Inject constructor(
}
}
// Then apply distance filter
filteredDrives = filteredDrives.filter { drive ->
// Apply distance filter for list display
val displayDrives = filteredDrives.filter { drive ->
val distance = drive.distance ?: 0.0
val minOk = distanceFilter.minDistanceKm?.let { distance >= it } ?: true
val maxOk = distanceFilter.maxDistanceKm?.let { distance < it } ?: true
minOk && maxOk
}
// Apply distance filter to all drives for summary/charts (include short drives)
val drivesForStats = allDrives.filter { drive ->
val distance = drive.distance ?: 0.0
val minOk = distanceFilter.minDistanceKm?.let { distance >= it } ?: true
val maxOk = distanceFilter.maxDistanceKm?.let { distance < it } ?: true
minOk && maxOk
}
// Calculate summary and chart data from filtered drives
val summary = calculateSummary(drivesForStats)
val chartData = calculateChartData(drivesForStats, granularity)
_uiState.update {
it.copy(
isLoading = false,
isRefreshing = false,
drives = filteredDrives
drives = displayDrives,
summary = summary,
chartData = chartData
)
}
}