Merge pull request #1378 from wordpress-mobile/feature/media-text-imp…

…rovements

Media & Text - Media picker buttons functionality

ios/gutenberg/GutenbergViewController.swift

@@ -74,15 +74,15 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
             switch currentFilter {
             case .image:
                 if(allowMultipleSelection) {
-                    callback([(1, "https://cldup.com/cXyG__fTLN.jpg"), (3, "https://cldup.com/cXyG__fTLN.jpg")])
+                    callback([(1, "https://cldup.com/cXyG__fTLN.jpg", "image"), (3, "https://cldup.com/cXyG__fTLN.jpg", "image")])
                 } else {
-                    callback([(1, "https://cldup.com/cXyG__fTLN.jpg")])
+                    callback([(1, "https://cldup.com/cXyG__fTLN.jpg", "image")])
                 }
             case .video:
                 if(allowMultipleSelection) {
-                    callback([(2, "https://i.cloudup.com/YtZFJbuQCE.mov"), (4, "https://i.cloudup.com/YtZFJbuQCE.mov")])
+                    callback([(2, "https://i.cloudup.com/YtZFJbuQCE.mov", "video"), (4, "https://i.cloudup.com/YtZFJbuQCE.mov", "video")])
                 } else {
-                    callback([(2, "https://i.cloudup.com/YtZFJbuQCE.mov")])
+                    callback([(2, "https://i.cloudup.com/YtZFJbuQCE.mov", "video")])
                 }
             default:
                 break
@@ -98,16 +98,16 @@ extension GutenbergViewController: GutenbergBridgeDelegate {
 
     func gutenbergDidRequestImport(from url: URL, with callback: @escaping MediaPickerDidPickMediaCallback) {
         let id = mediaUploadCoordinator.upload(url: url)
-        callback([(id, url.absoluteString)])
+        callback([(id, url.absoluteString, "image")])
     }
 
     func pickAndUpload(from source: UIImagePickerController.SourceType, filter: MediaFilter, callback: @escaping MediaPickerDidPickMediaCallback) {
         mediaPickCoordinator = MediaPickCoordinator(presenter: self, filter: filter, callback: { (url) in
             guard let url = url, let mediaID = self.mediaUploadCoordinator.upload(url: url) else {
-                callback([(nil, nil)])
+                callback([(nil, nil, nil)])
                 return
             }
-            callback([(mediaID, url.absoluteString)])
+            callback([(mediaID, url.absoluteString, "image")])
             self.mediaPickCoordinator = nil
         } )
         mediaPickCoordinator?.pick(from: source)

react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java

@@ -9,6 +9,7 @@ public interface GutenbergBridgeJS2Parent {
     interface RNMedia {
         String getUrl();
         int getId();
+        String getType();
         WritableMap toMap();
     }
 

react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/Media.java

@@ -49,6 +49,7 @@ public WritableMap toMap() {
         WritableMap map = new WritableNativeMap();
         map.putInt("id", mId);
         map.putString("url", mUrl);
+        map.putString("type", mType);
         return map;
     }
 }

react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java

@@ -512,11 +512,16 @@ public CharSequence getTitle(OnGetContentTimeout onGetContentTimeout) {
         return "";
     }
 
+    private String getMediaType(final boolean isVideo) {
+        return isVideo ? "video" : "image";
+    }
+
     public void appendMediaFile(int mediaId, final String mediaUrl, final boolean isVideo) {
         if (mPendingMediaSelectedCallback != null && mMediaPickedByUserOnBlock) {
+            String mediaType = getMediaType(isVideo);
             mMediaPickedByUserOnBlock = false;
             List<RNMedia> mediaList = new ArrayList<>();
-            mediaList.add(new Media(mediaId, mediaUrl));
+            mediaList.add(new Media(mediaId, mediaUrl, mediaType));
             mPendingMediaSelectedCallback.onMediaSelected(mediaList);
             mPendingMediaSelectedCallback = null;
         } else {
@@ -558,9 +563,10 @@ public void toggleEditorMode() {
 
     public void appendUploadMediaFile(final int mediaId, final String mediaUri, final boolean isVideo) {
        if (isMediaUploadCallbackRegistered() && mMediaPickedByUserOnBlock) {
+           String mediaType = getMediaType(isVideo);
            mMediaPickedByUserOnBlock = false;
            List<RNMedia> mediaList = new ArrayList<>();
-           mediaList.add(new Media(mediaId, mediaUri));
+           mediaList.add(new Media(mediaId, mediaUri, mediaType));
            mPendingMediaUploadCallback.onUploadMediaFileSelected(mediaList);
        } else {
            // we can assume we're being passed a new image from share intent as there was no selectMedia callback
@@ -573,7 +579,7 @@ public void appendUploadMediaFiles(ArrayList<Media> mediaList) {
             mMediaPickedByUserOnBlock = false;
             List<RNMedia> rnMediaList = new ArrayList<>();
             for (Media media : mediaList) {
-                rnMediaList.add(new Media(media.getId(), media.getUrl()));
+                rnMediaList.add(new Media(media.getId(), media.getUrl(), media.getType()));
             }
             mPendingMediaUploadCallback.onUploadMediaFileSelected(rnMediaList);
             mPendingMediaUploadCallback = null;
@@ -582,7 +588,7 @@ public void appendUploadMediaFiles(ArrayList<Media> mediaList) {
 
     private void sendOrDeferAppendMediaSignal(final int mediaId, final String mediaUri, final boolean isVideo) {
         // if editor is mounted, let's append the media file
-        String mediaType = isVideo ? "video" : "image";
+        String mediaType = getMediaType(isVideo);
         if (mIsEditorMounted) {
             if (!TextUtils.isEmpty(mediaUri) && mediaId > 0) {
                 // send signal to JS

react-native-gutenberg-bridge/ios/GutenbergBridgeDelegate.swift

@@ -1,4 +1,4 @@
-public typealias MediaPickerDidPickMediaCallback = (_ media: [(Int32?,String?)]?) -> Void
+public typealias MediaPickerDidPickMediaCallback = (_ media: [(Int32?,String?,String?)]?) -> Void
 
 public enum MediaPickerSource: String {
     case mediaLibrary = "SITE_MEDIA_LIBRARY"

react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.swift

@@ -28,16 +28,16 @@ public class RNReactNativeGutenbergBridge: RCTEventEmitter {
                     return
                 }
                 if (allowMultipleSelection) {
-                    let formattedMedia = media.map { (id, url) in
-                        return [mediaDictKeys.IDKey: id, mediaDictKeys.URLKey: url]
+                    let formattedMedia = media.map { (id, url, type) in
+                        return [mediaDictKeys.IDKey: id, mediaDictKeys.URLKey: url, mediaDictKeys.TypeKey: type]
                     }
                     callback([formattedMedia])
                 } else {
-                    guard let (mediaID, mediaURL) = media.first else {
+                    guard let (mediaID, mediaURL, mediaType) = media.first else {
                         callback(nil)
                         return
                     }
-                    callback([[mediaDictKeys.IDKey: mediaID, mediaDictKeys.URLKey: mediaURL]])
+                    callback([[mediaDictKeys.IDKey: mediaID, mediaDictKeys.URLKey: mediaURL, mediaDictKeys.TypeKey: mediaType]])
                 }
             })
         }
@@ -194,5 +194,6 @@ extension RNReactNativeGutenbergBridge {
     enum mediaDictKeys {
         static let IDKey = "id"
         static let URLKey = "url"
+        static let TypeKey = "type"
     }
 }