[Gutenberg] Audio block - Consolidated & Normal Media Picker Integration

WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java

@@ -37,6 +37,7 @@ public class RequestCodes {
     public static final int VIDEO_LIBRARY = 2200;
     public static final int MEDIA_LIBRARY = 2210;
     public static final int FILE_LIBRARY = 2220;
+    public static final int AUDIO_LIBRARY = 2230;
     public static final int TAKE_VIDEO = 2300;
     public static final int CROP_PHOTO = 2400;
     public static final int PICTURE_LIBRARY_OR_CAPTURE = 2500;

WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java

@@ -213,6 +213,8 @@ public void onCreate(Bundle savedInstanceState) {
             filter = MediaFilter.FILTER_IMAGES;
         } else if (mBrowserType == MediaBrowserType.GUTENBERG_VIDEO_PICKER) {
             filter = MediaFilter.FILTER_VIDEOS;
+        } else if (mBrowserType == MediaBrowserType.GUTENBERG_SINGLE_AUDIO_FILE_PICKER) {
+            filter = MediaFilter.FILTER_AUDIO;
         } else if (savedInstanceState != null) {
             filter = (MediaFilter) savedInstanceState.getSerializable(ARG_FILTER);
         } else {
@@ -474,6 +476,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             case RequestCodes.PICTURE_LIBRARY:
             case RequestCodes.VIDEO_LIBRARY:
             case RequestCodes.FILE_LIBRARY:
+            case RequestCodes.AUDIO_LIBRARY:
                 if (resultCode == Activity.RESULT_OK && data != null) {
                     if (mConsolidatedMediaPickerFeatureConfig.isEnabled()) {
                         if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)) {

WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java

@@ -14,6 +14,7 @@ public enum MediaBrowserType {
     GUTENBERG_SINGLE_MEDIA_PICKER, // select a single image or video to insert into a post
     GUTENBERG_MEDIA_PICKER, // select multiple images or videos to insert into a post
     GUTENBERG_SINGLE_FILE_PICKER, // select a file to insert into a post
+    GUTENBERG_SINGLE_AUDIO_FILE_PICKER, // select an audio file to insert into a post
     WP_STORIES_MEDIA_PICKER; // select multiple images or videos to insert as Story frames in a Story
 
     public boolean isPicker() {
@@ -57,7 +58,7 @@ public boolean isVideoPicker() {
     }
 
     public boolean isAudioPicker() {
-        return this == GUTENBERG_SINGLE_FILE_PICKER;
+        return this == GUTENBERG_SINGLE_FILE_PICKER || this == GUTENBERG_SINGLE_AUDIO_FILE_PICKER;
     }
 
     public boolean isDocumentPicker() {
@@ -71,7 +72,8 @@ public boolean isGutenbergPicker() {
                || this == GUTENBERG_SINGLE_VIDEO_PICKER
                || this == GUTENBERG_SINGLE_MEDIA_PICKER
                || this == GUTENBERG_MEDIA_PICKER
-               || this == GUTENBERG_SINGLE_FILE_PICKER;
+               || this == GUTENBERG_SINGLE_FILE_PICKER
+               || this == GUTENBERG_SINGLE_AUDIO_FILE_PICKER;
     }
 
     public boolean isWPStoriesPicker() {
@@ -82,6 +84,10 @@ public boolean isSingleFilePicker() {
         return this == GUTENBERG_SINGLE_FILE_PICKER;
     }
 
+    public boolean isSingleAudioFilePicker() {
+        return this == GUTENBERG_SINGLE_AUDIO_FILE_PICKER;
+    }
+
     public boolean isSingleMediaPicker() {
         return this == GUTENBERG_SINGLE_MEDIA_PICKER;
     }

WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java

@@ -386,7 +386,8 @@ List<MediaModel> getFilteredMedia() {
         } else if (mBrowserType.isSingleImagePicker()) {
             mediaList = mMediaStore.getSiteImages(mSite);
         } else if (mBrowserType.canFilter() || mBrowserType.canOnlyDoInitialFilter() || mBrowserType
-                .isSingleFilePicker()) {
+                .isSingleFilePicker() || mBrowserType
+                           .isSingleAudioFilePicker()) {
             mediaList = getMediaList();
         } else {
             List<MediaModel> allMedia = mMediaStore.getAllSiteMedia(mSite);

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt

@@ -287,10 +287,13 @@ class MediaPickerViewModel @Inject constructor(
             else -> {
                 val isImagePicker = mediaPickerSetup.allowedTypes.contains(IMAGE)
                 val isVideoPicker = mediaPickerSetup.allowedTypes.contains(VIDEO)
+                val isAudioPicker = mediaPickerSetup.allowedTypes.contains(AUDIO)
                 if (isImagePicker && isVideoPicker) {
                     UiStringRes(R.string.photo_picker_use_media)
                 } else if (isVideoPicker) {
                     UiStringRes(R.string.photo_picker_use_video)
+                } else if (isAudioPicker) {
+                    UiStringRes(R.string.photo_picker_use_audio)
                 } else {
                     UiStringRes(R.string.photo_picker_use_photo)
                 }

WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerLauncher.kt

@@ -2,6 +2,7 @@ package org.wordpress.android.ui.photopicker
 
 import android.app.Activity
 import android.content.Intent
+import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import org.wordpress.android.R
 import org.wordpress.android.R.string
@@ -184,8 +185,33 @@ class MediaPickerLauncher @Inject constructor(
     }
 
     fun showFilePicker(activity: Activity, canMultiselect: Boolean = true) {
+        showFilePicker(
+                activity,
+                canMultiselect,
+                mutableSetOf(IMAGE, VIDEO, AUDIO, DOCUMENT),
+                RequestCodes.FILE_LIBRARY,
+                string.photo_picker_choose_file
+        )
+    }
+
+    fun showAudioFilePicker(activity: Activity, canMultiselect: Boolean = false) {
+        showFilePicker(
+                activity,
+                canMultiselect,
+                mutableSetOf(AUDIO),
+                RequestCodes.AUDIO_LIBRARY,
+                string.photo_picker_choose_audio
+        )
+    }
+
+    private fun showFilePicker(
+        activity: Activity,
+        canMultiselect: Boolean = false,
+        allowedTypes: Set<MediaType>,
+        requestCode: Int,
+        @StringRes title: Int
+    ) {
         if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val allowedTypes = mutableSetOf(IMAGE, VIDEO, AUDIO, DOCUMENT)
             val mediaPickerSetup = MediaPickerSetup(
                     primaryDataSource = DEVICE,
                     availableDataSources = setOf(),
@@ -197,18 +223,18 @@ class MediaPickerLauncher @Inject constructor(
                     editingEnabled = true,
                     queueResults = false,
                     defaultSearchView = false,
-                    title = R.string.photo_picker_choose_file
+                    title = title
             )
             val intent = MediaPickerActivity.buildIntent(
                     activity,
                     mediaPickerSetup
             )
             activity.startActivityForResult(
                     intent,
-                    RequestCodes.FILE_LIBRARY
+                    requestCode
             )
         } else {
-            WPMediaUtils.launchFileLibrary(activity, canMultiselect)
+            WPMediaUtils.launchFileLibrary(activity, canMultiselect, requestCode)
         }
     }
 

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -2757,6 +2757,7 @@ postId, getSite(), mediaUri,
                     }
                     break;
                 case RequestCodes.FILE_LIBRARY:
+                case RequestCodes.AUDIO_LIBRARY:
                     if (mConsolidatedMediaPickerFeatureConfig.isEnabled()) {
                         if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)) {
                             List<Uri> uriResults = convertStringArrayIntoUrisList(
@@ -2768,7 +2769,16 @@ postId, getSite(), mediaUri,
                         }
                     } else {
                         uris = WPMediaUtils.retrieveMediaUris(data);
-                        mAnalyticsTrackerWrapper.track(Stat.EDITOR_ADDED_FILE_VIA_LIBRARY);
+
+                        switch (requestCode) {
+                            case RequestCodes.FILE_LIBRARY:
+                                mAnalyticsTrackerWrapper.track(Stat.EDITOR_ADDED_FILE_VIA_LIBRARY);
+                                break;
+                            case RequestCodes.AUDIO_LIBRARY:
+                                mAnalyticsTrackerWrapper.track(Stat.EDITOR_ADDED_AUDIO_FILE_VIA_LIBRARY);
+                                break;
+                        }
+
                         for (Uri item : uris) {
                             mEditorMedia.addNewMediaToEditorAsync(item, false);
                         }
@@ -2979,6 +2989,11 @@ public void onAddLibraryMediaClicked(boolean allowMultipleSelection) {
                 .viewWPMediaLibraryPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_SINGLE_FILE_PICKER);
     }
 
+    @Override public void onAddLibraryAudioFileClicked(boolean allowMultipleSelection) {
+        mMediaPickerLauncher
+                .viewWPMediaLibraryPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_SINGLE_AUDIO_FILE_PICKER);
+    }
+
     @Override
     public void onAddPhotoClicked(boolean allowMultipleSelection) {
         if (allowMultipleSelection) {
@@ -3032,6 +3047,10 @@ public void onAddFileClicked(boolean allowMultipleSelection) {
         mMediaPickerLauncher.showFilePicker(this, allowMultipleSelection);
     }
 
+    @Override public void onAddAudioFileClicked(boolean allowMultipleSelection) {
+        mMediaPickerLauncher.showAudioFilePicker(this, allowMultipleSelection);
+    }
+
     @Override
     public void onPerformFetch(String path, Consumer<String> onResult, Consumer<Bundle> onError) {
         if (mSite != null) {

WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java

@@ -16,6 +16,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
@@ -241,9 +242,15 @@ public static void launchMediaLibrary(Activity activity, boolean multiSelect) {
                 RequestCodes.MEDIA_LIBRARY);
     }
 
-    public static void launchFileLibrary(Activity activity, boolean multiSelect) {
-        activity.startActivityForResult(prepareFileLibraryIntent(activity, multiSelect),
-                RequestCodes.FILE_LIBRARY);
+    public static void launchFileLibrary(Activity activity, boolean multiSelect, int requestCode) {
+        switch (requestCode) {
+            case RequestCodes.FILE_LIBRARY:
+                activity.startActivityForResult(prepareFileLibraryIntent(activity, multiSelect), requestCode);
+                break;
+            case RequestCodes.AUDIO_LIBRARY:
+                activity.startActivityForResult(prepareAudioLibraryIntent(activity, multiSelect), requestCode);
+                break;
+        }
     }
 
     public static void launchChooserWithContext(
@@ -256,34 +263,40 @@ public static void launchChooserWithContext(
                 requestCode);
     }
 
+    private static Intent preparePictureLibraryIntent(Context context, boolean multiSelect) {
+        return prepareIntent(context, multiSelect, Intent.ACTION_GET_CONTENT, "image/*",
+                new MimeTypes().getImageTypesOnly(), R.string.pick_photo);
+    }
+
     private static Intent prepareVideoLibraryIntent(Context context, boolean multiSelect) {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("video/*");
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, new MimeTypes().getVideoTypesOnly());
-        if (multiSelect) {
-            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
-        }
-        return Intent.createChooser(intent, context.getString(R.string.pick_video));
+        return prepareIntent(context, multiSelect, Intent.ACTION_GET_CONTENT, "video/*",
+                new MimeTypes().getVideoTypesOnly(), R.string.pick_video);
     }
 
     private static Intent prepareMediaLibraryIntent(Context context, boolean multiSelect) {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("*/*");
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, new MimeTypes().getVideoAndImageTypesOnly());
-        if (multiSelect) {
-            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
-        }
-        return Intent.createChooser(intent, context.getString(R.string.pick_media));
+        return prepareIntent(context, multiSelect, Intent.ACTION_GET_CONTENT, "*/*",
+                new MimeTypes().getVideoAndImageTypesOnly(), R.string.pick_media);
     }
 
     private static Intent prepareFileLibraryIntent(Context context, boolean multiSelect) {
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
-        intent.setType("*/*");
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, new MimeTypes().getAllTypes());
+        return prepareIntent(context, multiSelect, Intent.ACTION_OPEN_DOCUMENT, "*/*",
+                new MimeTypes().getAllTypes(), R.string.pick_file);
+    }
+
+    private static Intent prepareAudioLibraryIntent(Context context, boolean multiSelect) {
+        return prepareIntent(context, multiSelect, Intent.ACTION_GET_CONTENT, "*/*",
+                new MimeTypes().getAudioTypesOnly(), R.string.pick_audio);
+    }
+
+    private static Intent prepareIntent(Context context, boolean multiSelect, String action, String intentType,
+                                        String[] mimeTypes, @StringRes int title) {
+        Intent intent = new Intent(action);
+        intent.setType(intentType);
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
         if (multiSelect) {
-            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, multiSelect);
         }
-        return Intent.createChooser(intent, context.getString(R.string.pick_file));
+        return Intent.createChooser(intent, context.getString(title));
     }
 
     private static Intent prepareChooserIntent(
@@ -311,19 +324,10 @@ private static Intent prepareVideoCameraIntent() {
 
     public static void launchPictureLibrary(Activity activity, boolean multiSelect) {
         activity.startActivityForResult(
-                preparePictureLibraryIntent(activity.getString(R.string.pick_photo), multiSelect),
+                preparePictureLibraryIntent(activity, multiSelect),
                 RequestCodes.PICTURE_LIBRARY);
     }
 
-    private static Intent preparePictureLibraryIntent(String title, boolean multiSelect) {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("image/*");
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, new MimeTypes().getImageTypesOnly());
-        if (multiSelect) {
-            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
-        }
-        return Intent.createChooser(intent, title);
-    }
 
     private static Intent prepareGalleryIntent(String title) {
         Intent intent = new Intent(Intent.ACTION_PICK);

WordPress/src/main/res/values/strings.xml

@@ -141,6 +141,7 @@
     <string name="wp_media_title">WordPress media</string>
     <string name="pick_photo">Select photo</string>
     <string name="pick_video">Select video</string>
+    <string name="pick_audio">Select audio</string>
     <string name="pick_media">Add image or video</string>
     <string name="pick_file">Add file</string>
     <string name="capture_or_pick_photo">Capture or select photo</string>
@@ -2434,6 +2435,7 @@
     <string name="photo_picker_choose_photo">Choose photo from device</string>
     <string name="photo_picker_choose_video">Choose video from device</string>
     <string name="photo_picker_choose_file">Choose from device</string>
+    <string name="photo_picker_choose_audio">Choose audio from device</string>
     <string name="photo_picker_capture_photo">Take photo</string>
     <string name="photo_picker_capture_video">Take video</string>
     <string name="photo_picker_stock_media">Choose from Free Photo Library</string>
@@ -2444,6 +2446,7 @@
     <string name="photo_picker_soft_ask_permissions_denied">%1$s was denied access to your photos. To fix this, edit your permissions and turn on %2$s.</string>
     <string name="photo_picker_use_photo">Use this photo</string>
     <string name="photo_picker_use_video">Use this video</string>
+    <string name="photo_picker_use_audio">Use this audio</string>
     <string name="photo_picker_use_media">Use this media</string>
     <string name="photo_picker_use_gif">Use this GIF</string>
     <string name="photo_picker_image_thumbnail_content_description">Image Thumbnail</string>

WordPress/src/test/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModelTest.kt

@@ -345,6 +345,20 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         )
     }
 
+    @Test
+    fun `action mode title is Use Audio when audio browser type`() = test {
+        setupViewModel(listOf(firstItem, secondItem), buildMediaPickerSetup(false, setOf(AUDIO)))
+
+        viewModel.refreshData(false)
+
+        selectItem(0)
+
+        assertActionModeVisible(
+                UiStringRes(R.string.photo_picker_use_audio),
+                EditActionUiModel(isVisible = true, isCounterBadgeVisible = false)
+        )
+    }
+
     @Test
     fun `action mode title is Select N items when multi selection available`() = test {
         whenever(resourceProvider.getString(R.string.cab_selected)).thenReturn("%d selected")

build.gradle

@@ -136,7 +136,7 @@ ext {
     androidxWorkVersion = "2.4.0"
 
     daggerVersion = '2.29.1'
-    fluxCVersion = '1.8.0-beta-8'
+    fluxCVersion = '505923e4a797f677f8aa883251a54e84e548af26'
 
     appCompatVersion = '1.0.2'
     coreVersion = '1.2.0'

libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java

@@ -144,6 +144,7 @@ public enum Stat {
         EDITOR_ADDED_VIDEO_VIA_WP_MEDIA_LIBRARY,
         EDITOR_ADDED_PHOTO_VIA_STOCK_MEDIA_LIBRARY,
         EDITOR_ADDED_FILE_VIA_LIBRARY,
+        EDITOR_ADDED_AUDIO_FILE_VIA_LIBRARY,
         MEDIA_PHOTO_OPTIMIZED,
         MEDIA_PHOTO_OPTIMIZE_ERROR,
         MEDIA_VIDEO_OPTIMIZED,

libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java

@@ -809,6 +809,8 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "editor_photo_added";
             case EDITOR_ADDED_FILE_VIA_LIBRARY:
                 return "editor_file_added";
+            case EDITOR_ADDED_AUDIO_FILE_VIA_LIBRARY:
+                return "editor_audio_file_added";
             case MEDIA_PHOTO_OPTIMIZED:
                 return "media_photo_optimized";
             case MEDIA_PHOTO_OPTIMIZE_ERROR:

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java

@@ -183,6 +183,7 @@ public interface EditorFragmentListener extends DialogVisibilityProvider {
         void onAddMediaVideoClicked(boolean allowMultipleSelection);
         void onAddLibraryMediaClicked(boolean allowMultipleSelection);
         void onAddLibraryFileClicked(boolean allowMultipleSelection);
+        void onAddLibraryAudioFileClicked(boolean allowMultipleSelection);
         void onAddPhotoClicked(boolean allowMultipleSelection);
         void onCapturePhotoClicked();
         void onAddVideoClicked(boolean allowMultipleSelection);
@@ -201,6 +202,7 @@ public interface EditorFragmentListener extends DialogVisibilityProvider {
         void onAddStockMediaClicked(boolean allowMultipleSelection);
         void onAddGifClicked(boolean allowMultipleSelection);
         void onAddFileClicked(boolean allowMultipleSelection);
+        void onAddAudioFileClicked(boolean allowMultipleSelection);
         void onPerformFetch(String path, Consumer<String> onResult, Consumer<Bundle> onError);
         void onGutenbergEditorSessionTemplateApplyTracked(String template);
         void onGutenbergEditorSessionTemplatePreviewTracked(String template);