From fc3807aaf56f050794b13c47ca276faf39ca903b Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 5 Mar 2022 10:58:20 +0100 Subject: [PATCH] Use past year for statistics filter --- ui/i18n/src/main/res/values/strings.xml | 2 +- .../ui/statistics/subscriptions/StatisticsFilterDialog.java | 6 +++--- .../src/main/res/layout/statistics_filter_dialog.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/i18n/src/main/res/values/strings.xml b/ui/i18n/src/main/res/values/strings.xml index 197d0c636..4dc7256b2 100644 --- a/ui/i18n/src/main/res/values/strings.xml +++ b/ui/i18n/src/main/res/values/strings.xml @@ -49,7 +49,7 @@ To Today All time - Last year + Past year Reset statistics data This will erase the history of duration played for all episodes. Are you sure you want to proceed? Played between %1$s and %2$s diff --git a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/subscriptions/StatisticsFilterDialog.java b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/subscriptions/StatisticsFilterDialog.java index 67b0217f3..13ac3ab0f 100644 --- a/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/subscriptions/StatisticsFilterDialog.java +++ b/ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/subscriptions/StatisticsFilterDialog.java @@ -46,7 +46,7 @@ public class StatisticsFilterDialog { dialogBinding.includeMarkedCheckbox.setOnCheckedChangeListener((compoundButton, checked) -> { dialogBinding.timeToSpinner.setEnabled(!checked); dialogBinding.timeFromSpinner.setEnabled(!checked); - dialogBinding.lastYearButton.setEnabled(!checked); + dialogBinding.pastYearButton.setEnabled(!checked); dialogBinding.allTimeButton.setEnabled(!checked); dialogBinding.dateSelectionContainer.setAlpha(checked ? 0.5f : 1f); }); @@ -79,8 +79,8 @@ public class StatisticsFilterDialog { dialogBinding.timeFromSpinner.setSelection(0); dialogBinding.timeToSpinner.setSelection(filterDatesTo.first.length - 1); }); - dialogBinding.lastYearButton.setOnClickListener(v -> { - dialogBinding.timeFromSpinner.setSelection(Math.max(0, filterDatesFrom.first.length - 14)); + dialogBinding.pastYearButton.setOnClickListener(v -> { + dialogBinding.timeFromSpinner.setSelection(Math.max(0, filterDatesFrom.first.length - 13)); dialogBinding.timeToSpinner.setSelection(filterDatesTo.first.length - 2); }); diff --git a/ui/statistics/src/main/res/layout/statistics_filter_dialog.xml b/ui/statistics/src/main/res/layout/statistics_filter_dialog.xml index d37226c07..684ceabd2 100644 --- a/ui/statistics/src/main/res/layout/statistics_filter_dialog.xml +++ b/ui/statistics/src/main/res/layout/statistics_filter_dialog.xml @@ -65,10 +65,10 @@ android:orientation="horizontal">