diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-01-02 07:26:13 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-01-02 07:26:13 +0000 |
| commit | 7333a0d80ef3fb879fb6d261988deb78b4857393 (patch) | |
| tree | 0a1a1d51465ea36a36daa078ca515082315dc25d /app/src/main/java/foundation/e/privacycentralapp/features | |
| parent | 46ae027812cc654150d29a7861eb300cf1b852f0 (diff) | |
| parent | 3e353baf484524663b21f6a0cbb232634595fc33 (diff) | |
| download | advanced-privacy-7333a0d80ef3fb879fb6d261988deb78b4857393.tar.gz | |
Merge branch '5422-graduations_x_axis' into 'main'
5422: add time graduations on tracker graph on dashboard.
See merge request e/os/advanced-privacy!111
Diffstat (limited to 'app/src/main/java/foundation/e/privacycentralapp/features')
3 files changed, 3 insertions, 0 deletions
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 8a0a3d4..0dc24e8 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 @@ -259,6 +259,7 @@ class DashboardFragment : NavToolbarFragment(R.layout.fragment_dashboard) { binding.graphEmpty.isVisible = false state.dayStatistics?.let { graphHolder?.data = it } state.dayLabels?.let { graphHolder?.labels = it } + state.dayGraduations?.let { graphHolder?.graduations = it } binding.graphLegend.text = Html.fromHtml( getString( diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardState.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardState.kt index 937fa22..0e3521d 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardState.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardState.kt @@ -33,4 +33,5 @@ data class DashboardState( val allowedTrackersCount: Int? = null, val dayStatistics: List<Pair<Int, Int>>? = null, val dayLabels: List<String>? = null, + val dayGraduations: List<String?>? = null, ) diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardViewModel.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardViewModel.kt index 18b4212..ead01a5 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardViewModel.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardViewModel.kt @@ -114,6 +114,7 @@ class DashboardViewModel( s.copy( dayStatistics = dayStatistics.callsBlockedNLeaked, dayLabels = dayStatistics.periods, + dayGraduations = dayStatistics.graduations, leakedTrackersCount = dayStatistics.trackersCount, trackersCount = trackersCount, allowedTrackersCount = nonBlockedTrackersCount |