diff options
Diffstat (limited to 'app/src/main/java/foundation/e/privacycentralapp/features')
3 files changed, 7 insertions, 7 deletions
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt index 87f5e42..8a4ee54 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFeature.kt @@ -57,7 +57,7 @@ class DashboardFeature( // val graphData val trackersCount: Int? = null, val activeTrackersCount: Int? = null, - val dayStatistics: List<Int>? = null, + val dayStatistics: List<Pair<Int, Int>>? = null, val dayLabels: List<String>? = null ) @@ -84,7 +84,7 @@ class DashboardFeature( data class UpdateStateEffect(val isEnabled: Boolean) : Effect() data class IpScramblingModeUpdatedEffect(val mode: InternetPrivacyMode) : Effect() data class TrackersStatisticsUpdatedEffect( - val dayStatistics: List<Int>, + val dayStatistics: List<Pair<Int, Int>>, val dayLabels: List<String>, val dayTrackersCount: Int, val trackersCount: Int @@ -151,7 +151,7 @@ class DashboardFeature( trackersStatisticsUseCase.getDayStatistics().let { (dayStatistics, trackersCount) -> Effect.TrackersStatisticsUpdatedEffect( - dayStatistics = dayStatistics.calls, + dayStatistics = dayStatistics.callsBlockedNLeaked, dayLabels = dayStatistics.periods, dayTrackersCount = dayStatistics.trackersCount, trackersCount = trackersCount @@ -176,7 +176,7 @@ class DashboardFeature( trackersStatisticsUseCase.getDayStatistics().let { (dayStatistics, trackersCount) -> Effect.TrackersStatisticsUpdatedEffect( - dayStatistics = dayStatistics.calls, + dayStatistics = dayStatistics.callsBlockedNLeaked, dayLabels = dayStatistics.periods, dayTrackersCount = dayStatistics.trackersCount, trackersCount = trackersCount diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt index dec3234..51dee3d 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt @@ -217,7 +217,7 @@ class DashboardFragment : ) ) - if (state.dayStatistics?.all { it == 0 } == true) { + if (state.dayStatistics?.all { it.first == 0 && it.second == 0 } == true) { binding.graph.visibility = View.INVISIBLE binding.graphLegend.isVisible = false binding.graphEmpty.isVisible = true diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt index c0212a5..893f4ba 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt @@ -137,13 +137,13 @@ class TrackersFragment : graphHolder: GraphHolder, graphBinding: TrackersItemGraphBinding ) { - if (statistics.calls.all { it == 0 }) { + if (statistics.callsBlockedNLeaked.all { it.first == 0 && it.second == 0 }) { graphBinding.graph.visibility = View.INVISIBLE graphBinding.graphEmpty.isVisible = true } else { graphBinding.graph.isVisible = true graphBinding.graphEmpty.isVisible = false - graphHolder.data = statistics.calls + graphHolder.data = statistics.callsBlockedNLeaked graphHolder.labels = statistics.periods graphBinding.trackersCountLabel.text = getString(R.string.trackers_count_label, statistics.trackersCount) |