Moves media player related functionalities to Media Widget class #2817
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package org.odk.collect.android.widgets; | ||
|
|
||
| import android.content.Context; | ||
| import android.graphics.Color; | ||
| import android.media.MediaPlayer; | ||
| import android.support.annotation.CallSuper; | ||
|
|
||
| import org.javarosa.form.api.FormEntryPrompt; | ||
|
|
||
| import timber.log.Timber; | ||
|
|
||
| public abstract class MediaWidget extends QuestionWidget { | ||
|
|
||
| private int playColor; | ||
|
|
||
| public MediaWidget(Context context, FormEntryPrompt prompt) { | ||
| super(context, prompt); | ||
|
|
||
| String imageURI = this instanceof SelectImageMapWidget ? null : prompt.getImageText(); | ||
| String audioURI = prompt.getAudioText(); | ||
| String videoURI = prompt.getSpecialFormQuestionText("video"); | ||
|
|
||
| // shown when image is clicked | ||
| String bigImageURI = prompt.getSpecialFormQuestionText("big-image"); | ||
|
|
||
| getQuestionMediaLayout().setAVT(audioURI, imageURI, videoURI, bigImageURI, player); | ||
| getQuestionMediaLayout().setAudioListener(this); | ||
|
|
||
| initPlayColor(); | ||
| } | ||
|
|
||
| private void initPlayColor() { | ||
| playColor = themeUtils.getAccentColor(); | ||
|
|
||
| String playColorString = getFormEntryPrompt().getFormElement().getAdditionalAttribute(null, "playColor"); | ||
| if (playColorString != null) { | ||
| try { | ||
| playColor = Color.parseColor(playColorString); | ||
| } catch (IllegalArgumentException e) { | ||
| Timber.e(e, "Argument %s is incorrect", playColorString); | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. I see you didn’t create, but just moved this code, so disregard the above if you like. |
||
| } | ||
| } | ||
|
|
||
| getQuestionMediaLayout().setPlayTextColor(playColor); | ||
| } | ||
|
|
||
| @Override | ||
| public void release() { | ||
| super.release(); | ||
|
|
||
| if (player != null) { | ||
| player.release(); | ||
| player = null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void onWindowVisibilityChanged(int visibility) { | ||
| if (visibility == INVISIBLE || visibility == GONE) { | ||
| stopAudio(); | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * Prompts with items must override this | ||
| */ | ||
| @CallSuper | ||
| public void playAllPromptText(String playOption) { | ||
| if (playOption.equalsIgnoreCase("audio")) { | ||
| getQuestionMediaLayout().playAudio(); | ||
| } else if (playOption.equalsIgnoreCase("video")) { | ||
| getQuestionMediaLayout().playVideo(); | ||
| } | ||
| } | ||
|
|
||
| public void stopAudio() { | ||
| if (player != null && player.isPlaying()) { | ||
| player.stop(); | ||
| player.reset(); | ||
| } | ||
| } | ||
|
|
||
| public MediaPlayer getPlayer() { | ||
| return player; | ||
| } | ||
|
|
||
| public int getPlayColor() { | ||
| return playColor; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure, but I think we’re using the convention that initialisms (like URI) are capitalized like uri or imageUri. I have an audio clip of Josh Bloch himself recommending this.