Add support for giphy and pexel images (#10628)

wordpress-mobile · Oct 29, 2019 · 48c886e · 48c886e
1 parent fdc78b6
commit 48c886e
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 44 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -3204,6 +3204,11 @@ public void onAddDeviceMediaClicked(boolean allowMultipleSelection) {
         WPMediaUtils.launchMediaLibrary(this, mAllowMultipleSelection);
     }
 
+    @Override
+    public void onAddStockMediaClicked(boolean allowMultipleSelection) {
+        onPhotoPickerIconClicked(PhotoPickerIcon.STOCK_MEDIA, allowMultipleSelection);
+    }
+
     @Override
     public void onCaptureVideoClicked() {
         onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CAPTURE_VIDEO, false);

diff --git a/...or/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/...or/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
@@ -188,6 +188,7 @@ public interface EditorFragmentListener {
         String onAuthHeaderRequested(String url);
         void onTrackableEvent(TrackableEvent event);
         void onHtmlModeToggledInToolbar();
+        void onAddStockMediaClicked(boolean allowMultipleSelection);
     }
 
     /**

diff --git a/...ordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java b/...ordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java
@@ -124,14 +124,6 @@ public CharSequence getTitle(OnGetContentTimeout onGetContentTimeout) {
         return mWPAndroidGlueCode.getTitle(onGetContentTimeout);
     }
 
-    public void appendMediaFile(int mediaId, final String mediaUrl, final boolean isVideo) {
-        mWPAndroidGlueCode.appendMediaFile(mediaId, mediaUrl, isVideo);
-    }
-
-    public void appendMediaFiles(ArrayList<Media> mediaList) {
-        mWPAndroidGlueCode.appendMediaFiles(mediaList);
-    }
-
     public void showDevOptionsDialog() {
         mWPAndroidGlueCode.showDevOptionsDialog();
     }

diff --git a/...r/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/...r/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java
@@ -40,6 +40,7 @@
 import org.wordpress.android.util.helpers.MediaGallery;
 import org.wordpress.aztec.IHistoryListener;
 import org.wordpress.mobile.WPAndroidGlue.Media;
+import org.wordpress.mobile.WPAndroidGlue.MediaOption;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnAuthHeaderRequestedListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorAutosaveListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorMountListener;
@@ -67,6 +68,8 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements
     private static final int CAPTURE_PHOTO_PERMISSION_REQUEST_CODE = 101;
     private static final int CAPTURE_VIDEO_PERMISSION_REQUEST_CODE = 102;
 
+    private static final String MEDIA_SOURCE_STOCK_MEDIA = "MEDIA_SOURCE_STOCK_MEDIA";
+
     private boolean mHtmlModeEnabled;
 
     private Handler mInvalidateOptionsHandler;
@@ -263,17 +266,33 @@ public void onCapturePhotoButtonClicked() {
                         checkAndRequestCameraAndStoragePermissions(CAPTURE_PHOTO_PERMISSION_REQUEST_CODE);
                     }
 
-                    @Override public void onRetryUploadForMediaClicked(int mediaId) {
+                    @Override
+                    public void onRetryUploadForMediaClicked(int mediaId) {
                         showRetryMediaUploadDialog(mediaId);
                     }
 
-                    @Override public void onCancelUploadForMediaClicked(int mediaId) {
+                    @Override
+                    public void onCancelUploadForMediaClicked(int mediaId) {
                         showCancelMediaUploadDialog(mediaId);
                     }
 
-                    @Override public void onCancelUploadForMediaDueToDeletedBlock(int mediaId) {
+                    @Override
+                    public void onCancelUploadForMediaDueToDeletedBlock(int mediaId) {
                         cancelMediaUploadForDeletedBlock(mediaId);
                     }
+
+                    @Override
+                    public ArrayList<MediaOption> onGetOtherMediaImageOptions() {
+                        ArrayList<MediaOption> otherMediaImageOptions = initOtherMediaImageOptions();
+                        return otherMediaImageOptions;
+                    }
+
+                    @Override
+                    public void onOtherMediaButtonClicked(String mediaSource, boolean allowMultipleSelection) {
+                        if (mediaSource.equals(MEDIA_SOURCE_STOCK_MEDIA)) {
+                            mEditorFragmentListener.onAddStockMediaClicked(allowMultipleSelection);
+                        }
+                    }
                 },
                 new OnReattachQueryListener() {
                     @Override
@@ -339,6 +358,17 @@ public void run() {
         return view;
     }
 
+    private ArrayList<MediaOption> initOtherMediaImageOptions() {
+        ArrayList<MediaOption> otherMediaOptions = new ArrayList<>();
+
+        String packageName = getActivity().getApplication().getPackageName();
+        int stockMediaResourceId = getResources().getIdentifier("photo_picker_stock_media", "string", packageName);
+
+        otherMediaOptions.add(new MediaOption(MEDIA_SOURCE_STOCK_MEDIA, getString(stockMediaResourceId)));
+
+        return otherMediaOptions;
+    }
+
     @Override public void onResume() {
         super.onResume();
 
@@ -685,18 +715,15 @@ public void appendMediaFile(final MediaFile mediaFile, final String mediaUrl, Im
             return;
         }
 
-        if (URLUtil.isNetworkUrl(mediaUrl)) {
-            getGutenbergContainerFragment().appendMediaFile(
-                    Integer.valueOf(mediaFile.getMediaId()),
-                    mediaUrl,
-                    mediaFile.isVideo());
-        } else {
-            getGutenbergContainerFragment().appendUploadMediaFile(
-                    mediaFile.getId(),
-                    "file://" + mediaUrl,
-                    mediaFile.isVideo());
+        boolean isNetworkUrl = URLUtil.isNetworkUrl(mediaUrl);
+        if (!isNetworkUrl) {
             mUploadingMediaProgressMax.put(String.valueOf(mediaFile.getId()), 0f);
         }
+
+        getGutenbergContainerFragment().appendUploadMediaFile(
+                isNetworkUrl ? Integer.valueOf(mediaFile.getMediaId()) : mediaFile.getId(),
+                isNetworkUrl ? mediaUrl : "file://" + mediaUrl,
+                mediaFile.isVideo());
     }
 
     @Override
@@ -718,32 +745,26 @@ public void appendMediaFiles(Map<String, MediaFile> mediaList) {
             mediaUrl = (String) mediaUrls[0];
         }
 
-        if (URLUtil.isNetworkUrl(mediaUrl)) {
-            for (Map.Entry<String, MediaFile> mediaEntry : mediaList.entrySet()) {
-                rnMediaList.add(
-                        new Media(
-                                Integer.valueOf(mediaEntry.getValue().getMediaId()),
-                                mediaEntry.getKey(),
-                                mediaEntry.getValue().getMimeType()
-                        )
-                );
-            }
-            getGutenbergContainerFragment().appendMediaFiles(rnMediaList);
-        } else {
-            for (Map.Entry<String, MediaFile> mediaEntry : mediaList.entrySet()) {
-                rnMediaList.add(
-                        new Media(
-                                mediaEntry.getValue().getId(),
-                                "file://" + mediaEntry.getKey(),
-                                mediaEntry.getValue().getMimeType()
-                        )
-                );
-            }
-            getGutenbergContainerFragment().appendUploadMediaFiles(rnMediaList);
+        boolean isNetworkUrl = URLUtil.isNetworkUrl(mediaUrl);
+        if (!isNetworkUrl) {
             for (Media media : rnMediaList) {
                 mUploadingMediaProgressMax.put(String.valueOf(media.getId()), 0f);
             }
         }
+
+        for (Map.Entry<String, MediaFile> mediaEntry : mediaList.entrySet()) {
+            rnMediaList.add(
+                    new Media(
+                            isNetworkUrl
+                                    ? Integer.valueOf(mediaEntry.getValue().getMediaId())
+                                    : mediaEntry.getValue().getId(),
+                            isNetworkUrl ? mediaEntry.getKey() : "file://" + mediaEntry.getKey(),
+                            mediaEntry.getValue().getMimeType()
+                    )
+            );
+        }
+
+        getGutenbergContainerFragment().appendUploadMediaFiles(rnMediaList);
     }
 
     @Override

diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile