Added handling for the "callback-selection-style" JS callback

- Added support for toggling styles in the editor using the format bar, and handling the callback to update the highlighted status of format bar buttons

Author: aforcier

WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java

@@ -27,18 +27,23 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
 
 public class EditorFragment extends EditorFragmentAbstract implements View.OnClickListener, JsCallbackListener {
     private static final String ARG_PARAM_TITLE = "param_title";
     private static final String ARG_PARAM_CONTENT = "param_content";
 
     private static final String JS_CALLBACK_HANDLER = "nativeCallbackHandler";
 
+    private static final String TAG_FORMAT_BAR_BUTTON_BOLD = "bold";
+
     private String mParamTitle;
     private String mParamContent;
     private WebView mWebView;
 
-    private ToggleButton mBoldButton;
+    private final Map<String, ToggleButton> mTagToggleButtonMap = new HashMap<>();
+
     public static EditorFragment newInstance(String title, String content) {
         EditorFragment fragment = new EditorFragment();
         Bundle args = new Bundle();
@@ -66,8 +71,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mWebView = (WebView) view.findViewById(R.id.webview);
         initWebView();
 
-        mBoldButton = (ToggleButton) view.findViewById(R.id.bold);
-        mBoldButton.setOnClickListener(this);
+        ToggleButton boldButton = (ToggleButton) view.findViewById(R.id.bold);
+        boldButton.setOnClickListener(this);
+        mTagToggleButtonMap.put(TAG_FORMAT_BAR_BUTTON_BOLD, boldButton);
 
         return view;
     }
@@ -110,6 +116,14 @@ public boolean onJsAlert(WebView view, String url, String message, JsResult resu
         enableWebDebugging(true);
     }
 
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.bold) {
+            execJavaScriptFromString("ZSSEditor.setBold();");
+        }
+    }
+
     private String getStringFromAsset(String filename) throws IOException {
         if (!isAdded()) {
             return null;
@@ -202,4 +216,18 @@ public void run() {
             }
         });
     }
+
+    public void onSelectionStyleChanged(final Map<String, Boolean> changeMap) {
+        mWebView.post(new Runnable() {
+            public void run() {
+                for (Map.Entry<String, Boolean> entry : changeMap.entrySet()) {
+                    // Handle toggling format bar style buttons
+                    ToggleButton button = mTagToggleButtonMap.get(entry.getKey());
+                    if (button != null) {
+                        button.setChecked(entry.getValue());
+                    }
+                }
+            }
+        });
+    }
 }

WordPressEditor/src/main/java/org/wordpress/android/editor/JsCallbackHandler.java

@@ -4,7 +4,12 @@
 
 import org.wordpress.android.util.AppLog;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class JsCallbackHandler {
+    private static final String JS_CALLBACK_DELIMITER = "~";
+
     private static final String CALLBACK_LOG = "callback-log";
 
     private static final String CALLBACK_DOM_LOADED = "callback-dom-loaded";
@@ -24,6 +29,8 @@ public class JsCallbackHandler {
 
     private final JsCallbackListener mJsCallbackListener;
 
+    private Set<String> mPreviousStyleSet = new HashSet<>();
+
     public JsCallbackHandler(EditorFragmentAbstract editorFragmentAbstract) {
         mJsCallbackListener = (JsCallbackListener) editorFragmentAbstract;
     }
@@ -34,6 +41,12 @@ public void executeCallback(String callbackId, String params) {
             case CALLBACK_DOM_LOADED:
                 mJsCallbackListener.onDomLoaded();
                 break;
+            case CALLBACK_SELECTION_STYLE:
+                // Compare the new styles to the previous ones, and notify the JsCallbackListener of the changeset
+                Set<String> newStyleSet = Utils.splitDelimitedString(params, JS_CALLBACK_DELIMITER);
+                mJsCallbackListener.onSelectionStyleChanged(Utils.getChangeMapFromSets(mPreviousStyleSet, newStyleSet));
+                mPreviousStyleSet = newStyleSet;
+                break;
             case CALLBACK_LOG:
                 // Strip 'msg=' from beginning of string
                 AppLog.d(AppLog.T.EDITOR, callbackId + ": " + params.substring(4));

WordPressEditor/src/main/java/org/wordpress/android/editor/JsCallbackListener.java

@@ -1,5 +1,8 @@
 package org.wordpress.android.editor;
 
+import java.util.Map;
+
 public interface JsCallbackListener {
     void onDomLoaded();
+    void onSelectionStyleChanged(Map<String, Boolean> changeSet);
 }

WordPressEditor/src/main/java/org/wordpress/android/editor/Utils.java

@@ -1,5 +1,11 @@
 package org.wordpress.android.editor;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
 public class Utils {
     public static String escapeHtml(String html) {
         html = html.replace("\\", "\\\\");
@@ -9,4 +15,50 @@ public static String escapeHtml(String html) {
         html = html.replace("\n", "\\n");
         return html;
     }
+
+    /**
+     * Splits a delimited string into a set of strings.
+     * @param string the delimited string to split
+     * @param delimiter the string delimiter
+     */
+    public static Set<String> splitDelimitedString(String string, String delimiter) {
+        Set<String> splitString = new HashSet<>();
+
+        StringTokenizer stringTokenizer = new StringTokenizer(string, delimiter);
+        while (stringTokenizer.hasMoreTokens()) {
+            splitString.add(stringTokenizer.nextToken());
+        }
+
+        return splitString;
+    }
+
+    /**
+     * Compares two <code>Sets</code> and returns a <code>Map</code> of elements not contained in both
+     * <code>Sets</code>. Elements contained in <code>oldSet</code> but not in <code>newSet</code> will be marked
+     * <code>false</code> in the returned map; the converse will be marked <code>true</code>.
+     * @param oldSet the older of the two <code>Sets</code>
+     * @param newSet the newer of the two <code>Sets</code>
+     * @param <E> type of element stored in the <code>Sets</code>
+     * @return a <code>Map</code> containing the difference between <code>oldSet</code> and <code>newSet</code>, and whether the
+     * element was added (<code>true</code>) or removed (<code>false</code>) in <code>newSet</code>
+     */
+    public static <E> Map<E, Boolean> getChangeMapFromSets(Set<E> oldSet, Set<E> newSet) {
+        Map<E, Boolean> changeMap = new HashMap<>();
+
+        Set<E> additions = new HashSet<>(newSet);
+        additions.removeAll(oldSet);
+
+        Set<E> removals = new HashSet<>(oldSet);
+        removals.removeAll(newSet);
+
+        for (E s : additions) {
+            changeMap.put(s, true);
+        }
+
+        for (E s : removals) {
+            changeMap.put(s, false);
+        }
+
+        return changeMap;
+    }
 }