Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1e75b68
Added GUTENBERG_SINGLE_AUDIO_FILE_PICKER to the MediaBrowserType
jd-alexander Dec 16, 2020
08bd4aa
Added support for selecting Audio from Media Library or Local Device.
jd-alexander Dec 16, 2020
9c89fa3
wired media pickers to the click actions of the Audio block.
jd-alexander Dec 16, 2020
6b389c4
Updated gutenberg ref.
jd-alexander Dec 16, 2020
10992e1
Trigger Build
jd-alexander Dec 17, 2020
4163371
Changed location of prepare picture intent and fixed multiselect params
jd-alexander Jan 7, 2021
b286de9
Added prepareAudioLibraryIntent method.
jd-alexander Jan 7, 2021
b73c139
Added prepareAudioLibraryIntent and did refactoring of duplicate logic.
jd-alexander Jan 7, 2021
ff71990
added showMediaPicker for file and audio.
jd-alexander Jan 7, 2021
203de09
created a function that allows the audio file picker to be launched.
jd-alexander Jan 7, 2021
a8a1e82
added the editor_audio_file_added event to track audio files.
jd-alexander Jan 7, 2021
408cf6d
Integrated the Audio Library Request Code in the necessary activities.
jd-alexander Jan 7, 2021
e4039c0
Refactored the initOtherMediaFileOptions to support both audio and file.
jd-alexander Jan 7, 2021
f278d14
Updated the FluxC hash to include the audio mime type behavior.
jd-alexander Jan 7, 2021
c724657
Removed audio from the file resource variable.
jd-alexander Jan 7, 2021
bff3d36
removed unused imports.
jd-alexander Jan 7, 2021
7149d57
Merge branch 'develop' into gutenberg/audio_block_consolidated_media_…
jd-alexander Jan 7, 2021
903229e
Updated ref.
jd-alexander Jan 7, 2021
554bb06
sync stories submodule with develop.
jd-alexander Jan 7, 2021
5f70822
Update gb ref.
jd-alexander Jan 7, 2021
ed598e6
updated FluxC hash.
jd-alexander Jan 7, 2021
55f8c92
Fixed issue where the file library intent was prepared instead of audio
jd-alexander Jan 7, 2021
55b5345
added the Audio Picking BrowserType to the MediaBrowser's Filter.
jd-alexander Jan 8, 2021
a881acf
Added use audio to the action mode title logic
jd-alexander Jan 8, 2021
3ca76e1
Refactored the name of the MediaPicker function to FilePicker.
jd-alexander Jan 8, 2021
66199d8
Removed unneeded trailing comma and R. import.
jd-alexander Jan 8, 2021
a286d91
removed the additional audioFileLibrary method and reused the file one.
jd-alexander Jan 8, 2021
fbc51cf
Added a string value for choosing audio files and refactored launchFile
jd-alexander Jan 8, 2021
b87c11e
Added a method for GUTENBERG_SINGLE_AUDIO_FILE_PICKER to filter the grid
jd-alexander Jan 8, 2021
97abd5a
refactored the launchFileLibrary to work for audio and file intents.
jd-alexander Jan 8, 2021
8262169
Added the audio picker to the single selection.
jd-alexander Jan 13, 2021
aedea20
Added AUDIO to the ChooserContext
jd-alexander Jan 13, 2021
beb48b7
Added AUDIO to the populateIconClickEvent
jd-alexander Jan 13, 2021
7815032
Added test for Audio System Picker
jd-alexander Jan 13, 2021
1e5aa6d
removed multiSelect intent param and utilized true.
jd-alexander Jan 14, 2021
3309187
Put the .SingleAudioFilePicker call in the appropriate group.
jd-alexander Jan 14, 2021
adbb939
Merge branch 'develop' into gutenberg/audio_block_consolidated_media_…
jd-alexander Jan 14, 2021
9f745ae
Updated fluxC hash.
jd-alexander Jan 14, 2021
a75a1b3
Updated gb ref.
jd-alexander Jan 14, 2021
21e7726
Merge branch 'develop' into gutenberg/audio_block_consolidated_media_…
jd-alexander Jan 15, 2021
8025aaf
Merge branch 'develop' into gutenberg/audio_block_consolidated_media_…
jd-alexander Jan 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added the audio picker to the single selection.
  • Loading branch information
jd-alexander committed Jan 13, 2021
commit 8262169612257efbcdb8bccae145b470f16c4ca4
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,8 @@ public void onMediaItemSelected(int localMediaId, boolean isLongClick) {
|| mBrowserType.isPicker() && isLongClick) {
showMediaSettings(media);
} else if ((mBrowserType.isSingleImagePicker() || mBrowserType.isSingleMediaPicker() || mBrowserType
.isSingleFilePicker()) && !isLongClick) {
.isSingleFilePicker()) || mBrowserType
.isSingleAudioFilePicker() && !isLongClick) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect the parenthesis here are not what we want? I would put them to group all the || before the && !isLongClick . wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds about right. Thanks 3309187

// if we're picking a single image, we're done
Intent intent = new Intent();
ArrayList<Long> remoteMediaIds = new ArrayList<>();
Expand Down