From 28f2706f328ac0555ef470426f930a44d1c90ce3 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 15 May 2022 09:18:12 +0200
Subject: Show spinner while loading statistics

---
 ui/statistics/src/main/res/layout/feed_statistics.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'ui/statistics/src')

diff --git a/ui/statistics/src/main/res/layout/feed_statistics.xml b/ui/statistics/src/main/res/layout/feed_statistics.xml
index 7897a7d5f..6b9a7fa4c 100644
--- a/ui/statistics/src/main/res/layout/feed_statistics.xml
+++ b/ui/statistics/src/main/res/layout/feed_statistics.xml
@@ -13,12 +13,13 @@
             android:layout_height="wrap_content"
             android:text="@string/statistics_episodes_started_total" />
 
-        <TextView
+        <com.joanzapata.iconify.widget.IconTextView
             android:id="@+id/startedTotalLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
+            android:text="@string/wait_icon"
             tools:text="0 / 0" />
 
     </TableRow>
@@ -30,12 +31,13 @@
             android:layout_height="wrap_content"
             android:text="@string/statistics_time_played" />
 
-        <TextView
+        <com.joanzapata.iconify.widget.IconTextView
             android:id="@+id/timePlayedLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
+            android:text="@string/wait_icon"
             tools:text="0 min" />
 
     </TableRow>
@@ -48,12 +50,13 @@
             android:layout_height="wrap_content"
             android:text="@string/statistics_total_duration" />
 
-        <TextView
+        <com.joanzapata.iconify.widget.IconTextView
             android:id="@+id/totalDurationLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
+            android:text="@string/wait_icon"
             tools:text="0 min" />
 
     </TableRow>
@@ -65,12 +68,13 @@
             android:layout_height="wrap_content"
             android:text="@string/statistics_episodes_on_device" />
 
-        <TextView
+        <com.joanzapata.iconify.widget.IconTextView
             android:id="@+id/onDeviceLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
+            android:text="@string/wait_icon"
             tools:text="0" />
 
     </TableRow>
@@ -82,12 +86,13 @@
             android:layout_height="wrap_content"
             android:text="@string/statistics_space_used" />
 
-        <TextView
+        <com.joanzapata.iconify.widget.IconTextView
             android:id="@+id/spaceUsedLabel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
+            android:text="@string/wait_icon"
             tools:text="0 MB" />
 
     </TableRow>
-- 
cgit v1.2.3


From 93f88650ad044b3bdc0f84a7444bd18262b4cf5c Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 15 May 2022 20:48:17 +0200
Subject: Actually filter by last year (eg Jan-Dec)

---
 .../antennapod/ui/statistics/subscriptions/StatisticsFilterDialog.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/statistics/src')

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 93f8e7715..567edd2bf 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
@@ -80,7 +80,7 @@ public class StatisticsFilterDialog {
             dialogBinding.timeToSpinner.setSelection(filterDatesTo.first.length - 1);
         });
         dialogBinding.pastYearButton.setOnClickListener(v -> {
-            dialogBinding.timeFromSpinner.setSelection(Math.max(0, filterDatesFrom.first.length - 13));
+            dialogBinding.timeFromSpinner.setSelection(Math.max(0, filterDatesFrom.first.length - 12));
             dialogBinding.timeToSpinner.setSelection(filterDatesTo.first.length - 2);
         });
 
-- 
cgit v1.2.3