WIP

getodk · Aug 8, 2019 · 3583b42 · 3583b42
1 parent 3527779
commit 3583b42
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 8 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/audio/AudioPlayerViewModel.java b/collect_app/src/main/java/org/odk/collect/android/audio/AudioPlayerViewModel.java
@@ -9,6 +9,8 @@
 import androidx.lifecycle.ViewModel;
 
 import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import static org.odk.collect.android.audio.AudioPlayerViewModel.ClipState.NOT_PLAYING;
 import static org.odk.collect.android.audio.AudioPlayerViewModel.ClipState.PAUSED;
@@ -80,6 +82,20 @@ public LiveData<ClipState> isPlaying(@NonNull String clipID) {
         });
     }
 
+    public LiveData<Integer> getDuration() {
+        MutableLiveData<Integer> liveData = new MutableLiveData<>();
+
+        new Timer().scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                int duration = getMediaPlayer().getDuration();
+                liveData.setValue(duration / 1000);
+            }
+        }, 0, 500);
+
+        return liveData;
+    }
+
     public void background() {
         release();
         currentlyPlaying.setValue(null);

diff --git a/collect_app/src/main/java/org/odk/collect/android/audio/Scheduler.java b/collect_app/src/main/java/org/odk/collect/android/audio/Scheduler.java
@@ -0,0 +1,7 @@
+package org.odk.collect.android.audio;
+
+import java.util.TimerTask;
+
+public interface Scheduler {
+    void schedule(TimerTask task, long period);
+}
diff --git a/collect_app/src/test/java/org/odk/collect/android/audio/AudioPlayerViewModelTest.java b/collect_app/src/test/java/org/odk/collect/android/audio/AudioPlayerViewModelTest.java
@@ -11,6 +11,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
+import org.odk.collect.android.audio.AudioPlayerViewModel.ClipState;
 import org.odk.collect.android.support.LiveDataTester;
 import org.robolectric.RobolectricTestRunner;
 
@@ -22,6 +23,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.odk.collect.android.audio.AudioPlayerViewModel.ClipState.NOT_PLAYING;
 import static org.odk.collect.android.audio.AudioPlayerViewModel.ClipState.PAUSED;
 import static org.odk.collect.android.audio.AudioPlayerViewModel.ClipState.PLAYING;
@@ -67,30 +69,30 @@ public void play_whenAlreadyingPlayingClip_startsMediaPlayer() {
 
     @Test
     public void isPlaying_whenNothingPlaying_is_NOT_PLAYING() {
-        LiveData<AudioPlayerViewModel.ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
+        LiveData<ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
 
         assertThat(isPlaying.getValue(), equalTo(NOT_PLAYING));
     }
 
     @Test
     public void isPlaying_whenClipIDPlaying_is_PLAYING() {
-        LiveData<AudioPlayerViewModel.ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
+        LiveData<ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
 
         viewModel.play("clip1", "file://audio.mp3");
         assertThat(isPlaying.getValue(), equalTo(PLAYING));
     }
 
     @Test
     public void isPlaying_whenDifferentClipIDPlaying_is_NOT_PLAYING() {
-        LiveData<AudioPlayerViewModel.ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip2"));
+        LiveData<ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip2"));
 
         viewModel.play("clip1", "file://other.mp3");
         assertThat(isPlaying.getValue(), equalTo(NOT_PLAYING));
     }
 
     @Test
     public void isPlaying_whenClipIDPlaying_thenCompleted_is_NOT_PLAYING() {
-        final LiveData<AudioPlayerViewModel.ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
+        final LiveData<ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
 
         viewModel.play("clip1", "file://audio.mp3");
 
@@ -109,7 +111,7 @@ public void stop_stopsMediaPlayer() {
 
     @Test
     public void isPlaying_whenClipIDPlaying_thenStopped_is_NOT_PLAYING() {
-        LiveData<AudioPlayerViewModel.ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
+        LiveData<ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
 
         viewModel.play("clip1", "file://audio.mp3");
         viewModel.stop();
@@ -125,7 +127,7 @@ public void background_releasesMediaPlayer() {
 
     @Test
     public void isPlaying_whenPlayingAndThenBackgrounding_is_NOT_PLAYING() {
-        LiveData<AudioPlayerViewModel.ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
+        LiveData<ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
 
         viewModel.play("clip1", "file://audio.mp3");
         viewModel.background();
@@ -156,7 +158,7 @@ public void pause_pausesMediaPlayer() {
 
     @Test
     public void isPlaying_afterPause_is_PAUSED() {
-        LiveData<AudioPlayerViewModel.ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
+        LiveData<ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
 
         viewModel.play("clip1", "file://audio.mp3");
         viewModel.pause();
@@ -166,7 +168,7 @@ public void isPlaying_afterPause_is_PAUSED() {
 
     @Test
     public void isPlaying_afterPause_andThenPlay_is_PLAYING() {
-        final LiveData<AudioPlayerViewModel.ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
+        final LiveData<ClipState> isPlaying = liveDataTester.activate(viewModel.isPlaying("clip1"));
 
         viewModel.play("clip1", "file://audio.mp3");
         viewModel.pause();
@@ -175,6 +177,18 @@ public void isPlaying_afterPause_andThenPlay_is_PLAYING() {
         assertThat(isPlaying.getValue(), equalTo(PLAYING));
     }
 
+    @Test
+    public void getDuration_returnsMediaPlayerDurationInSeconds() {
+        when(mediaPlayer.getDuration()).thenReturn(0);
+        LiveData<Integer> duration = liveDataTester.activate(viewModel.getDuration());
+
+        when(mediaPlayer.getDuration()).thenReturn(1000);
+        assertThat(duration.getValue(), equalTo(1));
+
+        when(mediaPlayer.getDuration()).thenReturn(24135);
+        assertThat(duration.getValue(), equalTo(24));
+    }
+
     @Test
     public void onCleared_releasesMediaPlayer() {
         viewModel.onCleared();