Show recording duration and waveform #4241

seadowg · 2020-11-24T14:01:24Z

Closes #4152
Closes #4153
~~Blocked by #4222~~

What has been done to verify that this works as intended?

New tests and verified manually.

Why is this the best possible solution? Were any other approaches considered?

Comments inline.

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

I think we want to skip QA on this as it really only touches the new features.

Before submitting this PR, please make sure you have:

run ./gradlew checkAll and confirmed all checks still pass OR confirm CircleCI build passes and run ./gradlew connectedDebugAndroidTest locally.
verified that any code or assets from external sources are properly credited in comments and/or in the about file.
verified that any new UI elements use theme colors. UI Components Style guidelines

seadowg · 2020-12-01T12:46:03Z

.circleci/config.yml

@@ -57,6 +57,9 @@ jobs:
      - run:
          name: Run async unit tests
          command: ./gradlew -PdisablePreDex --no-daemon --max-workers=2 async:testDebug
+      - run:


Now that we have a test file in strings we should really be running it on CI.

seadowg · 2020-12-01T12:46:59Z

async/src/main/java/org/odk/collect/async/CoroutineScheduler.kt

+import java.util.function.Supplier
+import kotlin.coroutines.CoroutineContext
+
+open class CoroutineScheduler(private val foregroundContext: CoroutineContext, private val backgroundContext: CoroutineContext) : Scheduler {


We won't always need deferred tasks so thought I'd split the implementations. I think long term it might make sense to split the interfaces but lets see how it evolves.

seadowg · 2020-12-01T12:50:02Z

audiorecorder/src/main/java/org/odk/collect/audiorecorder/recording/AudioRecorderViewModel.kt

@@ -7,12 +7,12 @@ import java.io.File

 /**
 * Interface for a ViewModel that records audio. Can only record once session


I think we're now in a better place with this abstraction. Adding time/amplitude helped it make more sense as it forced the key data exposed to be the current "session" details.

seadowg · 2020-12-01T12:52:14Z

collect_app/build.gradle

@@ -320,6 +320,8 @@ dependencies {
    // Better "Subjects" for Rx:
    implementation "com.jakewharton.rxrelay2:rxrelay:2.1.1"

+    implementation 'com.github.Armen101:AudioRecordView:1.0.2'


This was the simplest waveform library I could find that still looked supported. I think we may want to improve this in the future or add our own flair.

I see a size increase of .2mb from 1.28.4 to this branch. Not sure how much is from this lib but either way it seems ok.

seadowg · 2020-12-01T12:53:09Z

collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/IntentGroupTest.java

@@ -128,7 +128,7 @@ public void externalApp_ShouldPopulateFields() throws IOException {
        resultIntent.setClipData(clipData);
        resultIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
        intending(not(isInternal())).respondWith(new Instrumentation.ActivityResult(Activity.RESULT_OK, resultIntent));
-        onView(withText("This is buttonText")).perform(click());
+        onView(withText("This is buttonText")).perform(nestedScrollTo(), click());


These tests were failing due to the audio widget getting slightly taller and it forcing other items in the test to be scrolled off screen.

strings/src/main/java/org/odk/collect/strings/format/LengthFormatter.kt

seadowg · 2020-12-01T12:56:24Z

testshared/src/main/java/org/odk/collect/testshared/FakeScheduler.kt

@@ -3,58 +3,72 @@ package org.odk.collect.testshared
 import org.odk.collect.async.Cancellable
 import org.odk.collect.async.Scheduler
 import org.odk.collect.async.TaskSpec
+import java.util.LinkedList
 import java.util.function.Consumer
 import java.util.function.Supplier

 class FakeScheduler : Scheduler {


For some of the tests this needed to be a bit more advanced so it now actually keeps scheduled tasks in queues/lists so it runs them in the correct order and can run repeated tasks.

lognaturel

Looks good to me!

There's a rotation issue that's deeper than I thought -- after rotating during recording, it's not possible to see the amplitude before exiting the form. Even starting a new recording doesn't reset things. I think that should be addressed before merge.

Regarding QA, I think we should do a pass over the amplitude/time functionality before freeze next Weds even if small visual tweaks will be done after that. There might be other weird state things I didn't notice and it'd be better to get those addressed before regression testing begins. Are you thinking you'd like to do that after your design pairing on Friday?

lognaturel · 2020-12-01T23:31:25Z

collect_app/build.gradle

@@ -320,6 +320,8 @@ dependencies {
    // Better "Subjects" for Rx:
    implementation "com.jakewharton.rxrelay2:rxrelay:2.1.1"

+    implementation 'com.github.Armen101:AudioRecordView:1.0.2'


I see a size increase of .2mb from 1.28.4 to this branch. Not sure how much is from this lib but either way it seems ok.

strings/src/main/java/org/odk/collect/strings/format/LengthFormatter.kt

seadowg · 2020-12-02T10:23:53Z

@lognaturel fixed! It looks like it's a bug/quirk in the library.

I see a size increase of .2mb from 1.28.4 to this branch. Not sure how much is from this lib but either way it seems ok.

Yeah would be really nice if we could replace with something simple we write ourselves.

lognaturel · 2020-12-02T17:41:58Z

@getodk/testers Heads up that we'll get these recording visualization features to you after a few more visual tweaks!

seadowg added the blocked label Nov 24, 2020

seadowg changed the title ~~Show recording duration~~ Show recording duration and waveform Nov 25, 2020

seadowg added 14 commits December 1, 2020 10:22

Show recording duration in notification

dd12480

Move notification code out of service

4334767

Hook up duration but no updates yet

0f530ac

Update duration every second

abdd668

Move all foreground service logic into notification class

be82041

Visual tweaks based on mockups

198c071

Move LengthFormatter to strings module

81d75eb

Add strings to Circle config

8cbc842

Simplify audio recorder interface

248a12f

Fix test missing scrolling

788a0b8

Make sure notification doesn't show after recoring stops

ef1f27d

Generalize in progress recording API for widget

c70687c

Add waveform to AudioWidget

d1506a4

Wrap AudioRecordView to make it testable and protect AudioWidget from it

007b6e1

seadowg force-pushed the timecode branch from cf2f892 to 007b6e1 Compare December 1, 2020 10:25

seadowg removed the blocked label Dec 1, 2020

seadowg commented Dec 1, 2020

View reviewed changes

Remove unused dependency

71fc627

seadowg commented Dec 1, 2020

View reviewed changes

strings/src/main/java/org/odk/collect/strings/format/LengthFormatter.kt Show resolved Hide resolved

seadowg commented Dec 1, 2020

View reviewed changes

seadowg marked this pull request as ready for review December 1, 2020 12:56

Tweak waveform

74dca6c

lognaturel requested changes Dec 1, 2020

View reviewed changes

seadowg requested a review from lognaturel December 2, 2020 10:24

Fix rotation for waveform

90a78f5

seadowg force-pushed the timecode branch from b515435 to 90a78f5 Compare December 2, 2020 10:39

seadowg mentioned this pull request Dec 2, 2020

Add pause/unpause to recording #4256

Merged

3 tasks

lognaturel approved these changes Dec 2, 2020

View reviewed changes

lognaturel merged commit fa36423 into getodk:master Dec 2, 2020

seadowg deleted the timecode branch December 2, 2020 17:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Show recording duration and waveform #4241

Show recording duration and waveform #4241

seadowg commented Nov 24, 2020 •

edited

seadowg Dec 1, 2020

seadowg Dec 1, 2020

seadowg Dec 1, 2020

seadowg Dec 1, 2020

lognaturel Dec 1, 2020

seadowg Dec 1, 2020

seadowg Dec 1, 2020

lognaturel left a comment

lognaturel Dec 1, 2020

seadowg commented Dec 2, 2020

lognaturel commented Dec 2, 2020 •

edited

		@@ -7,12 +7,12 @@ import java.io.File

		/**
		* Interface for a ViewModel that records audio. Can only record once session

Show recording duration and waveform #4241

Show recording duration and waveform #4241

Conversation

seadowg commented Nov 24, 2020 • edited

What has been done to verify that this works as intended?

Why is this the best possible solution? Were any other approaches considered?

How does this change affect users? Describe intentional changes to behavior and behavior that could have accidentally been affected by code changes. In other words, what are the regression risks?

Before submitting this PR, please make sure you have:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lognaturel left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

seadowg commented Dec 2, 2020

lognaturel commented Dec 2, 2020 • edited

seadowg commented Nov 24, 2020 •

edited

lognaturel commented Dec 2, 2020 •

edited