Eleven: Change time to not use days or seconds

https://cyanogen.atlassian.net/browse/MUSIC-121

Change-Id: Ie329267aefb04c79aa1f4a73bcb12cf9f72bc269

2 files changed, 7 insertions, 24 deletions

diff --git a/src/com/cyngn/eleven/ui/fragments/AlbumDetailFragment.java b/src/com/cyngn/eleven/ui/fragments/AlbumDetailFragment.java
index 6acea14..f19a13a 100644
--- a/src/com/cyngn/eleven/ui/fragments/AlbumDetailFragment.java
+++ b/src/com/cyngn/eleven/ui/fragments/AlbumDetailFragment.java
@@ -165,7 +165,7 @@ public class AlbumDetailFragment extends DetailFragment {
         /** compute total run time for album */
         int duration = 0;
         for(Song s : songs) { duration += s.mDuration; }
-        updateDuration(duration);
+        mAlbumDuration.setText(MusicUtils.makeLongTimeString(getActivity(), duration));
 
         /** use the first song on the album to get a genre */
         if(!songs.isEmpty()) {
@@ -173,18 +173,6 @@ public class AlbumDetailFragment extends DetailFragment {
         }
     }
 
-    public void updateDuration(int duration) {
-        int mins = Math.round(duration/60);
-        int hours = mins/60;
-        mins %= 60;
-
-        String durationText = (hours == 0)
-            ? getString(R.string.duration_album_mins_only, mins)
-            : getString(R.string.duration_album_hour_mins, hours, mins);
-
-        mAlbumDuration.setText(durationText);
-    }
-
     @Override
     public void restartLoader() {
         getLoaderManager().restartLoader(LOADER_ID, getArguments(), mSongAdapter);
@@ -196,4 +184,4 @@ public class AlbumDetailFragment extends DetailFragment {
 
         mSongAdapter.setCurrentlyPlayingTrack(MusicUtils.getCurrentTrack());
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/cyngn/eleven/utils/MusicUtils.java b/src/com/cyngn/eleven/utils/MusicUtils.java
index 5843c25..51e7ac7 100644
--- a/src/com/cyngn/eleven/utils/MusicUtils.java
+++ b/src/com/cyngn/eleven/utils/MusicUtils.java
@@ -206,31 +206,26 @@ public final class MusicUtils {
     }
 
     /**
-     * * Used to create a formatted time string in the format of #d #h #m #s
+     * Used to create a formatted time string in the format of #h #m or #m if there is only minutes
      *
      * @param context The {@link Context} to use.
      * @param secs The duration seconds.
-     * @return Duration properly formatted in #d #h #m #s format
+     * @return Duration properly formatted in #h #m format
      */
     public static final String makeLongTimeString(final Context context, long secs) {
-        long days, hours, mins;
+        long hours, mins;
 
-        days = secs / (3600 * 24);
-        secs %= (3600 * 24);
         hours = secs / 3600;
         secs %= 3600;
         mins = secs / 60;
-        secs %= 60;
 
         int stringId = R.string.duration_mins;
-        if (days != 0) {
-            stringId = R.string.duration_days;
-        } else if (hours != 0) {
+        if (hours != 0) {
             stringId = R.string.duration_hours;
         }
 
         final String durationFormat = context.getResources().getString(stringId);
-        return String.format(durationFormat, days, hours, mins, secs);
+        return String.format(durationFormat, hours, mins);
     }
 
     /**