From 38a056495a7f6a85e57b0db62e8e350a22ef0148 Mon Sep 17 00:00:00 2001 From: jacquarg Date: Mon, 15 Nov 2021 09:40:36 +0100 Subject: Update graph design --- .../domain/usecases/TrackersStatisticsUseCase.kt | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/foundation/e/privacycentralapp/domain') diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt index ae820f1..fcc3676 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt @@ -24,14 +24,14 @@ class TrackersStatisticsUseCase( ) { fun getPastDayTrackersCalls(): List { - return trackTrackersPrivacyModule.getPastDayTrackersCalls() + return trackTrackersPrivacyModule.getPastDayTrackersCalls().pruneEmptyHistoric() } fun getDayMonthYearStatistics(): Triple, List, List> { return Triple( - trackTrackersPrivacyModule.getPastDayTrackersCalls(), - trackTrackersPrivacyModule.getPastMonthTrackersCalls(), - trackTrackersPrivacyModule.getPastYearTrackersCalls() + trackTrackersPrivacyModule.getPastDayTrackersCalls().pruneEmptyHistoric(), + trackTrackersPrivacyModule.getPastMonthTrackersCalls().pruneEmptyHistoric(), + trackTrackersPrivacyModule.getPastYearTrackersCalls().pruneEmptyHistoric() ) } @@ -50,4 +50,17 @@ class TrackersStatisticsUseCase( fun getTrackersCount(): Int { return trackTrackersPrivacyModule.getTrackersCount() } + + private fun List.pruneEmptyHistoric(): List { + val result = mutableListOf() + reversed().forEach { + if (result.isNotEmpty() || it != 0) { + result.add(it) + } + } + if (result.isEmpty() && !isEmpty()) { + result.add(last()) + } + return result + } } -- cgit v1.2.3