Add a "Set as Featured Image" Button to Image Block

build.gradle

@@ -7,7 +7,7 @@ buildscript {
     ext.kotlin_ktx_version = '1.2.0'
     ext.wordPressUtilsVersion = '1.40.0'
     ext.detektVersion = '1.15.0'
-    ext.gutenbergMobileVersion = '3116-3407f793fccc2032a53728b879202a2421695297'
+    ext.gutenbergMobileVersion = '3116-7bf12e282ad0455cf534a2c8d87187589e2b835a'
 
     repositories {
         google()

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergDialogFragment.kt

@@ -0,0 +1,139 @@
+package org.wordpress.android.editor.gutenberg
+
+import android.app.Dialog
+import android.content.Context
+import android.content.DialogInterface
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.fragment.app.Fragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+class GutenbergDialogFragment() : AppCompatDialogFragment() {
+    private lateinit var mTag: String
+    private lateinit var mMessage: CharSequence
+    private lateinit var mPositiveButtonLabel: CharSequence
+    private var mTitle: CharSequence? = null
+    private var mNegativeButtonLabel: CharSequence? = null
+    private var mMediaId: Int = 0
+    private var dismissedByPositiveButton = false
+    private var dismissedByNegativeButton = false
+
+    interface GutenbergDialogPositiveClickInterface {
+        fun onGutenbergDialogPositiveClicked(instanceTag: String, mediaId: Int)
+    }
+
+    interface GutenbergDialogNegativeClickInterface {
+        fun onGutenbergDialogNegativeClicked(instanceTag: String)
+    }
+
+    interface GutenbergDialogOnDismissByOutsideTouchInterface {
+        fun onDismissByOutsideTouch(instanceTag: String)
+    }
+
+    fun initialize(
+        tag: String,
+        title: CharSequence?,
+        message: CharSequence,
+        positiveButtonLabel: CharSequence,
+        negativeButtonLabel: CharSequence? = null,
+        mediaId: Int
+    ) {
+        mTag = tag
+        mTitle = title
+        mMessage = message
+        mPositiveButtonLabel = positiveButtonLabel
+        mNegativeButtonLabel = negativeButtonLabel
+        mMediaId = mediaId
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        this.isCancelable = true
+        val theme = 0
+        setStyle(STYLE_NORMAL, theme)
+
+        if (savedInstanceState != null) {
+            mTag = requireNotNull(savedInstanceState.getString(STATE_KEY_TAG))
+            mTitle = savedInstanceState.getCharSequence(STATE_KEY_TITLE)
+            mMessage = requireNotNull(savedInstanceState.getCharSequence(STATE_KEY_MESSAGE))
+            mPositiveButtonLabel = requireNotNull(savedInstanceState.getCharSequence(STATE_KEY_POSITIVE_BUTTON_LABEL))
+            mNegativeButtonLabel = savedInstanceState.getCharSequence(STATE_KEY_NEGATIVE_BUTTON_LABEL)
+            mMediaId = savedInstanceState.getInt(STATE_KEY_MEDIA_ID)
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putString(STATE_KEY_TAG, mTag)
+        outState.putCharSequence(STATE_KEY_TITLE, mTitle)
+        outState.putCharSequence(STATE_KEY_MESSAGE, mMessage)
+        outState.putCharSequence(STATE_KEY_POSITIVE_BUTTON_LABEL, mPositiveButtonLabel)
+        outState.putCharSequence(STATE_KEY_NEGATIVE_BUTTON_LABEL, mNegativeButtonLabel)
+        outState.putInt(STATE_KEY_MEDIA_ID, mMediaId)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val builder = MaterialAlertDialogBuilder(requireActivity())
+        builder.setMessage(mMessage)
+
+        mTitle?.let {
+            builder.setTitle(mTitle)
+        }
+
+        mPositiveButtonLabel?.let {
+            builder.setPositiveButton(mPositiveButtonLabel) { _, _ ->
+                dismissedByPositiveButton = true
+                val parentFragment: Fragment? = parentFragment
+                if (parentFragment != null) {
+                    (parentFragment as GutenbergDialogPositiveClickInterface).onGutenbergDialogPositiveClicked(
+                            mTag,
+                            mMediaId
+                    )
+                }
+            }.setCancelable(true)
+        }
+
+        mNegativeButtonLabel?.let {
+            builder.setNegativeButton(mNegativeButtonLabel) { _, _ ->
+                dismissedByNegativeButton = true
+                val parentFragment: Fragment? = parentFragment
+                if (parentFragment != null) {
+                    (parentFragment as GutenbergDialogNegativeClickInterface).onGutenbergDialogNegativeClicked(mTag)
+                }
+            }
+        }
+
+        return builder.create()
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        val parentFragment: Fragment? = parentFragment
+        if (parentFragment !is GutenbergDialogPositiveClickInterface) {
+            throw RuntimeException("Parent fragment must implement GutenbergDialogPositiveClickInterface")
+        }
+        if (mNegativeButtonLabel != null && parentFragment !is GutenbergDialogNegativeClickInterface) {
+            throw RuntimeException("Parent fragment must implement GutenbergDialogNegativeClickInterface")
+        }
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        val activity = activity
+        if (activity != null && activity is GutenbergDialogOnDismissByOutsideTouchInterface) {
+            // Only handle the event if it wasn't triggered by a button
+            if (!dismissedByPositiveButton && !dismissedByNegativeButton) {
+                (activity as GutenbergDialogOnDismissByOutsideTouchInterface).onDismissByOutsideTouch(mTag)
+            }
+        }
+        super.onDismiss(dialog)
+    }
+
+    companion object {
+        private const val STATE_KEY_TAG = "state_key_tag"
+        private const val STATE_KEY_TITLE = "state_key_title"
+        private const val STATE_KEY_MESSAGE = "state_key_message"
+        private const val STATE_KEY_POSITIVE_BUTTON_LABEL = "state_key_positive_button_label"
+        private const val STATE_KEY_NEGATIVE_BUTTON_LABEL = "state_key_negative_button_label"
+        private const val STATE_KEY_MEDIA_ID = "state_key_media_id"
+    }
+}

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java

@@ -34,6 +34,7 @@
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.gson.Gson;
 
+import org.jetbrains.annotations.NotNull;
 import org.wordpress.android.editor.BuildConfig;
 import org.wordpress.android.editor.EditorEditMediaListener;
 import org.wordpress.android.editor.EditorFragmentAbstract;
@@ -44,6 +45,8 @@
 import org.wordpress.android.editor.LiveTextWatcher;
 import org.wordpress.android.editor.R;
 import org.wordpress.android.editor.WPGutenbergWebViewActivity;
+import org.wordpress.android.editor.gutenberg.GutenbergDialogFragment.GutenbergDialogPositiveClickInterface;
+import org.wordpress.android.editor.gutenberg.GutenbergDialogFragment.GutenbergDialogNegativeClickInterface;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.DateTimeUtils;
@@ -84,7 +87,9 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements
         EditorMediaUploadListener,
         IHistoryListener,
         EditorThemeUpdateListener,
-        StorySaveMediaListener {
+        StorySaveMediaListener,
+        GutenbergDialogPositiveClickInterface,
+        GutenbergDialogNegativeClickInterface {
     private static final String GUTENBERG_EDITOR_NAME = "gutenberg";
     private static final String KEY_HTML_MODE_ENABLED = "KEY_HTML_MODE_ENABLED";
     private static final String KEY_EDITOR_DID_MOUNT = "KEY_EDITOR_DID_MOUNT";
@@ -96,6 +101,7 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements
     public static final String ARG_STORY_BLOCK_UPDATED_CONTENT = "story_block_updated_content";
     public static final String ARG_STORY_BLOCK_EXTERNALLY_EDITED_ORIGINAL_HASH = "story_block_original_hash";
     public static final String ARG_FAILED_MEDIAS = "arg_failed_medias";
+    public static final String ARG_FEATURED_IMAGE_ID = "featured_image_id";
 
     private static final int CAPTURE_PHOTO_PERMISSION_REQUEST_CODE = 101;
     private static final int CAPTURE_VIDEO_PERMISSION_REQUEST_CODE = 102;
@@ -109,6 +115,8 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements
 
     private static final int UNSUPPORTED_BLOCK_REQUEST_CODE = 1001;
 
+    private static final String TAG_REPLACE_FEATURED_DIALOG = "REPLACE_FEATURED_DIALOG";
+
     private boolean mHtmlModeEnabled;
 
     private Handler mInvalidateOptionsHandler;
@@ -198,6 +206,7 @@ public void onCreate(Bundle savedInstanceState) {
             mExternallyEditedBlockOriginalHash = savedInstanceState.getString(
                     ARG_STORY_BLOCK_EXTERNALLY_EDITED_ORIGINAL_HASH);
             mFailedMediaIds = (HashSet<String>) savedInstanceState.getSerializable(ARG_FAILED_MEDIAS);
+            mFeaturedImageId = savedInstanceState.getLong(ARG_FEATURED_IMAGE_ID);
         }
     }
 
@@ -785,26 +794,18 @@ public void onClick(DialogInterface dialog, int id) {
         dialog.show();
     }
 
-    private void showFeaturedImageConfirmationDialog(final int mediaId) {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity());
-        builder.setTitle(R.string.replace_current_title);
-        builder.setMessage(R.string.replace_current_description);
-        builder.setPositiveButton(R.string.replace_current_confirmation,
-                new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int id) {
-                        dialog.dismiss();
-                        setFeaturedImage(mediaId);
-                    }
-                });
-
-        builder.setNegativeButton(R.string.replace_current_cancel, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int id) {
-                dialog.dismiss();
-            }
-        });
+    public void showFeaturedImageConfirmationDialog(final int mediaId) {
+        GutenbergDialogFragment dialog = new GutenbergDialogFragment();
+        dialog.initialize(
+                TAG_REPLACE_FEATURED_DIALOG,
+                getString(R.string.replace_current_title),
+                getString(R.string.replace_current_description),
+                getString(R.string.replace_current_confirmation),
+                getString(R.string.replace_current_cancel),
+                mediaId
+        );
 
-        AlertDialog dialog = builder.create();
-        dialog.show();
+        dialog.show(getChildFragmentManager(), TAG_REPLACE_FEATURED_DIALOG);
     }
 
     private void setFeaturedImage(int mediaId) {
@@ -928,6 +929,7 @@ public void onSaveInstanceState(Bundle outState) {
         outState.putBoolean(KEY_EDITOR_DID_MOUNT, mEditorDidMount);
         outState.putString(ARG_STORY_BLOCK_EXTERNALLY_EDITED_ORIGINAL_HASH, mExternallyEditedBlockOriginalHash);
         outState.putSerializable(ARG_FAILED_MEDIAS, mFailedMediaIds);
+        outState.putLong(ARG_FEATURED_IMAGE_ID, mFeaturedImageId);
     }
 
     @Override
@@ -1380,4 +1382,22 @@ public void onEditorThemeUpdated(Bundle editorTheme) {
     public void showNotice(String message) {
         getGutenbergContainerFragment().showNotice(message);
     }
+
+    @Override
+    public void onGutenbergDialogPositiveClicked(@NotNull String instanceTag, int mediaId) {
+        switch (instanceTag) {
+            case TAG_REPLACE_FEATURED_DIALOG:
+                setFeaturedImage(mediaId);
+                break;
+        }
+    }
+
+    @Override
+    public void onGutenbergDialogNegativeClicked(@NotNull String instanceTag) {
+        switch (instanceTag) {
+            case TAG_REPLACE_FEATURED_DIALOG:
+                // Dismiss dialog with no action.
+                break;
+        }
+    }
 }