Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Print duration as number of days only on Echo (#6842) 

Reverts an accidental change to the queue time display
This commit is contained in:
ByteHamster 2024-01-03 20:32:56 +01:00 committed by GitHub
parent f476086114
commit bf67218422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
View File

@ -523,7 +523,7 @@ public class QueueFragment extends Fragment implements MaterialToolbar.OnMenuIte
} }
info += " • "; info += " • ";
info += getString(R.string.time_left_label); info += getString(R.string.time_left_label);
info += Converter.getDurationStringLocalized(getActivity(), timeLeft); info += Converter.getDurationStringLocalized(getResources(), timeLeft, false);
} }
infoBar.setText(info); infoBar.setText(info);
} }

8
core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
View File

@ -83,14 +83,16 @@ public final class Converter {
* Converts milliseconds to a localized string containing hours and minutes. * Converts milliseconds to a localized string containing hours and minutes.
*/ */
public static String getDurationStringLocalized(Context context, long duration) { public static String getDurationStringLocalized(Context context, long duration) {
return getDurationStringLocalized(context.getResources(), duration); return getDurationStringLocalized(context.getResources(), duration, false);
} }
public static String getDurationStringLocalized(Resources resources, long duration) { public static String getDurationStringLocalized(Resources resources, long duration, boolean includeDays) {
String result = ""; String result = "";
int h = (int) (duration / HOURS_MIL); int h = (int) (duration / HOURS_MIL);
int d = h / 24; int d = h / 24;
if (d > 0) { if (!includeDays) {
d = 0;
} else if (d > 0) {
String days = resources.getQuantityString(R.plurals.time_days_quantified, d, d); String days = resources.getQuantityString(R.plurals.time_days_quantified, d, d);
result += days.replace(" ", "\u00A0") + " "; result += days.replace(" ", "\u00A0") + " ";
h -= d * 24; h -= d * 24;

4
ui/echo/src/main/java/de/danoeh/antennapod/ui/echo/EchoActivity.java
View File

@ -210,7 +210,7 @@ public class EchoActivity extends AppCompatActivity {
int daysUntil2024 = Math.max(356 - Calendar.getInstance().get(Calendar.DAY_OF_YEAR) + 1, 1); int daysUntil2024 = Math.max(356 - Calendar.getInstance().get(Calendar.DAY_OF_YEAR) + 1, 1);
long secondsPerDay = queueSecondsLeft / daysUntil2024; long secondsPerDay = queueSecondsLeft / daysUntil2024;
String timePerDay = Converter.getDurationStringLocalized( String timePerDay = Converter.getDurationStringLocalized(
getLocalizedResources(this, getEchoLanguage()), secondsPerDay * 1000); getLocalizedResources(this, getEchoLanguage()), secondsPerDay * 1000, true);
double hoursPerDay = (double) (secondsPerDay / 3600); double hoursPerDay = (double) (secondsPerDay / 3600);
if (hoursPerDay < 1.5) { if (hoursPerDay < 1.5) {
viewBinding.aboveLabel.setText(R.string.echo_queue_title_clean); viewBinding.aboveLabel.setText(R.string.echo_queue_title_clean);
@ -235,7 +235,7 @@ public class EchoActivity extends AppCompatActivity {
} }
viewBinding.smallLabel.setText(getString(R.string.echo_listened_after_time, viewBinding.smallLabel.setText(getString(R.string.echo_listened_after_time,
Converter.getDurationStringLocalized( Converter.getDurationStringLocalized(
getLocalizedResources(this, getEchoLanguage()), timeBetweenReleaseAndPlay))); getLocalizedResources(this, getEchoLanguage()), timeBetweenReleaseAndPlay, true)));
currentDrawable = new RotatingSquaresScreen(this); currentDrawable = new RotatingSquaresScreen(this);
break; break;
case 4: case 4: