Gutenberg - Starter Page Templates Tooltip (#11807)

* Gutenberg - Starter Page Templates Tooltip * Update Gutenberg ref
wordpress-mobile · May 26, 2020 · ee93098 · ee93098
1 parent 9d3d5af
commit ee93098
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 1 deletion.
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
@@ -2871,6 +2871,14 @@ public void onEditorFragmentContentReady(ArrayList<Object> unsupportedBlocksList
         ActivityLauncher.viewSuggestUsersForResult(this, mSite);
     }
 
+    @Override public void onGutenbergEditorSetStarterPageTemplatesTooltipShown(boolean tooltipShown) {
+        AppPrefs.setGutenbergStarterPageTemplatesTooltipShown(tooltipShown);
+    }
+
+    @Override public boolean onGutenbergEditorRequestStarterPageTemplatesTooltipShown() {
+        return AppPrefs.getGutenbergStarterPageTemplatesTooltipShown();
+    }
+
     @Override
     public void onHtmlModeToggledInToolbar() {
         toggleHtmlModeOnMenu();

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java
@@ -124,6 +124,7 @@ public enum DeletablePrefKey implements PrefKey {
         SHOULD_AUTO_ENABLE_GUTENBERG_FOR_THE_NEW_POSTS,
         SHOULD_AUTO_ENABLE_GUTENBERG_FOR_THE_NEW_POSTS_PHASE_2,
         GUTENBERG_OPT_IN_DIALOG_SHOWN,
+        GUTENBERG_STARTER_PAGE_TEMPLATES_TOOLTIP_SHOWN,
 
         IS_QUICK_START_NOTICE_REQUIRED,
 
@@ -849,6 +850,14 @@ public static void removeSupportName() {
         remove(DeletablePrefKey.SUPPORT_NAME);
     }
 
+    public static void setGutenbergStarterPageTemplatesTooltipShown(boolean tooltipShown) {
+        setBoolean(DeletablePrefKey.GUTENBERG_STARTER_PAGE_TEMPLATES_TOOLTIP_SHOWN, tooltipShown);
+    }
+
+    public static boolean getGutenbergStarterPageTemplatesTooltipShown() {
+        return getBoolean(DeletablePrefKey.GUTENBERG_STARTER_PAGE_TEMPLATES_TOOLTIP_SHOWN, false);
+    }
+
     /*
      * returns a list of local IDs of sites recently chosen in the site picker
      */

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
@@ -200,6 +200,8 @@ public interface EditorFragmentListener {
         void onGutenbergEditorSessionTemplateApplyTracked(String template);
         void onGutenbergEditorSessionTemplatePreviewTracked(String template);
         void getMention(Consumer<String> onResult);
+        void onGutenbergEditorSetStarterPageTemplatesTooltipShown(boolean tooltipShown);
+        boolean onGutenbergEditorRequestStarterPageTemplatesTooltipShown();
     }
 
     /**

diff --git a/...ordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java b/...ordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java
@@ -15,6 +15,7 @@
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGetContentTimeout;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnImageFullscreenPreviewListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnLogGutenbergUserEventListener;
+import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnStarterPageTemplatesTooltipShownEventListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaEditorListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachQueryListener;
@@ -68,6 +69,7 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener
                                   OnMediaEditorListener onMediaEditorListener,
                                   OnLogGutenbergUserEventListener onLogGutenbergUserEventListener,
                                   AddMentionUtil addMentionUtil,
+                                  OnStarterPageTemplatesTooltipShownEventListener onSPTTooltipShownEventListener,
                                   boolean isDarkMode) {
             mWPAndroidGlueCode.attachToContainer(
                     viewGroup,
@@ -81,6 +83,7 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener
                     onMediaEditorListener,
                     onLogGutenbergUserEventListener,
                     addMentionUtil,
+                    onSPTTooltipShownEventListener,
                     isDarkMode);
     }
 

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
@@ -46,6 +46,7 @@
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorMountListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGetContentTimeout;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnLogGutenbergUserEventListener;
+import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnStarterPageTemplatesTooltipShownEventListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachQueryListener;
 
@@ -361,6 +362,17 @@ public void onGutenbergUserEvent(GutenbergUserEvent event, Map<String, Object> p
                     }
                 },
                 mEditorFragmentListener::getMention,
+                new OnStarterPageTemplatesTooltipShownEventListener() {
+                    @Override
+                    public void onSetStarterPageTemplatesTooltipShown(boolean tooltipShown) {
+                        mEditorFragmentListener.onGutenbergEditorSetStarterPageTemplatesTooltipShown(tooltipShown);
+                    }
+
+                    @Override
+                    public boolean onRequestStarterPageTemplatesTooltipShown() {
+                        return mEditorFragmentListener.onGutenbergEditorRequestStarterPageTemplatesTooltipShown();
+                    }
+                },
                 isDarkMode());
 
         // request dependency injection. Do this after setting min/max dimensions

diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
+4 −0		RELEASE-NOTES.txt
+2 −2		__device-tests__/helpers/caps.js
+12 −6		__device-tests__/pages/editor-page.js
+8 −0		android/app/src/main/java/com/gutenberg/MainApplication.java
+1 −1		gutenberg
+8 −0		ios/gutenberg/GutenbergViewController.swift
+23 −0		patches/react-native+0.61.5.patch
+22 −21		react-native-aztec/android/build.gradle
+14 −5		react-native-gutenberg-bridge/android/build.gradle
+8 −0		...-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
+20 −0		...droid/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
+19 −0		react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
+8 −0		react-native-gutenberg-bridge/index.js
+7 −1		react-native-gutenberg-bridge/ios/GutenbergBridgeDelegate.swift
+2 −0		react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.m
+11 −0		react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.swift
+141 −148		src/initial-html.js