Converts millis to mm:ss using DateTime from org.joda.time

mfissehaye · Mar 23, 2018 · 04a9316 · 04a9316
1 parent 58a97fd
commit 04a9316
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 31 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/utilities/DateTimeUtils.java b/collect_app/src/main/java/org/odk/collect/android/utilities/DateTimeUtils.java
@@ -125,29 +125,4 @@ public static DatePickerDetails getDatePickerDetails(String appearance) {
 
         return new DatePickerDetails(datePickerType, datePickerMode);
     }
-
-    /**
-     * Converts milliseconds time to Hours:Minutes:Seconds format
-     */
-    public static String millisToTimer(long milliseconds) {
-        StringBuilder sb = new StringBuilder();
-
-        // Convert total duration into time
-        int hours = (int) (milliseconds / (1000 * 60 * 60));
-        int minutes = (int) (milliseconds % (1000 * 60 * 60)) / (1000 * 60);
-        int seconds = (int) ((milliseconds % (1000 * 60 * 60)) % (1000 * 60) / 1000);
-
-        // Add hours if there
-        if (hours > 0) {
-            sb.append(hours).append(':');
-        }
-
-        // Add minutes
-        sb.append(minutes < 10 ? '0' : "").append(minutes).append(':');
-
-        // Add seconds
-        sb.append(seconds < 10 ? '0' : "").append(seconds);
-
-        return sb.toString();
-    }
 }
diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/AudioController.java b/collect_app/src/main/java/org/odk/collect/android/widgets/AudioController.java
@@ -27,10 +27,11 @@
 import android.widget.TextView;
 
 import org.javarosa.form.api.FormEntryPrompt;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 import org.odk.collect.android.R;
 import org.odk.collect.android.activities.FormEntryActivity;
 import org.odk.collect.android.application.Collect;
-import org.odk.collect.android.utilities.DateTimeUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -80,6 +81,15 @@ public void run() {
         }
     };
 
+    /**
+     * Converts {@param millis} to mm:ss format
+     *
+     * @return formatted time as string
+     */
+    private static String getTime(long millis) {
+        return new DateTime(millis, DateTimeZone.UTC).toString("mm:ss");
+    }
+
     void init(Context context, MediaPlayer mediaPlayer, FormEntryPrompt formEntryPrompt) {
         this.context = context;
         this.mediaPlayer = mediaPlayer;
@@ -118,11 +128,8 @@ void playClicked() {
     }
 
     private void updateTimer() {
-        String totalDuration = DateTimeUtils.millisToTimer(mediaPlayer.getDuration());
-        String currentDuration = DateTimeUtils.millisToTimer(mediaPlayer.getCurrentPosition());
-
-        totalDurationLabel.setText(totalDuration);
-        currentDurationLabel.setText(currentDuration);
+        totalDurationLabel.setText(getTime(mediaPlayer.getDuration()));
+        currentDurationLabel.setText(getTime(mediaPlayer.getCurrentPosition()));
 
         seekBar.setMax(mediaPlayer.getDuration());
         seekBar.setProgress(mediaPlayer.getCurrentPosition());