summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorByteHamster <info@bytehamster.com>2022-03-05 10:58:20 +0100
committerByteHamster <info@bytehamster.com>2022-03-05 10:58:20 +0100
commitfc3807aaf56f050794b13c47ca276faf39ca903b (patch)
treebbf55850ab32bd5d2084fddabdec8c2e5993cf0b
parentf0aec13ea3be17cb75d0b3de441efeba0ca7995c (diff)
downloadAntennaPod-fc3807aaf56f050794b13c47ca276faf39ca903b.zip
Use past year for statistics filter
-rw-r--r--ui/i18n/src/main/res/values/strings.xml2
-rw-r--r--ui/statistics/src/main/java/de/danoeh/antennapod/ui/statistics/subscriptions/StatisticsFilterDialog.java6
-rw-r--r--ui/statistics/src/main/res/layout/statistics_filter_dialog.xml4
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 @@
<string name="statistics_to">To</string>
<string name="statistics_today">Today</string>
<string name="statistics_filter_all_time">All time</string>
- <string name="statistics_filter_last_year">Last year</string>
+ <string name="statistics_filter_past_year">Past year</string>
<string name="statistics_reset_data">Reset statistics data</string>
<string name="statistics_reset_data_msg">This will erase the history of duration played for all episodes. Are you sure you want to proceed?</string>
<string name="statistics_counting_range">Played between %1$s and %2$s</string>
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">
<Button
- android:id="@+id/lastYearButton"
+ android:id="@+id/past_year_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:text="@string/statistics_filter_last_year"
+ android:text="@string/statistics_filter_past_year"
android:layout_weight="1"
android:layout_marginEnd="4dp"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" />