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

Info text has smaller font, conversion moved utility class

This commit is contained in:
Martin Fietz 2015-07-19 10:35:28 +02:00
parent 35dcabd103
commit 76393e1e7c
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@ import de.danoeh.antennapod.core.storage.DBTasks;
import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.storage.DBWriter;
import de.danoeh.antennapod.core.storage.DownloadRequestException; import de.danoeh.antennapod.core.storage.DownloadRequestException;
import de.danoeh.antennapod.core.storage.DownloadRequester; import de.danoeh.antennapod.core.storage.DownloadRequester;
import de.danoeh.antennapod.core.util.Converter;
import de.danoeh.antennapod.core.util.LongList; import de.danoeh.antennapod.core.util.LongList;
import de.danoeh.antennapod.core.util.QueueSorter; import de.danoeh.antennapod.core.util.QueueSorter;
import de.danoeh.antennapod.core.util.gui.FeedItemUndoToken; import de.danoeh.antennapod.core.util.gui.FeedItemUndoToken;
@ -475,19 +476,14 @@ public class QueueFragment extends Fragment {
// refresh information bar // refresh information bar
String info = queue.size() + getString(R.string.episodes_suffix); String info = queue.size() + getString(R.string.episodes_suffix);
if(queue.size() > 0) { if(queue.size() > 0) {
int durationSec = 0; int duration = 0;
for(FeedItem item : queue) { for(FeedItem item : queue) {
if(item.getMedia() != null) { if(item.getMedia() != null) {
durationSec += item.getMedia().getDuration() / 1000; duration += item.getMedia().getDuration();
} }
} }
int hours = durationSec / 3600;
int minutes = (durationSec % 3600) / 60;
info += " \u2022 "; info += " \u2022 ";
if (hours > 0) { info += Converter.getDurationStringLocalized(getActivity(), duration);
info += hours + " " + getString(R.string.time_unit_hours) + " ";
}
info += minutes + " " + getString(R.string.time_unit_minutes);
} }
infoBar.setText(info); infoBar.setText(info);
} }

1
app/src/main/res/layout/queue_fragment.xml
View File

@ -11,6 +11,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:gravity="center" android:gravity="center"
android:textSize="12sp"
android:text="42 episodes \u2022 5 hours 17 minutes"/> android:text="42 episodes \u2022 5 hours 17 minutes"/>
<View <View

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

@ -1,7 +1,10 @@
package de.danoeh.antennapod.core.util; package de.danoeh.antennapod.core.util;
import android.content.Context;
import android.util.Log; import android.util.Log;
import de.danoeh.antennapod.core.R;
/** Provides methods for converting various units. */ /** Provides methods for converting various units. */
public final class Converter { public final class Converter {
/** Class shall not be instantiated. */ /** Class shall not be instantiated. */
@ -100,4 +103,20 @@ public final class Converter {
Integer.valueOf(parts[1]) * 1000 * 60; Integer.valueOf(parts[1]) * 1000 * 60;
} }
/** Converts milliseconds to a localized string containing hours and minutes */
public static String getDurationStringLocalized(Context context, int duration) {
int h = duration / HOURS_MIL;
int rest = duration - h * HOURS_MIL;
int m = rest / MINUTES_MIL;
String result = "";
if(h > 0) {
String hours = context.getString(R.string.time_unit_hours);
result += h + " " + hours + " ";
}
String minutes = context.getString(R.string.time_unit_minutes);
result += m + " " + minutes;
return result;
}
} }