diff options
| author | ByteHamster <info@bytehamster.com> | 2022-06-30 11:11:35 +0200 |
|---|---|---|
| committer | ByteHamster <info@bytehamster.com> | 2022-06-30 11:11:35 +0200 |
| commit | 1054e13221003e031fcbf05fcd2373986196b97f (patch) | |
| tree | 3c5542c987fa3f43d442562628d38281d6514b03 /ui/statistics | |
| parent | 814d81aeed7a81fc5ed76565be66b076fda23aa9 (diff) | |
| parent | 50eee88484a94eabdd1978961b5c604ea3b818d8 (diff) | |
| download | AntennaPod-1054e13221003e031fcbf05fcd2373986196b97f.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ui/statistics')
3 files changed, 13 insertions, 6 deletions
diff --git a/ui/statistics/build.gradle b/ui/statistics/build.gradle index 72b4b807b..905db0b5e 100644 --- a/ui/statistics/build.gradle +++ b/ui/statistics/build.gradle @@ -31,4 +31,6 @@ dependencies { annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion" implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" + implementation "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion" + implementation "com.joanzapata.iconify:android-iconify-material:$iconifyVersion" } 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); }); 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> |