From be4aac09995c4a35b2354854ef0f3ff5b1ae07e7 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Fri, 15 Apr 2016 08:33:08 +0200 Subject: [PATCH 1/6] Squashed 'libs/editor/' changes from 72933eb..abfcce5 abfcce5 Merge pull request #351 from wordpress-mobile/issue/347-fix-html-mode-content-loss 3152dfa Fixed threading for populating link dialog with selected text d02a4d1 Extracted LinkDialogFragment building to a standalone method a917c7f Adjust threading for HTML mode toggle, fixing a race condition on slower devices 6d51447 0.9 version bump git-subtree-dir: libs/editor git-subtree-split: abfcce591812a169b7dfa67c00e66a7220f4deac --- WordPressEditor/build.gradle | 4 +- .../android/editor/EditorFragment.java | 129 ++++++++++++------ 2 files changed, 86 insertions(+), 47 deletions(-) diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle index 7f0b2f4e2904..acf399d72ce6 100644 --- a/WordPressEditor/build.gradle +++ b/WordPressEditor/build.gradle @@ -22,8 +22,8 @@ android { buildToolsVersion "23.0.3" defaultConfig { - versionCode 8 - versionName "0.8" + versionCode 9 + versionName "0.9" minSdkVersion 14 targetSdkVersion 23 } diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java index f4fc4537925c..ae1e5912eb88 100755 --- a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java +++ b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java @@ -448,21 +448,39 @@ private void toggleHtmlMode(final ToggleButton toggleButton) { updateFormatBarEnabledState(true); if (toggleButton.isChecked()) { - mSourceViewTitle.setText(getTitle()); + Thread thread = new Thread(new Runnable() { + @Override + public void run() { + // Update mTitle and mContentHtml with the latest state from the ZSSEditor + getTitle(); + getContent(); + + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + // Set HTML mode state + mSourceViewTitle.setText(mTitle); - SpannableString spannableContent = new SpannableString(getContent()); - HtmlStyleUtils.styleHtmlForDisplay(spannableContent); - mSourceViewContent.setText(spannableContent); + SpannableString spannableContent = new SpannableString(mContentHtml); + HtmlStyleUtils.styleHtmlForDisplay(spannableContent); + mSourceViewContent.setText(spannableContent); - mWebView.setVisibility(View.GONE); - mSourceView.setVisibility(View.VISIBLE); + mWebView.setVisibility(View.GONE); + mSourceView.setVisibility(View.VISIBLE); - mSourceViewContent.requestFocus(); - mSourceViewContent.setSelection(0); + mSourceViewContent.requestFocus(); + mSourceViewContent.setSelection(0); + + InputMethodManager imm = ((InputMethodManager) getActivity() + .getSystemService(Context.INPUT_METHOD_SERVICE)); + imm.showSoftInput(mSourceViewContent, InputMethodManager.SHOW_IMPLICIT); + } + }); + } + }); + + thread.start(); - InputMethodManager imm = ((InputMethodManager) getActivity() - .getSystemService(Context.INPUT_METHOD_SERVICE)); - imm.showSoftInput(mSourceViewContent, InputMethodManager.SHOW_IMPLICIT); } else { mWebView.setVisibility(View.VISIBLE); mSourceView.setVisibility(View.GONE); @@ -479,6 +497,60 @@ private void toggleHtmlMode(final ToggleButton toggleButton) { } } + private void displayLinkDialog() { + final LinkDialogFragment linkDialogFragment = new LinkDialogFragment(); + linkDialogFragment.setTargetFragment(this, LinkDialogFragment.LINK_DIALOG_REQUEST_CODE_ADD); + + final Bundle dialogBundle = new Bundle(); + + // Pass potential URL from user clipboard + String clipboardUri = Utils.getUrlFromClipboard(getActivity()); + if (clipboardUri != null) { + dialogBundle.putString(LinkDialogFragment.LINK_DIALOG_ARG_URL, clipboardUri); + } + + // Pass selected text to dialog + if (mSourceView.getVisibility() == View.VISIBLE) { + // HTML mode + mSelectionStart = mSourceViewContent.getSelectionStart(); + mSelectionEnd = mSourceViewContent.getSelectionEnd(); + + String selectedText = mSourceViewContent.getText().toString().substring(mSelectionStart, mSelectionEnd); + dialogBundle.putString(LinkDialogFragment.LINK_DIALOG_ARG_TEXT, selectedText); + + linkDialogFragment.setArguments(dialogBundle); + linkDialogFragment.show(getFragmentManager(), LinkDialogFragment.class.getSimpleName()); + } else { + // Visual mode + Thread thread = new Thread(new Runnable() { + @Override + public void run() { + mGetSelectedTextCountDownLatch = new CountDownLatch(1); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + mWebView.execJavaScriptFromString( + "ZSSEditor.execFunctionForResult('getSelectedTextToLinkify');"); + } + }); + + try { + if (mGetSelectedTextCountDownLatch.await(1, TimeUnit.SECONDS)) { + dialogBundle.putString(LinkDialogFragment.LINK_DIALOG_ARG_TEXT, mJavaScriptResult); + } + } catch (InterruptedException e) { + AppLog.d(T.EDITOR, "Failed to obtain selected text from JS editor."); + } + + linkDialogFragment.setArguments(dialogBundle); + linkDialogFragment.show(getFragmentManager(), LinkDialogFragment.class.getSimpleName()); + } + }); + + thread.start(); + } + } + @Override public void onClick(View v) { int id = v.getId(); @@ -507,40 +579,7 @@ public void onClick(View v) { ((ToggleButton) v).setChecked(false); - LinkDialogFragment linkDialogFragment = new LinkDialogFragment(); - linkDialogFragment.setTargetFragment(this, LinkDialogFragment.LINK_DIALOG_REQUEST_CODE_ADD); - - Bundle dialogBundle = new Bundle(); - - // Pass potential URL from user clipboard - String clipboardUri = Utils.getUrlFromClipboard(getActivity()); - if (clipboardUri != null) { - dialogBundle.putString(LinkDialogFragment.LINK_DIALOG_ARG_URL, clipboardUri); - } - - // Pass selected text to dialog - if (mSourceView.getVisibility() == View.VISIBLE) { - // HTML mode - mSelectionStart = mSourceViewContent.getSelectionStart(); - mSelectionEnd = mSourceViewContent.getSelectionEnd(); - - String selectedText = mSourceViewContent.getText().toString().substring(mSelectionStart, mSelectionEnd); - dialogBundle.putString(LinkDialogFragment.LINK_DIALOG_ARG_TEXT, selectedText); - } else { - // Visual mode - mGetSelectedTextCountDownLatch = new CountDownLatch(1); - mWebView.execJavaScriptFromString("ZSSEditor.execFunctionForResult('getSelectedTextToLinkify');"); - try { - if (mGetSelectedTextCountDownLatch.await(1, TimeUnit.SECONDS)) { - dialogBundle.putString(LinkDialogFragment.LINK_DIALOG_ARG_TEXT, mJavaScriptResult); - } - } catch (InterruptedException e) { - AppLog.d(T.EDITOR, "Failed to obtain selected text from JS editor."); - } - } - - linkDialogFragment.setArguments(dialogBundle); - linkDialogFragment.show(getFragmentManager(), LinkDialogFragment.class.getSimpleName()); + displayLinkDialog(); } else { if (v instanceof ToggleButton) { onFormattingButtonClicked((ToggleButton) v); From ac1a4af3be8b6e95d1799ce2f82fca06a73577c0 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Thu, 21 Apr 2016 07:46:03 +0200 Subject: [PATCH 2/6] Squashed 'libs/editor/' changes from abfcce5..17887d3 17887d3 Merge pull request #354 from wordpress-mobile/issue/230-first-char-zw-space c5c0593 Added 'grave accent' keyCode to list of keyCodes ignored by paragraph handler 4156c10 Merge pull request #356 from wordpress-mobile/issue/353-title-html-entities e6344a1 Return plaintext for the title field in getHTMLForCallback, to avoid encoding HTML entities 4e38e7d Fixed hardcoded ZSSField name in handleKeyDownEvent f63c4fa Corrected a comment 6b1fb19 Merge branch 'develop' into issue/230-first-char-zw-space d066fbe On API 19, don't wrap the first line in paragraph tags - wait until first newline ecf7e40 s/wrappedDomNode()/getWrappedDomNode()/ 56eff9b Added editor-utils.js with some utility tag builder functions for ZSSEditor 9ec61ed Refactor ZSSEditor.resetSelectionOnField to accept an offset value for the range f4c135b Don't handle paragraph wrapping for non-printable keyCodes (hardware keyboards) git-subtree-dir: libs/editor git-subtree-split: 17887d367d19e3f94f6f0be18db334a38fa60899 --- .../editor-common/assets/ZSSRichTextEditor.js | 75 +++++++++++++------ libs/editor-common/assets/android-editor.html | 1 + libs/editor-common/assets/editor-utils.js | 13 ++++ 3 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 libs/editor-common/assets/editor-utils.js diff --git a/libs/editor-common/assets/ZSSRichTextEditor.js b/libs/editor-common/assets/ZSSRichTextEditor.js index 8b9bd271b726..6ee6c5ef4771 100755 --- a/libs/editor-common/assets/ZSSRichTextEditor.js +++ b/libs/editor-common/assets/ZSSRichTextEditor.js @@ -386,12 +386,14 @@ ZSSEditor.restoreRange = function(){ } }; -ZSSEditor.resetSelectionOnField = function(fieldId) { +ZSSEditor.resetSelectionOnField = function(fieldId, offset) { + offset = typeof offset !== 'undefined' ? offset : 0; + var query = "div#" + fieldId; var field = document.querySelector(query); var range = document.createRange(); - range.setStart(field, 0); - range.setEnd(field, 0); + range.setStart(field, offset); + range.setEnd(field, offset); var selection = document.getSelection(); selection.removeAllRanges(); @@ -554,12 +556,6 @@ ZSSEditor.getYCaretInfo = function() { return this.caretInfo; }; -// MARK: - Default paragraph separator - -ZSSEditor.defaultParagraphSeparatorTag = function() { - return '<' + this.defaultParagraphSeparator + '>'; -}; - // MARK: - Styles ZSSEditor.setBold = function() { @@ -638,7 +634,7 @@ ZSSEditor.setUnderline = function() { /** * @brief Turns blockquote ON or OFF for the current selection. * @details This method makes sure that the contents of the blockquotes are surrounded by the - * defaultParagraphSeparatorTag (by default '

'). This ensures parity with the web + * defaultParagraphSeparator tag (by default '

'). This ensures parity with the web * editor. */ ZSSEditor.setBlockquote = function() { @@ -682,9 +678,9 @@ ZSSEditor.setHeading = function(heading) { var formatBlock = document.queryCommandValue('formatBlock'); if (formatBlock.length > 0 && formatBlock.toLowerCase() == formatTag) { - document.execCommand('formatBlock', false, this.defaultParagraphSeparatorTag()); + document.execCommand('formatBlock', false, Util.buildOpeningTag(this.defaultParagraphSeparator)); } else { - document.execCommand('formatBlock', false, '<' + formatTag + '>'); + document.execCommand('formatBlock', false, Util.buildOpeningTag(formatTag)); } ZSSEditor.sendEnabledStyles(); @@ -695,9 +691,9 @@ ZSSEditor.setParagraph = function() { var formatBlock = document.queryCommandValue('formatBlock'); if (formatBlock.length > 0 && formatBlock.toLowerCase() == formatTag) { - document.execCommand('formatBlock', false, this.defaultParagraphSeparatorTag()); + document.execCommand('formatBlock', false, Util.buildOpeningTag(this.defaultParagraphSeparator)); } else { - document.execCommand('formatBlock', false, '<' + formatTag + '>'); + document.execCommand('formatBlock', false, Util.buildOpeningTag(formatTag)); } ZSSEditor.sendEnabledStyles(); @@ -790,8 +786,8 @@ ZSSEditor.setBackgroundColor = function(color) { */ ZSSEditor.insertHTMLWrappedInParagraphTags = function(html) { var space = '
'; - var paragraphOpenTag = '<' + this.defaultParagraphSeparator + '>'; - var paragraphCloseTag = ''; + var paragraphOpenTag = Util.buildOpeningTag(this.defaultParagraphSeparator); + var paragraphCloseTag = Util.buildClosingTag(this.defaultParagraphSeparator); if (this.getFocusedField().getHTML().length == 0) { html = paragraphOpenTag + html; @@ -816,7 +812,7 @@ ZSSEditor.insertLink = function(url, title) { var html = '' + title + ""; if (this.getFocusedField().getHTML().length == 0) { - html = '<' + this.defaultParagraphSeparator + '>' + html; + html = Util.buildOpeningTag(this.defaultParagraphSeparator) + html; } this.insertHTML(html); @@ -2785,7 +2781,7 @@ ZSSEditor.joinAdjacentSiblingsBlockquotes = function(node) { ZSSEditor.joinAdjacentSiblingsOrAncestorBlockquotes = function(node) { var currentNode = node; - var rootNode = this.getFocusedField().wrappedDomNode(); + var rootNode = this.getFocusedField().getWrappedDomNode(); var joined = false; while (currentNode @@ -3008,7 +3004,7 @@ function ZSSField(wrappedObject) { this.multiline = false; this.wrappedObject = wrappedObject; - if (this.wrappedDomNode().hasAttribute('nostyle')) { + if (this.getWrappedDomNode().hasAttribute('nostyle')) { this.hasNoStyle = true; } @@ -3080,9 +3076,35 @@ ZSSField.prototype.handleKeyDownEvent = function(e) { } else if (wasEnterPressed && !this.isMultiline()) { e.preventDefault(); } else if (this.isMultiline()) { - this.wrapCaretInParagraphIfNecessary(); + // For hardware keyboards, don't do any paragraph handling for non-printable keyCodes + // https://css-tricks.com/snippets/javascript/javascript-keycodes/ + // This avoids the filler zero-width space character from being inserted and displayed in the content field + // when special keys are pressed in new posts + var wasTabPressed = (e.keyCode == '9'); + var intKeyCode = parseInt(e.keyCode, 10); + if (wasTabPressed || (intKeyCode > 13 && intKeyCode < 46) || intKeyCode == 192) { + return; + } + + // This is intended to work around an API19-only bug where paragraph wrapping the first character in a post + // will display a zero-width space character (from ZSSField.wrapCaretInParagraphIfNecessary) + // We can drop the if statement wrapping wrapCaretInParagraphIfNecessary() if we find a way to stop using + // zero-width space characters (e.g., autocorrect issues are fixed and we switch back to p tags) + var containsParagraphSeparators = this.getWrappedDomNode().innerHTML.search( + '<' + ZSSEditor.defaultParagraphSeparator) > -1; + if (nativeState.androidApiLevel != 19 || containsParagraphSeparators) { + this.wrapCaretInParagraphIfNecessary(); + } if (wasEnterPressed) { + // Wrap the existing text in paragraph tags if necessary (this should only be needed if + // wrapCaretInParagraphIfNecessary() was skipped earlier (API19)) + var currentHtml = this.getWrappedDomNode().innerHTML; + if (currentHtml.search('<' + ZSSEditor.defaultParagraphSeparator) == -1) { + ZSSEditor.focusedField.setHTML(Util.wrapHTMLInTag(currentHtml, ZSSEditor.defaultParagraphSeparator)); + ZSSEditor.resetSelectionOnField(this.getWrappedDomNode().id, 1); + } + var sel = window.getSelection(); if (sel.rangeCount < 1) { return null; @@ -3358,7 +3380,7 @@ ZSSField.prototype.disableEditing = function () { ZSSField.prototype.wrapCaretInParagraphIfNecessary = function() { var closerParentNode = ZSSEditor.closerParentNode(); - var parentNodeShouldBeParagraph = (closerParentNode == this.wrappedDomNode() + var parentNodeShouldBeParagraph = (closerParentNode == this.getWrappedDomNode() || closerParentNode.nodeName == NodeName.BLOCKQUOTE); if (parentNodeShouldBeParagraph) { @@ -3419,7 +3441,14 @@ ZSSField.prototype.getHTML = function() { ZSSField.prototype.getHTMLForCallback = function() { var functionArgument = "function=getHTMLForCallback"; var idArgument = "id=" + this.getNodeId(); - var contentsArgument = "contents=" + this.getHTML(); + var contentsArgument; + + if (this.hasNoStyle) { + contentsArgument = "contents=" + this.strippedHTML(); + } else { + contentsArgument = "contents=" + this.getHTML(); + } + var joinedArguments = functionArgument + defaultCallbackSeparator + idArgument + defaultCallbackSeparator + contentsArgument; ZSSEditor.callback('callback-response-string', joinedArguments); @@ -3459,6 +3488,6 @@ ZSSField.prototype.setPlaceholderText = function(placeholder) { // MARK: - Wrapped Object -ZSSField.prototype.wrappedDomNode = function() { +ZSSField.prototype.getWrappedDomNode = function() { return this.wrappedObject[0]; }; diff --git a/libs/editor-common/assets/android-editor.html b/libs/editor-common/assets/android-editor.html index 623908c9e91a..0c4928be5fad 100755 --- a/libs/editor-common/assets/android-editor.html +++ b/libs/editor-common/assets/android-editor.html @@ -13,6 +13,7 @@ + diff --git a/libs/editor-common/assets/editor-utils.js b/libs/editor-common/assets/editor-utils.js new file mode 100644 index 000000000000..03655c267508 --- /dev/null +++ b/libs/editor-common/assets/editor-utils.js @@ -0,0 +1,13 @@ +function Util () {} + +Util.buildOpeningTag = function(tagName) { + return '<' + tagName + '>'; +}; + +Util.buildClosingTag = function(tagName) { + return ''; +}; + +Util.wrapHTMLInTag = function(html, tagName) { + return Util.buildOpeningTag(tagName) + html + Util.buildClosingTag(tagName); +}; \ No newline at end of file From 99075045579437eb0928d9fb5b363cf5d1774870 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Wed, 27 Apr 2016 09:10:48 +0200 Subject: [PATCH 3/6] Squashed 'libs/editor/' changes from 17887d3..8818dd1 8818dd1 Merge pull request #360 from wordpress-mobile/issue/344-remove-blockquotes a5b021d Check that parent blockquote is the first thing inside the post before applying afterKeyDownEvent fix ed096e2 Allow individual checks in afterKeyDownEvent to determine if they should go through if the HTML hasn't changed 2206af5 In afterKeyDownEvent, compare before and after HTML and quit if they're the same 23ec38e Refactored afterKeyDownEvent for readability ae65514 Added generic giveFocusToElement method cb8cccd Fixed an issue where backspacing doesn't remove a blockquote when it's at the start of a post with more content below it 8f20ff5 Added ZSSField.afterKeyDownEvent, which is called after the results of a keydown event have taken effect c949332 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Editor-Android into develop 7ce2aa7 Merge branch 'issue/315-paste-fixes' into develop a00e762 Merge pull request #358 from wordpress-mobile/issue/315-paste-fixes 4a6b534 Merge pull request #357 from wordpress-mobile/issue/350-fix-newlines-api16 edf8b4f Fixed an issue with incorrect paragraph wrapping when starting a post with a blockquote 822ce8f update comment b8a90b2 Fix newlines when switching to HTML mode on API <= 16 26b7be5 Merge commit 'ac1a4af3be8b6e95d1799ce2f82fca06a73577c0' into develop 1215bdd Make sure text is wrapped in paragraph tags when adding blockquotes f16e222 Wrap hardware pastes in paragraph tags in empty posts 5e9559f Fix software paste on API<19 by wrapping the paste in paragraph tags after the fact, when a new line is entered 61e5cf3 Wrap software pastes in paragraph tags for API19+ for empty posts 458b6cf Merge pull request #3967 from wordpress-mobile/issue/328editor-track-reflection-failure 9e112be Merge pull request #3961 from wordpress-mobile/issue/3930-crash-when-adding-invalid-image cf7b400 Merge commit 'be4aac09995c4a35b2354854ef0f3ff5b1ae07e7' into develop 7885bca Use a static listener to handle reflection failures 182e5ef Updates the p/div conversion regex to more strictly match tags eba46dd Move the addMediaFile logic in an AsyncTask, only WPEditImageSpan construction now lives in a background thread git-subtree-dir: libs/editor git-subtree-split: 8818dd1d120140283da46b40b7ad7fc59d772def --- .../android/editor/EditorWebViewAbstract.java | 4 +- .../editor/EditorWebViewCompatibility.java | 50 +++++-- .../android/editor/LegacyEditorFragment.java | 124 ++++++++++-------- .../editor-common/assets/ZSSRichTextEditor.js | 115 ++++++++++++++-- 4 files changed, 213 insertions(+), 80 deletions(-) diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewAbstract.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewAbstract.java index 7b94adfe3250..eddff2f717b9 100644 --- a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewAbstract.java +++ b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewAbstract.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.net.HttpURLConnection; +import java.net.URLDecoder; import java.util.HashMap; import java.util.Map; @@ -60,7 +61,8 @@ private void configureWebView() { @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { if (url != null && url.startsWith("callback") && mJsCallbackReceiver != null) { - String[] split = url.split(":", 2); + String data = URLDecoder.decode(url); + String[] split = data.split(":", 2); String callbackId = split[0]; String params = (split.length > 1 ? split[1] : ""); mJsCallbackReceiver.executeCallback(callbackId, params); diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewCompatibility.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewCompatibility.java index 714f87ac8763..4f72868b5937 100644 --- a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewCompatibility.java +++ b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorWebViewCompatibility.java @@ -18,30 +18,52 @@ * JavaScript, {@link #loadJavaScript(String)}, instead of {@link WebView#loadUrl(String)}. This is needed because * WebView#loadUrl(String) on API<19 eventually calls WebViewClassic#hideSoftKeyboard(), * hiding the keyboard whenever JavaScript is executed.

- * + *

*

This class uses reflection to access the normally inaccessible WebViewCore#sendMessage(Message) * and use it to execute JavaScript, sidestepping WebView#loadUrl(String) and the keyboard issue.

*/ @SuppressWarnings("TryWithIdenticalCatches") public class EditorWebViewCompatibility extends EditorWebViewAbstract { + public interface ReflectionFailureListener { + void onReflectionFailure(ReflectionException e); + } + + public class ReflectionException extends Exception { + public ReflectionException(Throwable cause) { + super(cause); + } + } + private static final int EXECUTE_JS = 194; // WebViewCore internal JS message code private Object mWebViewCore; private Method mSendMessageMethod; + // Dirty static listener, but it's impossible to set the listener during the construction if we want to keep + // the xml layout + private static ReflectionFailureListener mReflectionFailureListener; + private boolean mReflectionSucceed = true; + + public static void setReflectionFailureListener(ReflectionFailureListener reflectionFailureListener) { + mReflectionFailureListener = reflectionFailureListener; + } + public EditorWebViewCompatibility(Context context, AttributeSet attrs) { super(context, attrs); try { this.initReflection(); } catch (ReflectionException e) { AppLog.e(T.EDITOR, e); - handleReflectionFailure(); + handleReflectionFailure(e); } } private void initReflection() throws ReflectionException { + if (!mReflectionSucceed) { + // Reflection failed once already, it won't succeed on a second try + return; + } Object webViewProvider; - try { if (Build.VERSION.SDK_INT >= 16) { // On API >= 16, the WebViewCore instance is not defined inside WebView itself but inside a @@ -58,7 +80,6 @@ private void initReflection() throws ReflectionException { mWebViewCore = webViewCoreField.get(webViewProvider); } else { // On API < 16, the WebViewCore is directly accessible from the WebView - // Access WebViewCore object Field webViewCoreField = WebView.class.getDeclaredField("mWebViewCore"); webViewCoreField.setAccessible(true); @@ -97,19 +118,22 @@ private void loadJavaScript(final String javaScript) throws ReflectionException public void execJavaScriptFromString(String javaScript) { try { loadJavaScript(javaScript); - } catch(ReflectionException e) { + } catch (ReflectionException e) { AppLog.e(T.EDITOR, e); - handleReflectionFailure(); + handleReflectionFailure(e); } } - private void handleReflectionFailure() { - // TODO: Fallback to legacy editor and pass the error to analytics + private void handleReflectionFailure(ReflectionException e) { + if (mReflectionFailureListener != null) { + mReflectionFailureListener.onReflectionFailure(e); + } + mReflectionSucceed = false; } - public class ReflectionException extends Exception { - public ReflectionException(Throwable cause) { - super(cause); - } + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + mReflectionFailureListener = null; } -} \ No newline at end of file +} diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java index e3d142e96b59..246082504cc7 100644 --- a/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java +++ b/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java @@ -9,9 +9,8 @@ import android.graphics.BitmapFactory; import android.graphics.Typeface; import android.net.Uri; +import android.os.AsyncTask; import android.os.Bundle; -import android.os.Handler; -import android.os.Looper; import android.os.Parcelable; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; @@ -1023,66 +1022,83 @@ public void onSaveInstanceState(Bundle outState) { outState.putString(KEY_CONTENT, mContentEditText.getText().toString()); } - public void addMediaFile(final MediaFile mediaFile, final String imageUrl, final ImageLoader imageLoader, final int start, final int end) { - mediaFile.setFileURL(imageUrl); - mediaFile.setFilePath(imageUrl); - final WPEditImageSpan imageSpan = createWPEditImageSpan(getActivity(), mediaFile); - mEditorFragmentListener.saveMediaFile(mediaFile); - imageSpan.setMediaFile(mediaFile); + private class AddMediaFileTask extends AsyncTask { + private MediaFile mMediaFile; + private String mImageUrl; + private ImageLoader mImageLoader; + private int mStart; + private int mEnd; + + public AddMediaFileTask(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader, int start, int end) { + mMediaFile = mediaFile; + mImageUrl = imageUrl; + mImageLoader = imageLoader; + mStart = start; + mEnd = end; + } - Handler handler = new Handler(Looper.getMainLooper()); - final Runnable r = new Runnable() { - @Override - public void run() { - // Insert the WPImageSpan in the content field - int selectionStart = start; - int selectionEnd = end; - - if (selectionStart > selectionEnd) { - int temp = selectionEnd; - selectionEnd = selectionStart; - selectionStart = temp; - } + protected WPEditImageSpan doInBackground(Void... voids) { + mMediaFile.setFileURL(mImageUrl); + mMediaFile.setFilePath(mImageUrl); + WPEditImageSpan imageSpan = createWPEditImageSpan(getActivity(), mMediaFile); + mEditorFragmentListener.saveMediaFile(mMediaFile); + return imageSpan; + } - imageSpan.setPosition(selectionStart, selectionEnd); + protected void onPostExecute(WPEditImageSpan imageSpan) { + // Insert the WPImageSpan in the content field + int selectionStart = mStart; + int selectionEnd = mEnd; - int line, column = 0; - if (mContentEditText.getLayout() != null) { - line = mContentEditText.getLayout().getLineForOffset(selectionStart); - column = selectionStart - mContentEditText.getLayout().getLineStart(line); - } + if (selectionStart > selectionEnd) { + int temp = selectionEnd; + selectionEnd = selectionStart; + selectionStart = temp; + } - Editable s = mContentEditText.getText(); - if (s == null) { - return; - } + imageSpan.setPosition(selectionStart, selectionEnd); - WPImageSpan[] imageSpans = s.getSpans(selectionStart, selectionEnd, WPImageSpan.class); - if (imageSpans.length != 0) { - // insert a few line breaks if the cursor is already on an image - s.insert(selectionEnd, "\n\n"); - selectionStart = selectionStart + 2; - selectionEnd = selectionEnd + 2; - } else if (column != 0) { - // insert one line break if the cursor is not at the first column - s.insert(selectionEnd, "\n"); - selectionStart = selectionStart + 1; - selectionEnd = selectionEnd + 1; - } + int line, column = 0; + if (mContentEditText.getLayout() != null) { + line = mContentEditText.getLayout().getLineForOffset(selectionStart); + column = selectionStart - mContentEditText.getLayout().getLineStart(line); + } - s.insert(selectionStart, " "); - s.setSpan(imageSpan, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - AlignmentSpan.Standard as = new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER); - s.setSpan(as, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - s.insert(selectionEnd + 1, "\n\n"); + Editable s = mContentEditText.getText(); + if (s == null) { + return; + } - // Fetch and replace the WPImageSpan if it's a remote media - if (imageLoader != null && URLUtil.isNetworkUrl(imageUrl)) { - loadWPImageSpanThumbnail(mediaFile, imageUrl, imageLoader); - } + WPImageSpan[] imageSpans = s.getSpans(selectionStart, selectionEnd, WPImageSpan.class); + if (imageSpans.length != 0) { + // insert a few line breaks if the cursor is already on an image + s.insert(selectionEnd, "\n\n"); + selectionStart = selectionStart + 2; + selectionEnd = selectionEnd + 2; + } else if (column != 0) { + // insert one line break if the cursor is not at the first column + s.insert(selectionEnd, "\n"); + selectionStart = selectionStart + 1; + selectionEnd = selectionEnd + 1; } - }; - handler.postDelayed(r, 1); + + s.insert(selectionStart, " "); + s.setSpan(imageSpan, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + AlignmentSpan.Standard as = new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER); + s.setSpan(as, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + s.insert(selectionEnd + 1, "\n\n"); + + // Fetch and replace the WPImageSpan if it's a remote media + if (mImageLoader != null && URLUtil.isNetworkUrl(mImageUrl)) { + loadWPImageSpanThumbnail(mMediaFile, mImageUrl, mImageLoader); + } + } + } + + public void addMediaFile(final MediaFile mediaFile, final String imageUrl, final ImageLoader imageLoader, + final int start, final int end) { + AddMediaFileTask addMediaFileTask = new AddMediaFileTask(mediaFile, imageUrl, imageLoader, start, end); + addMediaFileTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } @Override diff --git a/libs/editor-common/assets/ZSSRichTextEditor.js b/libs/editor-common/assets/ZSSRichTextEditor.js index 6ee6c5ef4771..a6bd7bd2286b 100755 --- a/libs/editor-common/assets/ZSSRichTextEditor.js +++ b/libs/editor-common/assets/ZSSRichTextEditor.js @@ -387,13 +387,18 @@ ZSSEditor.restoreRange = function(){ }; ZSSEditor.resetSelectionOnField = function(fieldId, offset) { - offset = typeof offset !== 'undefined' ? offset : 0; - var query = "div#" + fieldId; var field = document.querySelector(query); + + this.giveFocusToElement(field, offset); +}; + +ZSSEditor.giveFocusToElement = function(element, offset) { + offset = typeof offset !== 'undefined' ? offset : 0; + var range = document.createRange(); - range.setStart(field, offset); - range.setEnd(field, offset); + range.setStart(element, offset); + range.setEnd(element, offset); var selection = document.getSelection(); selection.removeAllRanges(); @@ -644,6 +649,13 @@ ZSSEditor.setBlockquote = function() { var range = selection.getRangeAt(0).cloneRange(); var sendStyles = false; + // Make sure text being wrapped in blockquotes is inside paragraph tags + // (should be
contents
) + var currentHtml = ZSSEditor.focusedField.getWrappedDomNode().innerHTML; + if (currentHtml.search('<' + ZSSEditor.defaultParagraphSeparator) == -1) { + ZSSEditor.focusedField.setHTML(Util.wrapHTMLInTag(currentHtml, ZSSEditor.defaultParagraphSeparator)); + } + var ancestorElement = this.getAncestorElementForSettingBlockquote(range); if (ancestorElement) { @@ -3024,6 +3036,9 @@ ZSSField.prototype.bindListeners = function() { this.wrappedObject.bind('input', function(e) { thisObj.handleInputEvent(e); }); this.wrappedObject.bind('compositionstart', function(e) { thisObj.handleCompositionStartEvent(e); }); this.wrappedObject.bind('compositionend', function(e) { thisObj.handleCompositionEndEvent(e); }); + + // Only supported on API19+ + this.wrappedObject.on('paste', function(e) { thisObj.handlePasteEvent(e); }); }; // MARK: - Emptying the field when it should be, well... empty (HTML madness) @@ -3071,6 +3086,9 @@ ZSSField.prototype.handleKeyDownEvent = function(e) { var wasEnterPressed = (e.keyCode == '13'); + // Handle keyDownEvent actions that need to happen after the event has completed (and the field has been modified) + setTimeout(this.afterKeyDownEvent, 20, e.target.innerHTML, e); + if (this.isComposing) { e.stopPropagation(); } else if (wasEnterPressed && !this.isMultiline()) { @@ -3086,13 +3104,25 @@ ZSSField.prototype.handleKeyDownEvent = function(e) { return; } - // This is intended to work around an API19-only bug where paragraph wrapping the first character in a post - // will display a zero-width space character (from ZSSField.wrapCaretInParagraphIfNecessary) + // The containsParagraphSeparators check is intended to work around three bugs: + // 1. On API19 only, paragraph wrapping the first character in a post will display a zero-width space character + // (from ZSSField.wrapCaretInParagraphIfNecessary) // We can drop the if statement wrapping wrapCaretInParagraphIfNecessary() if we find a way to stop using // zero-width space characters (e.g., autocorrect issues are fixed and we switch back to p tags) + // + // 2. On all APIs, software pasting (long press -> paste) doesn't automatically wrap the paste in paragraph + // tags in new posts. On API19+ this is corrected by ZSSField.handlePasteEvent(), but earlier APIs don't support + // it. So, instead, we allow the editor not to wrap the paste in paragraph tags and it's automatically corrected + // after adding a newline. But allowing wrapCaretInParagraphIfNecessary() to go through will wrap the paragraph + // incorrectly, so we skip it in this case. + // + // 3. On all APIs, hardware pasting (CTRL + V) doesn't automatically wrap the paste in paragraph tags in + // new posts. ZSSField.handlePasteEvent() does not address this problem. It's the same fix as #2 above, but we + // have to extend the `containsParagraphSeparators` check to all APIs, not just API19 and below, to fix + // hardware pasting. var containsParagraphSeparators = this.getWrappedDomNode().innerHTML.search( '<' + ZSSEditor.defaultParagraphSeparator) > -1; - if (nativeState.androidApiLevel != 19 || containsParagraphSeparators) { + if (containsParagraphSeparators) { this.wrapCaretInParagraphIfNecessary(); } @@ -3252,6 +3282,50 @@ ZSSField.prototype.handleTapEvent = function(e) { } }; +ZSSField.prototype.handlePasteEvent = function(e) { + if (this.isMultiline() && this.getHTML().length == 0) { + ZSSEditor.insertHTML(Util.wrapHTMLInTag('​', ZSSEditor.defaultParagraphSeparator)); + } +}; + +/** + * @brief Fires after 'keydown' events, when the field contents have already been modified + */ +ZSSField.prototype.afterKeyDownEvent = function(beforeHTML, e) { + var htmlWasModified = (beforeHTML != e.target.innerHTML); + + var selection = document.getSelection(); + var range = selection.getRangeAt(0).cloneRange(); + var focusedNode = range.startContainer; + + var focusedNodeIsEmpty = (focusedNode.innerHTML != undefined + && (focusedNode.innerHTML.length == 0 || focusedNode.innerHTML == '
')); + + // Blockquote handling + if (focusedNode.nodeName == NodeName.BLOCKQUOTE && focusedNodeIsEmpty) { + if (!htmlWasModified) { + // We only want to handle this if the last character inside a blockquote was just deleted - if the HTML + // is unchanged, it might be that afterKeyDownEvent was called too soon, and we should avoid doing anything + return; + } + + // When using backspace to delete the contents of a blockquote, the div within the blockquote is deleted + // This makes the blockquote unable to be deleted using backspace, and also causes autocorrect issues on API19+ + range.startContainer.innerHTML = Util.wrapHTMLInTag('
', ZSSEditor.defaultParagraphSeparator); + + // Give focus to new div + var newFocusElement = focusedNode.firstChild; + ZSSEditor.giveFocusToElement(newFocusElement, 1); + } else if (focusedNode.nodeName == NodeName.DIV && focusedNode.parentNode.nodeName == NodeName.BLOCKQUOTE + && focusedNode.parentNode.previousSibling == null && focusedNode.parentNode.childNodes.length == 1 + && focusedNodeIsEmpty) { + // When a post begins with a blockquote, and there's content after that blockquote, backspacing inside that + // blockquote will work until the blockquote is empty. After that, backspace will have no effect + // This fix identifies that situation and makes the call to setBlockquote() to toggle off the blockquote + ZSSEditor.setBlockquote(); + } +}; + ZSSField.prototype.sendImageTappedCallback = function(imageNode) { var meta = JSON.stringify(ZSSEditor.extractImageMeta(imageNode)); var imageId = "", mediaType = "image"; @@ -3383,13 +3457,23 @@ ZSSField.prototype.wrapCaretInParagraphIfNecessary = function() var parentNodeShouldBeParagraph = (closerParentNode == this.getWrappedDomNode() || closerParentNode.nodeName == NodeName.BLOCKQUOTE); - if (parentNodeShouldBeParagraph) { + // When starting a post with a blockquote (before any text is entered), the paragraph tags inside the blockquote + // won't properly wrap the text once it's entered + // In that case, remove the paragraph tags and re-apply them, wrapping around the newly entered text + var fixNewPostBlockquoteBug = (closerParentNode.nodeName == NodeName.DIV + && closerParentNode.parentNode.nodeName == NodeName.BLOCKQUOTE + && closerParentNode.innerHTML.length == 0); + + if (parentNodeShouldBeParagraph || fixNewPostBlockquoteBug) { var selection = window.getSelection(); if (selection && selection.rangeCount > 0) { var range = selection.getRangeAt(0); if (range.startContainer == range.endContainer) { + if (fixNewPostBlockquoteBug) { + closerParentNode.parentNode.removeChild(closerParentNode); + } var paragraph = document.createElement("div"); var textNode = document.createTextNode("​"); @@ -3431,7 +3515,7 @@ ZSSField.prototype.isEmpty = function() { ZSSField.prototype.getHTML = function() { var html = this.wrappedObject.html(); if (ZSSEditor.defaultParagraphSeparator == 'div') { - html = html.replace(/(/igm, '

'); + html = html.replace(/(\s]))/igm, '/igm, '

'); } html = wp.saveText(html); html = ZSSEditor.removeVisualFormatting( html ); @@ -3446,9 +3530,16 @@ ZSSField.prototype.getHTMLForCallback = function() { if (this.hasNoStyle) { contentsArgument = "contents=" + this.strippedHTML(); } else { - contentsArgument = "contents=" + this.getHTML(); + var html; + if (nativeState.androidApiLevel < 17) { + // URI Encode HTML on API < 17 because of the use of WebViewClient.shouldOverrideUrlLoading. Data must + // be decoded in shouldOverrideUrlLoading. + html = encodeURIComponent(this.getHTML()); + } else { + html = this.getHTML(); + } + contentsArgument = "contents=" + html; } - var joinedArguments = functionArgument + defaultCallbackSeparator + idArgument + defaultCallbackSeparator + contentsArgument; ZSSEditor.callback('callback-response-string', joinedArguments); @@ -3470,7 +3561,7 @@ ZSSField.prototype.setHTML = function(html) { if (ZSSEditor.defaultParagraphSeparator == 'div') { // Replace the paragraph tags we get from wpload with divs - mutatedHTML = mutatedHTML.replace(/(/igm, ''); + mutatedHTML = mutatedHTML.replace(/(\s]))/igm, '/igm, ''); } this.wrappedObject.html(mutatedHTML); From 4542685e8fcd0e490279dde87f9ac3d8887bc0af Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Sun, 1 May 2016 14:38:05 +0100 Subject: [PATCH 4/6] Squashed 'libs/editor/' changes from 8818dd1..0b74389 0b74389 Merge pull request #364 from wordpress-mobile/issue/227-list-paragraph-formatting 2d1ea2a Merge pull request #363 from wordpress-mobile/issue/345-blockquote-links b6a7d2e Merge pull request #366 from wordpress-mobile/issue/365-link-indexsizeerror a3af084 Fixed IndexSizeError issue when inserting links in an empty post c4c8986 Adjusted spacing for text expansion methods b518a34 When exiting a list while the current list item is not empty, wrap the un-listed text in a paragraph node ca00128 Fixed mistake in method call in ZSSEditor.previousNode 0a14286 Ignore break tags when finding the end of a range container a25bf35 Don't wrap links inside blockquotes in paragraph tags if they're not at either end of the line 8420ab5 Don't wrap links in paragraph tags when the blockquote is empty 67939fa Wrap links in paragraph tags when inside blockquotes 6abc921 Merge pull request #362 from wordpress-mobile/issue/361-old-api-upload-css b392660 Add 'uploading' class to media regardless of progress bar status a13b162 Merge pull request #4024 from wordpress-mobile/feature/update-gradle-plugin bfb702a Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 e0e7156 Merge commit 'ac1a4af3be8b6e95d1799ce2f82fca06a73577c0' into develop 8bbe028 Merge pull request #3967 from wordpress-mobile/issue/328editor-track-reflection-failure 423bbb2 Merge pull request #3961 from wordpress-mobile/issue/3930-crash-when-adding-invalid-image 13c5880 Merge commit 'be4aac09995c4a35b2354854ef0f3ff5b1ae07e7' into develop 2bc7b91 Use a static listener to handle reflection failures 3754128 Updates the p/div conversion regex to more strictly match tags 43bab5e Move the addMediaFile logic in an AsyncTask, only WPEditImageSpan construction now lives in a background thread git-subtree-dir: libs/editor git-subtree-split: 0b74389ff2200e00d3db27be6087261638dafcca --- WordPressEditor/build.gradle | 2 +- example/build.gradle | 2 +- .../editor-common/assets/ZSSRichTextEditor.js | 99 +++++++++++++------ libs/editor-common/assets/editor-utils.js | 13 +++ 4 files changed, 84 insertions(+), 32 deletions(-) diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle index acf399d72ce6..e1ae09e47175 100644 --- a/WordPressEditor/build.gradle +++ b/WordPressEditor/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0' + classpath 'com.android.tools.build:gradle:2.1.0' } } diff --git a/example/build.gradle b/example/build.gradle index 6fdfd5842919..6b2ba500d795 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0' + classpath 'com.android.tools.build:gradle:2.1.0' } } diff --git a/libs/editor-common/assets/ZSSRichTextEditor.js b/libs/editor-common/assets/ZSSRichTextEditor.js index a6bd7bd2286b..eba001cf342e 100755 --- a/libs/editor-common/assets/ZSSRichTextEditor.js +++ b/libs/editor-common/assets/ZSSRichTextEditor.js @@ -411,29 +411,39 @@ ZSSEditor.getSelectedText = function() { }; ZSSEditor.canExpandBackward = function(range) { - var caretRange = range.cloneRange(); - if (range.startOffset == 0) { - return false; - } - caretRange.setStart(range.startContainer, range.startOffset - 1); - caretRange.setEnd(range.startContainer, range.startOffset); - if (!caretRange.toString().match(/\w/)) { - return false; - } - return true; + // Can't expand if focus is not a text node + if (!range.endContainer.nodeType == 3) { + return false; + } + var caretRange = range.cloneRange(); + if (range.startOffset == 0) { + return false; + } + caretRange.setStart(range.startContainer, range.startOffset - 1); + caretRange.setEnd(range.startContainer, range.startOffset); + if (!caretRange.toString().match(/\w/)) { + return false; + } + return true; }; ZSSEditor.canExpandForward = function(range) { - var caretRange = range.cloneRange(); - if (range.endOffset == range.endContainer.length) { - return false; - } - caretRange.setStart(range.endContainer, range.endOffset); - caretRange.setEnd(range.endContainer, range.endOffset + 1); - if (!caretRange.toString().match(/\w/)) { - return false; - } - return true; + // Can't expand if focus is not a text node + if (!range.endContainer.nodeType == 3) { + return false; + } + var caretRange = range.cloneRange(); + if (range.endOffset == range.endContainer.length) { + return false; + } + caretRange.setStart(range.endContainer, range.endOffset); + if (range.endOffset ) + caretRange.setEnd(range.endContainer, range.endOffset + 1); + var strin = caretRange.toString(); + if (!caretRange.toString().match(/\w/)) { + return false; + } + return true; }; ZSSEditor.getSelectedTextToLinkify = function() { @@ -818,12 +828,25 @@ ZSSEditor.insertHTMLWrappedInParagraphTags = function(html) { this.insertHTML(paragraphOpenTag + space + paragraphCloseTag); }; -// Needs addClass method - ZSSEditor.insertLink = function(url, title) { var html = '' + title + ""; - if (this.getFocusedField().getHTML().length == 0) { + var parentBlockQuoteNode = ZSSEditor.closerParentNodeWithName('blockquote'); + + var currentRange = document.getSelection().getRangeAt(0); + var currentNode = currentRange.startContainer; + var currentNodeIsEmpty = (currentNode.innerHTML == '' || currentNode.innerHTML == '
'); + + var selectionIsAtStartOrEnd = Util.rangeIsAtStartOfParent(currentRange) || Util.rangeIsAtEndOfParent(currentRange); + + if (this.getFocusedField().getHTML().length == 0 + || (parentBlockQuoteNode && !currentNodeIsEmpty && selectionIsAtStartOrEnd)) { + // Wrap the link tag in paragraph tags when the post is empty, and also when inside a blockquote + // The latter is to fix a bug with document.execCommand('insertHTML') inside a blockquote, where the div inside + // the blockquote is ignored and the link tag is inserted outside it, on a new line with no wrapping div + // Wrapping the link in paragraph tags makes insertHTML join it to the existing div, for some reason + // We exclude being on an empty line inside a blockquote and when the selection isn't at the beginning or end + // of the line, as the fix is unnecessary in both those cases and causes paragraph formatting issues html = Util.buildOpeningTag(this.defaultParagraphSeparator) + html; } @@ -1037,15 +1060,15 @@ ZSSEditor.setProgressOnMedia = function(mediaNodeIdentifier, progress) { var mediaNode = this.getMediaNodeWithIdentifier(mediaNodeIdentifier); var mediaProgressNode = this.getMediaProgressNodeWithIdentifier(mediaNodeIdentifier); + if (progress == 0) { + mediaNode.addClass("uploading"); + } + // Don't allow the progress bar to move backward if (mediaNode.length == 0 || mediaProgressNode.length == 0 || mediaProgressNode.attr("value") > progress) { return; } - if (progress == 0) { - mediaNode.addClass("uploading"); - } - // Revert to non-compatibility image container once image upload has begun. This centers the overlays on the image // (instead of the screen), while still circumventing the small container bug the compat class was added to fix if (progress > 0) { @@ -2579,7 +2602,7 @@ ZSSEditor.previousNode = function(node) { return node; } var parent = node.parentNode; - if (parent && parent.nodeType.hasChildNodes()) { + if (parent && parent.hasChildNodes()) { return parent; } return null; @@ -2606,8 +2629,24 @@ ZSSEditor.completeListEditing = function() { if (node.nodeType == 1 && (node.tagName.toUpperCase() == NodeName.UL || node.tagName.toUpperCase() == NodeName.OL)) { - // Make a new P node as a sibling to the parent node - document.execCommand('insertParagraph', false); + + var focusedNode = document.getSelection().getRangeAt(0).startContainer; + + if (focusedNode.nodeType == 3) { + // If the focused node is a text node, the list item was not empty when toggled off + // Wrap the text in a div and attach it as a sibling to the div wrapping the list + var parentParagraph = focusedNode.parentNode; + var paragraph = document.createElement('div'); + + paragraph.appendChild(focusedNode); + parentParagraph.insertAdjacentElement('afterEnd', paragraph); + + ZSSEditor.giveFocusToElement(paragraph, 1); + } else { + // Attach a new paragraph node as a sibling to the parent node + document.execCommand('insertParagraph', false); + } + // Remove any superfluous
tags that are created ZSSEditor.scrubBRFromNode(node.parentNode); break; diff --git a/libs/editor-common/assets/editor-utils.js b/libs/editor-common/assets/editor-utils.js index 03655c267508..5c211d153056 100644 --- a/libs/editor-common/assets/editor-utils.js +++ b/libs/editor-common/assets/editor-utils.js @@ -1,5 +1,7 @@ function Util () {} +/* Tag building */ + Util.buildOpeningTag = function(tagName) { return '<' + tagName + '>'; }; @@ -10,4 +12,15 @@ Util.buildClosingTag = function(tagName) { Util.wrapHTMLInTag = function(html, tagName) { return Util.buildOpeningTag(tagName) + html + Util.buildClosingTag(tagName); +}; + +/* Selection */ + +Util.rangeIsAtStartOfParent = function(range) { + return (range.startContainer.previousSibling == null && range.startOffset == 0); +}; + +Util.rangeIsAtEndOfParent = function(range) { + return ((range.startContainer.nextSibling == null || range.startContainer.nextSibling == "
") + && range.endOffset == range.endContainer.length); }; \ No newline at end of file From 3b37573c3bef0da83e7c0991c3ddd7069ea34947 Mon Sep 17 00:00:00 2001 From: Alex Forcier Date: Mon, 2 May 2016 10:12:49 -0400 Subject: [PATCH 5/6] Squashed 'libs/editor/' changes from 0b74389..31b66df 31b66df 1.0 version bump d8cfe4a Merge commit '4542685e8fcd0e490279dde87f9ac3d8887bc0af' into develop afc78d8 Merge pull request #4024 from wordpress-mobile/feature/update-gradle-plugin 004c6f7 Merge commit '99075045579437eb0928d9fb5b363cf5d1774870' into develop fb0e980 Updating gradle plugin to 2.1.0 for Android Studio 2.1.0 6c4808f Merge commit 'ac1a4af3be8b6e95d1799ce2f82fca06a73577c0' into develop 9ae36fe Merge pull request #3967 from wordpress-mobile/issue/328editor-track-reflection-failure ababd1c Merge pull request #3961 from wordpress-mobile/issue/3930-crash-when-adding-invalid-image 2ce6b79 Merge commit 'be4aac09995c4a35b2354854ef0f3ff5b1ae07e7' into develop ffad17f Use a static listener to handle reflection failures 544415f Updates the p/div conversion regex to more strictly match tags dded955 Move the addMediaFile logic in an AsyncTask, only WPEditImageSpan construction now lives in a background thread 318297e Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop 33becb0 Merge commit '52910dd0664cf2031a6a1c78f3cb1b170a4eeff9' into issue/editor-p-to-div-update 0a0f0b3 Merge branch 'develop' into issue/editor-p-to-div-update 58a956e Merge pull request #3931 from wordpress-mobile/issue/fix-placeholder-title-in-french d61bf92 Merge commit 'd2f7ed4e05fa13e80fbe573f043fac43baf5e0b1' into issue/editor-p-to-div-update c8e62e4 Updating to gradle 2.0 9d753ca Updating to rc3 593ebad Escape quotes on translated strings when calling execJavaScriptFromString 58f5af0 Merge commit 'c5b98a88c01551e8dbf44366072607d364ec01dd' into develop 254b0ff Merge pull request #3919 from wordpress-mobile/issue/update-build-tools ff52240 Merge branch 'release/5.2' into release/5.3 ea50456 Updating the rest of the modules to buildToolsVersion 23.0.3 6242f89 Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop c3b97db Add missing classes for images inserted from media library - also fix a bug with undefined alt text 121472f Add missing attributes for uploaded images 2ad3224 update to android-gradle-2.0.0-rc1 9a21aea upgrade to gradle plugin 2.0.0-beta7 bd82e4a Merge commit 'c6efe0a9190244d40e64300efc9cca56ae5acd5c' into develop be6ebe4 Merge branch 'develop' into issue/120editor-initial-focus b3a84ec Merge commit '9b0b5fab24db9f435b278ad0b9e77d5895135700' into develop 36a6e42 Merge pull request #3897 from wordpress-mobile/issue/260editor-clear-failed-images-on-upload 1e94c99 Null check getParentRangeOfFocusedNode/setRange in onMutationObserved - in case editor is not in focus 5a54839 Show the software keyboard once the DOM has loaded 64e33ad Focus on the title field when opening posts 8f7ffc0 New EditorFragment method to removeAllFailedMediaUploads() d6e1ad4 New JS function ZSSEditor.removeAllFailedMediaUploads 4a37325 Merge pull request #3896 from wordpress-mobile/issue/300editor-broken-images-after-upload-2 ed8dd88 remove debug logs f57b0dc Use remoteurl in the link wrapper 08d94e3 Merge branch 'develop' into issue/300editor-broken-images-after-upload-2 942aae0 Merge branch 'develop' into issue/297editor-backspace-media 6b9a904 update to com.android.tools.build:gradle:2.0.0-beta7 29760e3 Merge branch 'develop' into issue/297editor-backspace-media b1a7083 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop 6b30bb4 Changed MutationObserver handling to check if the WebView supports it, rather than rely on API levels 821761e Refactor: grouped mutation observation methods together a3dcf52 Refactored DOM element mutation listening, delegating everything to one trackNodeForMutation method ccef356 Changed MutationObserver behavior to track individual media nodes instead of each contenteditable div 4ea4f78 Moved failed media methods to the generic media method group 2092016 Parse for failed media when returning from HTML to visual mode 5100726 Track DOMNodeRemoved events when parsing for failed media 1a19b59 Fixed a variable name error in ZSSEditor.removeImage ed7f31a On API<19, use DOMNodeRemoved events to track media deletions (instead of the unsupported MutationObserver used for newer APIs) f486c02 Merge branch 'develop' into issue/297editor-backspace-media f9567c6 Merge pull request #3804 from wordpress-mobile/issue/enable-editor-debug-mode c5c01c9 Consume KEYCODE_VOLUME_UP event when debug print is called 130483c Merge commit 'a299686f47294c20ef04e818585f1d27cf069876' into develop 5e5b844 broken retries d75ff0e Merge branch 'issue/enable-editor-debug-mode' into issue/300editor-broken-images-after-upload-2 af79e8f use a remoteUrl attribute to avoid seeing broken image if download failed 5810af1 remove debug action bar button and log raw html when volume up button is pressed f4b7ac1 fix function call errors 9139f65 Add back image swapping onError ef45a99 Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop 806b6bf fix wordpress-mobile/WordPress-Editor-Android#300: Retry download onError after an upload 549a6fc add missing comment d520eff Updated gradle to 2.0.0-beta6 d439504 Fixes an issue where manually deleting uploading/failed media will cause the caret to disappear 0cc5dfd Notify native through a callback whenever uploading/failed media are manually deleted 96700b9 catch a common JS exception b635d38 Merge branch 'develop' into issue/288editor-log-js-errors-in-crashlytics a3686a8 fix wordpress-mobile/WordPress-Editor-Android#288: new EditorWebViewAbstract.ErrorListener used to forward JS errors to Crashlytics efc6ec5 Keep the format bar disabled on rotation when the title field is in focus 587d66f Rely on ZSSEditor to flag uploads as completed in native-side checks 792d1c4 Added null checking for MediaType onMediaUploadFailed b189ef7 Wait until the ZSSEditor has replaced the local media with remote before marking it as completed 2e8946e Strip any trailing   when returning the title e42eea1 Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor 2ca8ce1 Editor 0.6 version bump 1c0540f Updated localized string calls in ZSSEditor video methods 215b8b5 Merge branch 'feature/visual-editor' into feature/visual-editor-insert-video 64adac4 Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor ae7b2f3 Escape quotes for URLs being passed to the JS editor 76cd747 Use hasAttribute to null-check when parsing for failed media items 39530c9 Wrapped called to getThumbnailURL in notNullStr() in the editor fragment 8432230 Removed unnecessary console.logs 09a223d Drop data-failed attribute from ZSSEditor.insertLocalVideo 009ac85 Merge branch 'feature/visual-editor' into feature/visual-editor-insert-video 527203c escape single quotes when calling execJavaScriptFromString c505184 Use API<19 compatibility upload UI for video (imported from images) 2632d17 Include videos in count of failed media uploads 1e88177 Mark uploading videos as failed when opening a post containing them, so they can be retried faae80f Send VideoPress shortcode and poster URL to visual editor when video upload completes 6284c49 Stop adding unnecessary 'data-wpid' attributed to completed video uploads 8a2e68a fix wordpress-mobile/WordPress-Editor-Android#285: markImage(Video)UploadFailed now called with 2 parameters f0201bf Merge branch 'feature/visual-editor' into feature/visual-editor-insert-video 1f2ddda Merge branch 'develop' into feature/visual-editor 07b45a2 Upgrade gradle plugin to 2.0.0-beta5 0e7e34a Update gradle version in wrapper a92f6d9 fix MockEditorActivity for tests f96974f Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes bd8dbc7 Centralized tracking of added images/videos 7e655c8 Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes 3ddf22b Merge branch 'develop' into feature/visual-editor 4d6f33d Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0 4d7a3b9 update to android gradle plugin beta4 2b4a5c1 update to android gradle plugin 2.0.0-beta-2 - Instant Run 80ff799 Updating to latest versions of internal dependencies 6353f44 Keeping internal dependencies always pointing to the latest version 0fb699f Merge commit 'c0c935fa4b3b6135be8099b637da57bede6b850f' into feature/visual-editor 4751ae7 Hide video fullscreen button 4a6c8e0 Pause video playback when the WebView is no longer visible to the user 8a0612d Use a blank placeholder src instead of videopress.mp4 to trigger videopress video loading a9e079c Added some sanity checks for substring usage to JsCallbackReceiver 2fa2dca Fixed a bug where videos would sometimes get deleted if they were the only thing in the post a21951b Added support for video shortcodes on non-VideoPress sites 80bd71c Merge branch 'feature/visual-editor' into feature/editor-video-playback aaa9a6f Added missing bracket in JS editor e712ebb Follow redirects when requesting thumbnails for the image settings dialog 79c7d4f Always defer to super.shouldInterceptRequest in editor WebView unless an auth header is present c7fc77a Merge branch 'feature/visual-editor' into feature/editor-video-playback 0bee8d0 When looking up a VideoPress ID in the DB fails, refresh the blog media and check again 585fc21 Remove the onError attribute from VideoPress videos if an empty video url is returned 1d4069a Added the ability to tap a placeholder VideoPress video to attempt to load it e23bf9b Don't use the placeholder poster image for videopress videos d44cbf0 Add space after videos when converting from VideoPress shortcode 192618b Only apply custom headers for network URL resource requests 3c995f5 Implement new EditorFragmentListener method in mock activity for integration tests f82188a Convert VideoPress shortcodes to video elements and back in the visual editor 97023b4 Imported ZSSRichTextEditor video methods and callback methods from iOS 72426b2 Imported video CSS from iOS bec5a06 Added missing method implementation to test mock activity 103623b Retrieve an auth header if necessary when launching the image settings dialog 710c082 Use the safeToAddWordPressComAuthHeader utility method for resource requests in the new editor's WebView e4c9f6d Updated the utils artifact version for the editor f1e18c4 Moved setupUrlConnection() to the utils library 0329b10 Renamed EditorFragment's setWebViewHeader to setCustomHttpHeader faee37a Use custom headers for image settings dialog image requests 296428c Extracted some duplicated HttpURLConnection building code into a utility method 7c682a6 When an Authorization HTTP header is detected, force using the HTTPS protocol in the WebViewClient 3726c81 Added support for custom headers to the editor's WebView, set through the EditorFragmentAbstract 151f080 Editor 0.5 version bump ada768f Added full support for gallery types f936194 Added a fix enabling galleries to be added to the editor before the DOM loads 1c7a1bf Fixed creating a new post by making a gallery from the Media Library (the gallery wasn't being added to the new post) f507455 Merge branch 'feature/visual-editor' into feature/editor-galleries 66dae11 Merge branch 'feature/visual-editor' into feature/editor-sync-0.5 b127139 Merge branch 'develop' into feature/visual-editor 0976ed9 Merge branch 'develop' into feature/editor-sync-0.5 22551ca Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib 660bb7b Added support for creating galleries from local images, using a placeholder shortcode while uploading b52cb96 Extracted duplicate paragraph-wrapping code into a separate method in the ZSS editor 2bd2a5a Added support for inserting galleries using media library images 62bdbe6 Merge branch 'feature/visual-editor' into feature/editor-featured-images 7774382 Merge branch 'develop' into feature/visual-editor 41266f4 Removed unused 'Include image in post content' checkbox from image settings 6edd755 Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects 644ef03 Use a callback instead of a getter to notify the host activity when the featured image changes b31f404 Add the remote media id to image tags when inserting from media gallery 3ef00a0 Hide the featured image checkbox if feature images aren't supported c3e966c Updated Editor example project with changes to onMediaUploadProgress a2e9a1f Fixed a crash issue in the image settings dialog fragment 4937797 Converted featured id handling methods to be part of EditorFragmentAbstract 1ebad36 Added support for getting and setting the featured image id to the editor fragments 8e8b133 Don't clear all class data in ZSSEditor.markImageUploadDone b093ba1 Add the remote image ID to the image tag when an image upload completes 78c7c58 Added support for setting/unsetting an image as featured to the image settings dialog 74f416e Modified onMediaTapped to pass the image meta data as a JSONObject 1f138a0 Fixed a broken test and an issue with the editor demo activity 5cd8946 Implemented missing method in EditorFragmentAbstractTest 78bd8f8 Added some empty string checking when retrieving failed media ids from the ZSSEditor 2776cc0 Adjusted the pattern used by the ZSSEditor to find images that are uploading 2aaf4be Disable editor format bar buttons when post/page contains failed uploads ed5a4de Updated EditorFragment to handle exiting the editor with media uploads in progress more gracefully d616642 Added a 'delete' flag to onMediaUploadCancelClicked e50e3a2 Fixed a bug where the media upload progress bar wouldn't display due to a localization issue 198fe03 Visual editor lib version bump 4bdf8a4 Updated image settings dialog to always clear the custom ActionBar view 4a0aba9 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop 20fb4b2 Updating build tools to 23.0.1 9118aa4 Merge branch 'release/4.4' into develop 6d81897 set targetSdkVersion to 23 and clean up lib dependencies e242e52 migrate from mavenCentral to jcenter (which is now the default for Android Studio) 1f16160 upgrade subtrees to latest android tools f708f98 update to gradle plugin 1.3.1 and gradle 2.6 844d144 Merge branch 'develop' into feature/update-to-gradle-2.4 bb0b502 upgrade to gradle 2.5 and gradle plugin 1.3.0 4771109 Merge branch 'develop' into feature/update-to-gradle-2.4 6b5919c Merge branch 'develop' into feature/update-to-gradle-2.4 dd890da update to gradle android plugin 1.2.3 c090cb9 update support lib to 22 72fd793 update to android-gradle plugin 1.1.3 and build tools 22.0.1 git-subtree-dir: libs/editor git-subtree-split: 31b66df6436e7911e5a272914ea63b888452e7f9 --- WordPressEditor/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle index e1ae09e47175..b90f4106c4c8 100644 --- a/WordPressEditor/build.gradle +++ b/WordPressEditor/build.gradle @@ -22,8 +22,8 @@ android { buildToolsVersion "23.0.3" defaultConfig { - versionCode 9 - versionName "0.9" + versionCode 10 + versionName "1.0" minSdkVersion 14 targetSdkVersion 23 } From 5da21eda6aa762a51acc7f29263ea5b6e42b3cd2 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Sun, 29 May 2016 15:38:24 +0200 Subject: [PATCH 6/6] Squashed 'libs/editor/' changes from 31b66df..fa030e4 fa030e4 Merge pull request #386 from wordpress-mobile/issue/382-visual-more-tag 53cd44c Fix visual delete of the more/nextpage tags 2d8a0ee Add support for <--nextpage--> tag 6b9ed32 use Calypso _more_ graphic a833c81 fix #382: show a dashed horizontal line in place of the more tag fb8864a Merge pull request #384 from wordpress-mobile/issue/373-tap-image-scroll b1d076d When giving focus to a selected image, set the cursor after the image element 4200032 When an image is tapped and the edit overlay is about to be displayed, give focus to the image 8e571a6 Merge pull request #381 from wordpress-mobile/issue/380-isAdded-checks 0fb2a51 Merge pull request #379 from wordpress-mobile/issue/368-multiple-tap-on-links fe42eea Merge pull request #378 from wordpress-mobile/issue/376-image-settings-quotes 97b2ad0 Add isAdded() checks where getActivity is called f45779b fix #368: remove a workaround that introduced the issue 5b1a0c7 fix #376: escape quotes in imageMeta var 08e4067 Merge pull request #375 from wordpress-mobile/issue/370-dashicons-to-gridicons 707e3ab Center the format bar icons vertically on 600dp+ screens af2165d Fixed vertical stretch of format bar icons on 600dp+ screens c9da68b Changed format bar icon color to #87A6BC grey 2372219 In the 380dp format bar, wrapped each icon in a LinearLayout to fix horizontal stretch issue e80ed09 Upgrade to support libraries v23.4.0 fd9a388 Updated gridicons with built-in padding 3a57253 Merge pull request #372 from wordpress-mobile/issue/301-media-tap-to-remove b250069 When the image settings dialog is dismissed, clear the currentEditingImage in the ZSSEditor 69f5574 Clear currentEditingImage when launching the image settings dialog 0ef392d Updated format bar VectorDrawables to ones with built-in padding 81cad67 Fixed missing 10% dark background for large retry buttons e82d850 Duplicated changes to image retry button for videos 8de3ede Updated image upload retry button for large images to use a gridicon 26c701f Adjusted 'Tap to try again!' text weight to Medium a296969 Adjusted spacing between retry icon and text 8f90299 Update retry icon from dashicon to gridicon f296272 When selecting an image, add the image node to the MutationObserver to track manual deletion 3592f3b Adjusted font-weight for 'Edit' text to match Roboto Medium ee0117f Use the new (gridicon) edit icon for small images too 64f0d47 Moved edit-icon css under edit-overlay bde3d08 Replaced more button PNGs with VectorDrawables e0dfa8a Use VectorDrawables instead of PNGs for format bar cb9d3b0 Updated edit image icon (normal size) 0506e72 Updated delete image button 7b6c732 Fixed alignment mistake in delete image button cc33016 Moved wpposter.svg to /svg/ folder 3e27b48 Replaced inline svgs in the CSS with files in the /svg/ directory 6408695 Rely on node.parent.removeChild(node) rather than node.remove() since the latter is unsupported on API<19 e4e159d When deleting an image, run emptyFieldIfNoContents to clear any empty divs remaining, so the placeholder will re-appear 6ddb355 Clear currentEditingImage when an image is deleted 101551e Don't add delete overlay for very small images e9a318b Adjusted media delete button handling to avoid deleting anything beyond the media's containing paragraph 74a9273 Remove image from document when delete button is tapped 785d0b5 Color image delete button red e2b5fcd Added delete button to top right of images when they're selected (and the edit overlay is visible) d3e97b0 Fixed issue where image settings screen wouldn't load in the example app git-subtree-dir: libs/editor git-subtree-split: fa030e4a8f03313a4311a18e950a0cb539c5dcdc --- WordPressEditor/build.gradle | 6 +- .../android/editor/EditorFragment.java | 39 ++++- .../editor/ImageSettingsDialogFragment.java | 2 + .../drawable-hdpi/format_bar_button_bold.png | Bin 1026 -> 0 bytes .../format_bar_button_bold_disabled.png | Bin 1033 -> 0 bytes .../format_bar_button_bold_highlighted.png | Bin 959 -> 0 bytes .../drawable-hdpi/format_bar_button_html.png | Bin 892 -> 0 bytes .../format_bar_button_html_disabled.png | Bin 877 -> 0 bytes .../format_bar_button_html_highlighted.png | Bin 829 -> 0 bytes .../format_bar_button_italic.png | Bin 859 -> 0 bytes .../format_bar_button_italic_disabled.png | Bin 824 -> 0 bytes .../format_bar_button_italic_highlighted.png | Bin 813 -> 0 bytes .../drawable-hdpi/format_bar_button_link.png | Bin 1527 -> 0 bytes .../format_bar_button_link_disabled.png | Bin 1483 -> 0 bytes .../format_bar_button_link_highlighted.png | Bin 1429 -> 0 bytes .../drawable-hdpi/format_bar_button_media.png | Bin 1072 -> 0 bytes .../format_bar_button_media_disabled.png | Bin 1060 -> 0 bytes .../format_bar_button_media_highlighted.png | Bin 1025 -> 0 bytes .../drawable-hdpi/format_bar_button_more.png | Bin 431 -> 0 bytes .../format_bar_button_more_disabled.png | Bin 417 -> 0 bytes .../format_bar_button_more_highlighted.png | Bin 407 -> 0 bytes .../drawable-hdpi/format_bar_button_ol.png | Bin 977 -> 0 bytes .../format_bar_button_ol_disabled.png | Bin 952 -> 0 bytes .../format_bar_button_ol_highlighted.png | Bin 919 -> 0 bytes .../drawable-hdpi/format_bar_button_quote.png | Bin 1628 -> 0 bytes .../format_bar_button_quote_disabled.png | Bin 1567 -> 0 bytes .../format_bar_button_quote_highlighted.png | Bin 1494 -> 0 bytes .../format_bar_button_strikethrough.png | Bin 1258 -> 0 bytes ...rmat_bar_button_strikethrough_disabled.png | Bin 1254 -> 0 bytes ...t_bar_button_strikethrough_highlighted.png | Bin 1168 -> 0 bytes .../drawable-hdpi/format_bar_button_ul.png | Bin 815 -> 0 bytes .../format_bar_button_ul_disabled.png | Bin 762 -> 0 bytes .../format_bar_button_ul_highlighted.png | Bin 763 -> 0 bytes .../drawable-xhdpi/format_bar_button_bold.png | Bin 1340 -> 0 bytes .../format_bar_button_bold_disabled.png | Bin 1314 -> 0 bytes .../format_bar_button_bold_highlighted.png | Bin 1257 -> 0 bytes .../drawable-xhdpi/format_bar_button_html.png | Bin 893 -> 0 bytes .../format_bar_button_html_disabled.png | Bin 884 -> 0 bytes .../format_bar_button_html_highlighted.png | Bin 833 -> 0 bytes .../format_bar_button_italic.png | Bin 1063 -> 0 bytes .../format_bar_button_italic_disabled.png | Bin 1001 -> 0 bytes .../format_bar_button_italic_highlighted.png | Bin 975 -> 0 bytes .../drawable-xhdpi/format_bar_button_link.png | Bin 1946 -> 0 bytes .../format_bar_button_link_disabled.png | Bin 1875 -> 0 bytes .../format_bar_button_link_highlighted.png | Bin 1820 -> 0 bytes .../format_bar_button_media.png | Bin 1214 -> 0 bytes .../format_bar_button_media_disabled.png | Bin 1192 -> 0 bytes .../format_bar_button_media_highlighted.png | Bin 1168 -> 0 bytes .../drawable-xhdpi/format_bar_button_more.png | Bin 371 -> 0 bytes .../format_bar_button_more_disabled.png | Bin 370 -> 0 bytes .../format_bar_button_more_highlighted.png | Bin 363 -> 0 bytes .../drawable-xhdpi/format_bar_button_ol.png | Bin 1216 -> 0 bytes .../format_bar_button_ol_disabled.png | Bin 1180 -> 0 bytes .../format_bar_button_ol_highlighted.png | Bin 1135 -> 0 bytes .../format_bar_button_quote.png | Bin 2215 -> 0 bytes .../format_bar_button_quote_disabled.png | Bin 2170 -> 0 bytes .../format_bar_button_quote_highlighted.png | Bin 2021 -> 0 bytes .../format_bar_button_strikethrough.png | Bin 1496 -> 0 bytes ...rmat_bar_button_strikethrough_disabled.png | Bin 1465 -> 0 bytes ...t_bar_button_strikethrough_highlighted.png | Bin 1370 -> 0 bytes .../drawable-xhdpi/format_bar_button_ul.png | Bin 906 -> 0 bytes .../format_bar_button_ul_disabled.png | Bin 891 -> 0 bytes .../format_bar_button_ul_highlighted.png | Bin 871 -> 0 bytes .../format_bar_button_bold.png | Bin 2121 -> 0 bytes .../format_bar_button_bold_disabled.png | Bin 2072 -> 0 bytes .../format_bar_button_bold_highlighted.png | Bin 1974 -> 0 bytes .../format_bar_button_html.png | Bin 1426 -> 0 bytes .../format_bar_button_html_disabled.png | Bin 1372 -> 0 bytes .../format_bar_button_html_highlighted.png | Bin 1337 -> 0 bytes .../format_bar_button_italic.png | Bin 1549 -> 0 bytes .../format_bar_button_italic_disabled.png | Bin 1505 -> 0 bytes .../format_bar_button_italic_highlighted.png | Bin 1440 -> 0 bytes .../format_bar_button_link.png | Bin 3122 -> 0 bytes .../format_bar_button_link_disabled.png | Bin 3070 -> 0 bytes .../format_bar_button_link_highlighted.png | Bin 2914 -> 0 bytes .../format_bar_button_media.png | Bin 2010 -> 0 bytes .../format_bar_button_media_disabled.png | Bin 1932 -> 0 bytes .../format_bar_button_media_highlighted.png | Bin 1870 -> 0 bytes .../format_bar_button_more.png | Bin 690 -> 0 bytes .../format_bar_button_more_disabled.png | Bin 682 -> 0 bytes .../format_bar_button_more_highlighted.png | Bin 664 -> 0 bytes .../drawable-xxhdpi/format_bar_button_ol.png | Bin 1995 -> 0 bytes .../format_bar_button_ol_disabled.png | Bin 1961 -> 0 bytes .../format_bar_button_ol_highlighted.png | Bin 1883 -> 0 bytes .../format_bar_button_quote.png | Bin 3376 -> 0 bytes .../format_bar_button_quote_disabled.png | Bin 3257 -> 0 bytes .../format_bar_button_quote_highlighted.png | Bin 3077 -> 0 bytes .../format_bar_button_strikethrough.png | Bin 2331 -> 0 bytes ...rmat_bar_button_strikethrough_disabled.png | Bin 2305 -> 0 bytes ...t_bar_button_strikethrough_highlighted.png | Bin 2189 -> 0 bytes .../drawable-xxhdpi/format_bar_button_ul.png | Bin 1635 -> 0 bytes .../format_bar_button_ul_disabled.png | Bin 1602 -> 0 bytes .../format_bar_button_ul_highlighted.png | Bin 1531 -> 0 bytes .../res/drawable/format_bar_button_bold.xml | 18 ++ .../format_bar_button_bold_disabled.xml | 18 ++ .../format_bar_button_bold_disabled_state.xml | 9 - .../format_bar_button_bold_highlighted.xml | 18 ++ .../format_bar_button_bold_selected_state.xml | 9 - .../format_bar_button_bold_selector.xml | 12 +- .../res/drawable/format_bar_button_html.xml | 21 +++ .../format_bar_button_html_disabled.xml | 15 ++ .../format_bar_button_html_disabled_state.xml | 9 - .../format_bar_button_html_highlighted.xml | 15 ++ .../format_bar_button_html_selected_state.xml | 9 - .../format_bar_button_html_selector.xml | 12 +- .../res/drawable/format_bar_button_italic.xml | 11 ++ .../format_bar_button_italic_disabled.xml | 11 ++ ...ormat_bar_button_italic_disabled_state.xml | 9 - .../format_bar_button_italic_highlighted.xml | 11 ++ ...ormat_bar_button_italic_selected_state.xml | 9 - .../format_bar_button_italic_selector.xml | 12 +- .../res/drawable/format_bar_button_link.xml | 16 ++ .../format_bar_button_link_disabled.xml | 16 ++ .../format_bar_button_link_disabled_state.xml | 9 - .../format_bar_button_link_highlighted.xml | 16 ++ .../format_bar_button_link_selected_state.xml | 9 - .../format_bar_button_link_selector.xml | 12 +- .../res/drawable/format_bar_button_media.xml | 15 ++ .../format_bar_button_media_disabled.xml | 15 ++ ...format_bar_button_media_disabled_state.xml | 9 - .../format_bar_button_media_highlighted.xml | 15 ++ ...format_bar_button_media_selected_state.xml | 9 - .../format_bar_button_media_selector.xml | 12 +- .../res/drawable/format_bar_button_more.xml | 12 ++ .../format_bar_button_more_disabled.xml | 12 ++ .../format_bar_button_more_highlighted.xml | 12 ++ .../res/drawable/format_bar_button_ol.xml | 28 ++++ .../format_bar_button_ol_disabled.xml | 28 ++++ .../format_bar_button_ol_disabled_state.xml | 9 - .../format_bar_button_ol_highlighted.xml | 28 ++++ .../format_bar_button_ol_selected_state.xml | 9 - .../format_bar_button_ol_selector.xml | 12 +- .../res/drawable/format_bar_button_quote.xml | 20 +++ .../format_bar_button_quote_disabled.xml | 20 +++ ...format_bar_button_quote_disabled_state.xml | 9 - .../format_bar_button_quote_highlighted.xml | 20 +++ ...format_bar_button_quote_selected_state.xml | 9 - .../format_bar_button_quote_selector.xml | 12 +- .../format_bar_button_strikethrough.xml | 18 ++ ...rmat_bar_button_strikethrough_disabled.xml | 18 ++ ...ar_button_strikethrough_disabled_state.xml | 9 - ...t_bar_button_strikethrough_highlighted.xml | 18 ++ ...ar_button_strikethrough_selected_state.xml | 9 - ...rmat_bar_button_strikethrough_selector.xml | 12 +- .../res/drawable/format_bar_button_ul.xml | 17 ++ .../format_bar_button_ul_disabled.xml | 17 ++ .../format_bar_button_ul_disabled_state.xml | 9 - .../format_bar_button_ul_highlighted.xml | 17 ++ .../format_bar_button_ul_selected_state.xml | 9 - .../format_bar_button_ul_selector.xml | 13 +- .../src/main/res/layout-w380dp/format_bar.xml | 155 +++++++++++------- .../src/main/res/layout-w600dp/format_bar.xml | 33 ++-- .../editor-common/assets/ZSSRichTextEditor.js | 94 +++++++++-- libs/editor-common/assets/editor.css | 140 +++++++++++----- .../editor-common/assets/example-content.html | 9 +- .../editor-common/assets/svg/delete-image.svg | 12 ++ libs/editor-common/assets/svg/edit-image.svg | 12 ++ libs/editor-common/assets/svg/more-2x.png | Bin 0 -> 603 bytes .../editor-common/assets/svg/pagebreak-2x.png | Bin 0 -> 835 bytes .../assets/svg/retry-image-large.svg | 11 ++ libs/editor-common/assets/svg/retry-image.svg | 11 ++ .../assets/{ => svg}/wpposter.svg | 0 162 files changed, 933 insertions(+), 378 deletions(-) delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_highlighted.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_disabled.png delete mode 100644 WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_highlighted.png create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_bold.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_bold_highlighted.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_html.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_html_highlighted.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_html_selected_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_italic.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_italic_highlighted.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_link.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_link_highlighted.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_media.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_media_highlighted.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_more.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_more_disabled.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_more_highlighted.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ol.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ol_highlighted.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ol_selected_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_quote.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_quote_highlighted.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled.xml delete mode 100644 WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_highlighted.xml delete mode 100644 WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selected_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ul.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled_state.xml create mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ul_highlighted.xml delete mode 100755 WordPressEditor/src/main/res/drawable/format_bar_button_ul_selected_state.xml create mode 100755 libs/editor-common/assets/svg/delete-image.svg create mode 100755 libs/editor-common/assets/svg/edit-image.svg create mode 100644 libs/editor-common/assets/svg/more-2x.png create mode 100644 libs/editor-common/assets/svg/pagebreak-2x.png create mode 100644 libs/editor-common/assets/svg/retry-image-large.svg create mode 100644 libs/editor-common/assets/svg/retry-image.svg rename libs/editor-common/assets/{ => svg}/wpposter.svg (100%) diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle index b90f4106c4c8..708e47b730d8 100644 --- a/WordPressEditor/build.gradle +++ b/WordPressEditor/build.gradle @@ -45,9 +45,9 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:support-v4:23.1.1' - compile 'com.android.support:design:23.1.1' + compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:support-v4:23.4.0' + compile 'com.android.support:design:23.4.0' compile 'org.wordpress:utils:1.9.0' // Test libraries diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java index ae1e5912eb88..d219ce4bf8d0 100755 --- a/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java +++ b/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragment.java @@ -409,6 +409,10 @@ protected void initJsEditor() { } public void checkForFailedUploadAndSwitchToHtmlMode(final ToggleButton toggleButton) { + if (!isAdded()) { + return; + } + // Show an Alert Dialog asking the user if he wants to remove all failed media before upload if (hasFailedMediaUploads()) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); @@ -432,15 +436,17 @@ public void onClick(DialogInterface dialog, int which) { } private void toggleHtmlMode(final ToggleButton toggleButton) { + if (!isAdded()) { + return; + } + mEditorFragmentListener.onTrackableEvent(TrackableEvent.HTML_BUTTON_TAPPED); // Don't switch to HTML mode if currently uploading media if (!mUploadingMedia.isEmpty()) { toggleButton.setChecked(false); - if (isAdded()) { - ToastUtils.showToast(getActivity(), R.string.alert_html_toggle_uploading, ToastUtils.Duration.LONG); - } + ToastUtils.showToast(getActivity(), R.string.alert_html_toggle_uploading, ToastUtils.Duration.LONG); return; } @@ -451,6 +457,10 @@ private void toggleHtmlMode(final ToggleButton toggleButton) { Thread thread = new Thread(new Runnable() { @Override public void run() { + if (!isAdded()) { + return; + } + // Update mTitle and mContentHtml with the latest state from the ZSSEditor getTitle(); getContent(); @@ -525,6 +535,10 @@ private void displayLinkDialog() { Thread thread = new Thread(new Runnable() { @Override public void run() { + if (!isAdded()) { + return; + } + mGetSelectedTextCountDownLatch = new CountDownLatch(1); getActivity().runOnUiThread(new Runnable() { @Override @@ -553,6 +567,10 @@ public void run() { @Override public void onClick(View v) { + if (!isAdded()) { + return; + } + int id = v.getId(); if (id == R.id.format_bar_button_html) { checkForFailedUploadAndSwitchToHtmlMode((ToggleButton) v); @@ -564,9 +582,7 @@ public void onClick(View v) { ToastUtils.showToast(getActivity(), R.string.alert_insert_image_html_mode, ToastUtils.Duration.LONG); } else { mEditorFragmentListener.onAddMediaClicked(); - if (isAdded()) { - getActivity().openContextMenu(mTagToggleButtonMap.get(TAG_FORMAT_BAR_BUTTON_MEDIA)); - } + getActivity().openContextMenu(mTagToggleButtonMap.get(TAG_FORMAT_BAR_BUTTON_MEDIA)); } } else if (id == R.id.format_bar_button_link) { if (!((ToggleButton) v).isChecked()) { @@ -668,6 +684,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { } } else if (requestCode == ImageSettingsDialogFragment.IMAGE_SETTINGS_DIALOG_REQUEST_CODE) { if (data == null) { + mWebView.execJavaScriptFromString("ZSSEditor.clearCurrentEditingImage();"); return; } @@ -676,7 +693,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { return; } - final String imageMeta = extras.getString("imageMeta"); + final String imageMeta = Utils.escapeQuotes(StringUtils.notNullStr(extras.getString("imageMeta"))); final int imageRemoteId = extras.getInt("imageRemoteId"); final boolean isFeaturedImage = extras.getBoolean("isFeatured"); @@ -1106,7 +1123,7 @@ public void run() { } public void onMediaTapped(final String mediaId, final MediaType mediaType, final JSONObject meta, String uploadStatus) { - if (mediaType == null) { + if (mediaType == null || !isAdded()) { return; } @@ -1190,7 +1207,11 @@ public void run() { // Request and add an authorization header for HTTPS images // Use https:// when requesting the auth header, in case the image is incorrectly using http://. // If an auth header is returned, force https:// for the actual HTTP request. - HashMap headerMap = new HashMap<>(mCustomHttpHeaders); + HashMap headerMap = new HashMap<>(); + if (mCustomHttpHeaders != null) { + headerMap.putAll(mCustomHttpHeaders); + } + try { final String imageSrc = meta.getString("src"); String authHeader = mEditorFragmentListener.onAuthHeaderRequested(UrlUtils.makeHttps(imageSrc)); diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java index ab2932d662ab..ff8cfa7cf60d 100644 --- a/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java +++ b/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java @@ -255,6 +255,7 @@ public void dismissFragment() { AppLog.d(AppLog.T.EDITOR, "Unable to update JSON array"); } + getTargetFragment().onActivityResult(getTargetRequestCode(), getTargetRequestCode(), null); restorePreviousActionBar(); getFragmentManager().popBackStack(); } @@ -281,6 +282,7 @@ private void showDiscardChangesDialog() { builder.setTitle(getString(R.string.image_settings_dismiss_dialog_title)); builder.setPositiveButton(getString(R.string.discard), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { + getTargetFragment().onActivityResult(getTargetRequestCode(), getTargetRequestCode(), null); restorePreviousActionBar(); getFragmentManager().popBackStack(); } diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold.png deleted file mode 100644 index 5cadbdbb48d688d25cf4ccf3f8f6fc5d4054565f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|1|%PcFuVX#jKx9jP7LeL$-HD>VBX{D;uuoF z_;zNjM~I_H!}*!Jbvl#u1rxb~_#L0bvwl_D9TZ^e61mY$;aW7m=)P~wBHylb>!*f% z5pY~0zfgn#;`xF+}*Z%M3oa>4!-){Zx)!&C)#Sb?bKc6$x_WADO z^JnfbUYM@7fHQ+>Rs$C5o{)q2zjtLOadwOa2IcoHI$1b7Ke#viQDim}Eg-Dcr6(Gm8avsIs^ziTz+RJi4$674QL zIp2Em$H^{FPBDA;A8S{*ba%0nXUR5Ysr}RRN*BK=7DzkM%d`08nw4c8gtiShKgq4#;R=!TF+|&bF1DJC_X5t-?@9Tn@&);X+mPf z%X6RqZQA(czTCB`5ib~7)}&U>UwUrYh2MgP?T2?ei^@B81ZxRvChqh~4}YgEurh%q zFh*45(;@Gro3+2oa>P07gtDoAYz|5ferPRl#4|)RSm0$ZM6K+_8)0&S(=40Pryu`X zYI?YgIc)3qnrjY|*z?N1*Ul{LD0VW`U*PSqY}(Zgj6vFMYq}LTOgNX?DZ93cuc@K0 z_(Gb1QRu9-vp%gkbg^yMSN}~ZePOoj6Ze1DsGL^Opm6T*|W zASpkf<6z0o=+yg757w3odfYUcHb>?eZ}{xn(S`S$X4HN<@^i{8>&3O<>8adZ>q0x`r0|#8R_}FPx?TIbP2?w?kD2u=Ue!)}ywc`F z$9wKQ(=wiBUMbR5RIKdDotL(?bjhoq9Vecas>EDAbo*mmw)LHNVe3A~cC0)q{D@my z;7=9H`+YJ6sqC+;1%eqk_C+^(oIEBRvg*>!iNA$e4oF!$>MmLP-r>%BNv&rNQ#Lm@ zJ~?IC{(SSX82{DARuNyazkE;K7MYpZZm>x`=I2ddFu$|-hp-z^!(D2j$eJaWf%eB@uJn(D(`T5e!J#$?o*bmL;C_2Kyl2o0o qegEm*FzGDpSp}GXHh6IUVRo7Jb(_fB>Cb_gn!(f6&t;ucLK6TSxYH^C diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_disabled.png deleted file mode 100644 index 07c51b6d6136e4e95baf74e6c4d4bde306f327d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1033 zcmV+k1or!hP)Px&!%0LzRCodHnoVdEK@`W|n{1;=wkEA@1Z|<{K@bmuhn^~ef_n2N2&H;g>D3R4 zQcqrb(Ta)(@$5~g_<;v6g0u?iL5f;b{76&M*lbEaGS8RPG)cSLq}>muFbiR4|8Hjc z-fwq4-fjW(p$TXLnt&#t31|YEfF_^`XabsmCZGvu0-8Xu1kjH^m&wd_&BNlEdVQl1 zizq1%h!z1(ks-&EvDi2w=Igcf+U^U8$;`}Q3Gi|w&N2i^0B`vGI2xjRrfL4!NI&as zBi7r%@A^a}fT)|K9JChTb86bU%$hGZtU4CuKvX*iKrteDJw0tbsMWo{QXIrmz!Io8 z^*7h&efX6gHwB2IyCmUi#cl6PhWB08=}}-GV(3e$76PvuvXy6m9emdh0l`TQIcnPj zQCBLHJCJNK-`Uz-ih+Y@5;WG@9Qk15_noPHzOyhVUlY(y8#|zYeXRQeLaCv#JsSPa zfnKqLP|_qM9c?ZRN`d$v%Uj2oc;n@0b7@cx1R9~ZQ%n-+o0HA0t{e#7NcA`c6_%k- zPByo?QXtaPxud*`w4WmopS83^Cfo+>)IRW4W3hmzQ`wnc%MOv)1|WHr!0rOk!DYRw zz76}`O*97Ln;7qd_XHUa`} zCgbLlM%!()o>Fr}O%OzR-dK%>n#9K%-KPs>LGVB^Ip%@Fyqrj7b3=Zo;>v<3-*^Tf zNK*e~*1BKT{5S^=0tKGfg2wLh&oE#=zp6XNdBi!M72i7r$w1EX@_NL{?p6Ling9y2L43U^SV7@4)BUGYFiKSxL~4V(Zc;!A3jK z^)vxZKoigeGyzRO6VL=S0Zl*?&;&FAO+XXagarNp+4l;!)}{aP00000NkvXXu0mjf D0>Io{ diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_highlighted.png deleted file mode 100644 index f324e7f37b3ef2e66a01fc76fd86efed58f4b970..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 959 zcmV;w13>(VP)Px&c}YY;RCodHnO#T}Q547jXJ(NsF^VXt1hI!8dI$>a#dImC-g+tsqD_qVj8K+WMu$cIH*hn3s1n&K#4f zg;E{(IrRqJiBnt-=Yh@1M@JBLcnV8ksdMN`+^~(|l=KE+=iJCWN;(^wfL`dVxqMtDbr0 zr1-@vq(eUtP)ogYwcdGa{uKQ{SXAeklA_n1nolA6$ueKSorxX1dbrOKMEB4dAJ13a zj}|?MS+yTsgP*cNld6P8yh>QL3}G{`7|w%8vAxGB1ZRmJ1keV>`>M>5PTVc~j6?c* z6m9YQ|5yUP`5z#PO~C@u01RB>m#90%Rw~s`V-S@3PB9FVUX_~MeCp}9YGk8V6+DF6 zF_RqU-DhvuTXBs+WQiCIp^0~&*Rz%o3ekfwX*XhKP4=X+jWErfJRcn4^Mz-Q3Ww1B zaJ#4OQ;2?!Abdb`{o9=O;`>@w`( zwkxc;LO&3xmnWjf9w5qa;YlbvQ2jup38=3gAb{zqwVs*}K~oS|?<1#@s_F;g;!q{; zE4)_+gF^YALoX10i3&_kU*$)-#`UohO`xUWqpRlA82$2@* z@B@u}U14iEC8Y*A@BTVD`Ey0T}ff8hI00I(}U<1Y8slHLU0z{d&CS3<0M1ahrN^xE^TK^diDsS&meUZhI!d# zU*gOn083aP#(5<;TXcK|{o>W)JNr+-ijAPPZmj6K;wS`!fDjM@LO=)z0U;m+gn$qb h0zyCt2!RDk;19~@!`f%Ak$3U^eq~aSW+o zd^`QDf3Ty#f%I=%MLs?VZ!)YB_ScBetC}>eLQ(ERbJN5L8CNQVefE5mUm?C%qP5xZ zVuw((xP=E7i}RzSN*(I?9!UYoK0Xt-xJH@Y(dp7ISkGmxb|DI~5&5WWKMo zmD=~}?APP>W1sI33pnQxz2x7%^!q0yG@j%rWGv!nn3ujkR3YZl*_eVBZez_&3Ji+N zILo9SSM@)do-|*FV_J0O-lsS2etfBS?R|yiq}%uJU(hpQ6x8o@zd4Wf;4jJG<(I4u zm;HCFaLq{xc@d*<{O;`D!q8r|?d%L&xeh#CbC+X9de}>CuFa)ei}W|nVx4%g;Np#$ z&6Bm$Hg9XPew07yxKioivOAm2<@=pay?r?SLazFu{x>^ojP}3L5s<5M5HWdcXz6+T zS)IS^qq}CO4c$K-%{`X4E$ybQmcWar+k$r=TfWP;uz2MW-y~U%UtXa(kxdL-eaa6O zm7UzeF3)}AWYwlioW4`ITqdq{G_${KEV@;B$NuI!+pXWs-*~h0&otR3x90>e72n_2aE&YU#kBj`H-2_89gP0`^5?P* zo9d6Hseg*L6VH`!Z1uDgf8`s!#q`>-zj24pg^O@lCwQkW;>>e==AddVz302;r=AaY zwwLjQg_Z{tDfWb3?F?EUb4}r#ob`vfj6GANnoh>wTf0$|CG48UYuSy7d|cmcY&DX8GNJ!xgq%`}1?H{Bx#_Ef&YVWvsJI*5+vXop#}lp5T>LzneKr0(d{C zzyFsipM2tTfa}pcUi!Vt2hZE+ZL4g^Ut&75B<-MCRT0}q?(_XKvv;H$FJ9UBgDdOy rwNtOJ?z|RXLPY8WrrSm%^$+ZG;$Q!~#K&y|%uWoRu6{1-oD!MU{?2ZaSW+o zd^_FIU)WLP`2E>;x!yAA1}Pj{Trqitd4I+p0sbr{an4S+yJlv#k>P#dZsk5rzst+sMwNK4s+?`I`SZQm|IhsUb?*&dLyVIH z2M42~0!vGSfB+M2&VLcco~Yc!y%y3;u})9*c$QDr&r1IM@0-cX2g{g$RAp?)zxQij z{nRUllqud*Z(<%F>f>YuK`0N?tL?zU7YZ+x=($xmtDtAgyvI+ok2gwR%Zn=dP@H@JUa?xstQS__S1bH@xn42hgn^8- zc)IjV!Fr>MiR-_|zTM%pvqtSkqovD*n~nR@x9*$vokhE$ph?~;@l^BelzaMe&!0p; zG<>Xk{BP^wC27}VPnA}#XW05~`nwrNpPF@l@A&;-RjZ%wHf={1i5izfZyB_n9z5A- zJV!D$V9Om%fwxoHUah?I>ssqB*9CrW-%c*Q_QQ&6I_C?U=|=i#|qf znt9LlpPoi>>>QKSiEsUDI{fzruGAIiJ2!?Lv&HL^tD9>lef!2CU3=hd!L8YP zKdhIxU$UKVWm_8F{9uxXLBml$XMD!3Hg2N&UO4vUZ9*^SGeq^#oI^I1J-B;sEG-|F|dEVJ@&*<4-sE@z_Bq|*Xz b&Oa;x7GG-<{%1@D<{t)6S3j3^P6VEXRq;uuoF z_;&jFY+*-{sMx$h-S*~^3Qf6?4dUL8fghEwIUSwyk1;od#Z_P{ zyWp2A&2f($J)^Xm)CFIk&30rF4V1b)LvsIa)!BL~ufwc`PFHW({kiVUnc4o|&ZaR4 zDk`wFGzbVVIXQ4}FyiDi{_kq&I#agFgsFRR&&*>L-x4*-Hkr8m5eDa}&KglW|V))C1ufIR|HdV_IO6`+ny6n+K-r$32+i z{$iG+Ua|Ft^@}I=^n6vk!ILaj+3I+J@4~dkuaVarBTPANxpvWGmGBCcZS1xsro74O zD~c;mUT(abz2wU6330(wRvmg39P(PB$I_Ew%WW6k9Od~J^N-9wV=}E$>eaORLWYQ$ z50rR{*x$F;oE6Ew|55y2ueI6J>BqlLmyP(hu{-%f-@UZE|Bk)88qMu>>9)3s-TBxr zlcVD#KbNL1k5#=rOJT~~$7(Up<~^9oKJiB4D{q6&%5a58(~c=D^J;hYjJPd%$vkS~ zgGE;r?^JE&y?@HK#(rMq?W`+0Pd{@9ff;Q$h`KN`GwYB744x#`=l#x18o#bnIH$y!qZo*SBuoyU?um zj_o3`|M~M{=Q?ZXzjbzho_$?-yIIHQ-}ZtG-beOsDa+guUvJ=?yXLZ4N9_$4L!?6*$Z4|T2HZ>Ns8ZFH+`c-ExT|1kUL>0r(O5__)6WJMqAz>}Px&6-h)vRCodHna^ueK@i7hUYk&3J$SL8UgM9ZTI)3kHF&BA@mC0V^dAtsdGe3& zt|!45BHD{TAf?rl2Gc5d5JbHQ>P2llX!72;D_uyNUE%d@XDiHJwr}?B?98Y0-Q6Sr z(u9Bz5CTF#2nYcoAOwVf5D)@FKnMr{A;3!jd6xrdw<-5-b@`fFH}l#wO806fj<5L0 zVbq6{G(O&UJEw@?dYU<|cXQF$P1jgjdz5xU*7sw=YE~b5J_0^JU!MHv!aH>0c2;RPg14R`N*1d-_m4kx%<*mxS`k_nY7dxpWc6UKSp4M}^KK3bB1ynn4LVDV zA~sp*^}>Q6a)J0UzPIp52gucefoMKmKA@63YD-k@53I7#F$4qA>;F?0UT=*y*c)xZ zKoBLaW0PGL!78HuY~`R@eA~z(7zpZ-s~Yri!FpO4i3E~HVm&R?egFHeeTBy+IL@9O zgqDT+fOW){BmuCW7A6jM5Y&&Y)u00!2_y@>HaiG#d_$#WL3?sRWWf%ivGD2;5l!iZ zha29nmP)^e?K~FNib$yMltqNdeu)}H%nE`Kt;c3)S!f_^AexJ>4{ujlu!88vJ!>`S zAXG&JxkTx;O=GKw1nj?Os85>TU?Ts-1Qe=g0a0IiISD`|N0LEL3lo#7N`LK6t5YVV z+OS8Q0;1Vr`(IhK2;t58F^r?xV^^z)@p}8#J^B6e7U7Ee0q4SSxa#ukXlkUQ=2QlU z5vaupL9gvi8uRT>1@&K_8%$`^e`Cacr|?!0Kf9k#tHcYNPJV5o(rTQ`V>7FtwDY}H zgeq_6@t7(o#HDlP=`X3~czD@cMMMZM2ynxump(!yT1Y=jW(WZxAOwVf5D)@FKnMr{ lAs_^VfDjM@Lg4=+@CPiEyg!nh0`mX>002ovPDHLkV1nfhg6aSO diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_disabled.png deleted file mode 100644 index 0bc7247fe67d4988bc2d2abafc7407feb87561da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 824 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 diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_disabled.png deleted file mode 100644 index 58558dba2fde0766422db5f473d0b884c61304c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1483 zcmV;+1vL7JP)Px)g-Jv~RCodHnN4V8RTO~lxi6Vcn%~+cnTpnJWj2CTMiA`iEJaWeW~FuKAEVBX z2yUH)_)`%ax2;>ng@_CcGR{I23ZjBIJ8@JxO)^c>yyi9Od+&PAYm?lhFVEz?m!!gd zi{}2Ed(XLF&pr2#G4&||ihv@Z2q*%IfFhs>C<2OrBA^H;0*ZhlFj@jIT6O(vE9m+O zu*9M*;2tiR5Fq}FY3#dXGFj-qm;NP>9Eeh7XTcKUG8%S9;PB<40Dz78t4y%Bb5n_* z<+`Bh4n;vb3)+5TOTUN)y^8?2S6>Lk6acT~)A1`_a)ZxuZeBv3fzxCmjA`QOg1zX4S&q};{llIB24`?FrX^qa;c2JEt2<~Kc7k3dg&4k4^|7>|REXyWndWb(I;a?Dh#)tq6$F9_g7 zvyK92OcS#~SCg@M#HL})F`Iqb9FX&i5Hu}%+6@BL?+;d-liSdgF)X$ym-$JL4TM>@ zUS>>8wv0Z2Fq544y;bIt$fgrtqZe3m6$rRj&ihG^4TNB9sbz4V5J(;&7#JWsHdQuY zqzL$p1;qBYn8Ceb-m!fE2qa%FiwtfwXXSBo5P!>gKk0~{MnT)u?b@8v$AA#1jmdUi zkoBX72o`}Ga+#m>SU^M>FV{ghfstYY1-#-`Z3)LT&w+nAou2&BZ7_GL)sv>l-jVBY zihY}l$JgaDKk2}8t6!zns>tqIwK;^aX{V2G+Ir*e0|>_oTl(kN&y&;_1wsw@Bi%4c z+x2&Z?4dXsq9q^>IR5SG)8PNc7o9m6o+#par4pg(5 z{R}2sUf~A8k!9?yFd$H0LjzIR)}L?eTDVUTF;YYy{>jw#`CZkd1SJ@CDX8(?OQQ^jEn|;whB3{{zB62ed97hq9qB zpM{FPjQ;HffukpQL3q{+0=m@)=n0`hAS$6w4T2zS@w$xL@dO?{jWNM-_hO|+%U>@~ zAP5b2PXGfn_EIjDSe5$^D;*jLoDP?ILP+gHAfthad0g_kKbj8i5bzj|Zo3kh(5_6y zVt;lw3@aZ>j3`xV581;0f%XGU!&;soL7=)jmD(vw*xyUCZ3xx+{hE1f9bk8AkJ)z} z*CuZzlTd8-In3WsK%h5V!?7I)C8K^1*B-{!_ng!;%Xg zBTV~IfeXKEP!!@Ta^5Q~Lm;^cK6%Saepq#_Iqg>gy*tQl@kG3y$v{~y>y_??fJ@^> zDg~up^200-41ykCIt&Ds!)emKaOtRQXAVKYDl}%bEiu|uU=Z{IC7X;8v|>enLN4o0 zyFtK()u1J^TXt0Wz#!-uj-tM7Fouke>7rFGYo_TaO{)V1#%7uG%h`*=+$VJCa>)b+ zad3NlwWDtwWX*zKiui;Z( zXqPHoYJ6owi4ks^_n+t3B0av)yMuG(9^p5#AzZY&=~HEjfFhs>C<2OrBA^H;0*Zhl lpa>`eihv@Z2>jm&{0rtAXU)K=E9C$H002ovPDHLkV1g=puu%X2 diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_highlighted.png deleted file mode 100644 index c7bb8a76dde2b1949dcf65cadf5330b0b163246c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1429 zcmV;G1#0?Px)Pf0{URCodHnO$gHMHI*XGk23xqlv&e+5gtfzi|t zp}#VOVtGd)Oq!^YwbS(RIqE^y?nO9|>NSiF9;>YvzINk)$ewwZCcvTau9Kz^uOgHB zpe~y#${PbjEeHZv3D8#ZKVX#5$gt2C$219Oyb7{r73b{9ijg414f=Pdack#RWCpvD z*m4`ig=fiy1>FsmfSZpedT|4}){cnm>~m1=$uhqeAle^6X77cva^T3hF1X7-QXJXl ztMicP=!v?Tv~EOX&-N08U8v zuL}^y27dCDRVF*yKZk&;RVZ(}mTw@_IuKApK7YeOV1wb^H)vGon<_zQB1&sOOxnB( zbg%dx9s(Oo*|!6#XT`So=Snfr=-<|W@T}eyhwFpDM*oNxw2u`+p~ITh${NTd8nB6O zBGh$iqy#}JiR|1Eq`QNb%}+6w`X;cG?Ae`A%Wr9Q3SZ+;|GZY#Kqm6s3fP^h0$bTxNl0nNO539(H+Rz=&>?VB)^z9w{Seqlx|c)S#;6z_1iw3IBIYsvFrOvX zmU0Mu{z#{;t!)^;MsyJT_~I9#x^UvW|H8#zTS`|#pg<~5mK4@E6&(b>K>3Bw3fGq& z^A}a510m2pftSb@NpukW3`eIb&41+{&0n-?g)138O7rSax|mt1kS{lLpAh7Vzswiu z{l#^rC(e997LS%$(QULi2y63a7`bl=?|-`mfBii~`-nHSgBTm}ws|a-F0)_PY&;+i z+xOEg0^JGFJ42;-^zqjyk`#{N<@Ewn^mf4;td>gjslo2^gDk&A28*l?fsfLyhrn*f z1A<%P2U&?%DD*p=T|+3Q$kAq;BG>4*YIS@dxC@5CZ;`;4^s5I@uIGzZAx?v@*T&2`_{+|QN#ZF3A4twG(HGDE-+Fa!(%L%Px&>PbXFRCodHnoVdEK@@;zwz0KZLK5)x1n8qdu1#w>G=gR-?MvGzy124#J6IDi~I zq8Hma=Sj#cEc*?Uz@dQ7Y7Ce{hGL~ROBFb-jolAic^U8isA+dwS&Mt zq0-s}H!8|2^{t0YI|$qu;qLdVd@=k(YiQ+-a#>?*+CkvyVDRQnxMSRdFd1WpG1S`J zy8B4?mRUbbkB{3oaU33>vGJ6^U*RbAqpmnc%Vr5zURXCT?vRDk!S}}KS{oa;FT&Xa z9>%V?GF7=2k4RXP-{NNK;n=$`t5g{pv+O-^i@l{vpI46-5a1E(;m&YjZssfA7uvj& z%5~^#pa;n^Z~4XBk87ACo`5$rd)rjiwSBs9{2&_TIkz9?Gjp?dA=@m=RF}1Qglr_hI2%t+^~f>^oBi3v>>D^* z55rS#0gq^dUpI4{JKvd|O1zpb-Z21FKa4#skJnMw>JdeQoy8$2N3folNNp22{u}{d z-J2k!c8W~K9DSYM*Cbj(3z_-*-ab0&+C2h|hNs;dGt)aDH=IR2Tn$2LfubXuafTPN z^N*l!UA}eH$0J~coH=JklIba+vbVJ0>Lq}7sCujVmb!remp=;Mn-8jAf*Or=0|5cj zQFskkW4U52b=e~n+pI+$fhb@l5Coz;!pI|ZdIY?Je=g^(uBJ=37LVY}IIqKC)QP&) zVJ&IWa*ybXhF`)In@ZFC`z6&NA}T(c)rc)pW51fZ1qK1H*+1Qx@Z}21_^WG@ZSXsB z;5}jmGoEtBfA}>Z=s27kZ3wO>s0J9X>yIMKnTDQ#5ROH|+D@tEY@l``Km>>Y5g-CY qfCvx)B0vO)01+SpM1TnRCGZC!K2FFey70vS0000Px&-bqA3RCodHnm=e0Q5eAAJBpPyHLa2gq7HRZ6vRKcNZUbh&`AVw5J3<@6x7wh z&{-5kMI1Wn;#LPY(>l0S6en?X$)#=Xdb!55$$NfZa!Fs(Yn$G^ckS>!xa7O{=lk=^ z_uaeRl`(2WfCvx)B0vO)01+SpM1Tko0U}_G05_)Du;N0|8yAd?qZx~_TxMt>hjP@` z6LsNsuL~eNK|esomaBh8`~aBLkbsubm|t2tC@SKrU~*6=*8M{RSyi7}4&eB>WNZw_ zL7oOVhjP?1iCr29p}JiA0Y2Myrs!uHk2)xw-Aay8F%Oo}k%mnbr1cX+gNeJ;l zDCMB0s0rsW?So$&%VFKph+;c72-PUoX=h!l<8kF+i_D>(e9_CoSG^o`*iB^DD7dBT z`C{ppUGx^=m@YW}DGX*OHLV#D78pVhLcYf__~o#TN-1Y-_ut9k^zJ{6uC0HnWrFh7 zHMFlV4nhd_xZNb4$$lnk4?wuLcC5P|wM@EOvGFY9rNNmz9PYw;{o%7s_ZkNQ0elY& zLNXcJA2v6MKI0%bw;sa1pRWePIs0u5rk<*O+btUhks0itsn-BLd9cy9qnpDst|T>mVS^0_X3oqCLbfE$Jk9Cr$?KVwUo>NKjJ11t+ONbT#C z=cU{ur1$_Jc6E;FIyVC%@D2hz&0POQn6qMM4ol5smBc+j4@cN@tgLd{}Ujb z>qZTf&82SU>6()m2&nTbOz?}k9M`QUF%XdABdtHgbw{B=Un18C4SpI|K_CLe1cE@c zR~u!7$&7&K4u9Ku>pL^0+e}7S?6wJq>pDTVKCG*njNC^Ir&FK7#GzF)J73ZY0$;-g zZ=j4v9=!6?W+yfXi*W~TpX(0cA6FpYVZ1dgHq4+8aSg`4Mp(VpM|dN<5Z95&>%n&2 zhsX*V3pad3)~#++|0uGVear-eu&=Mr*eV2$hyW2F0z`la5CI}U1c(3;AOb{y e2oQm&1pWhP=3W${s){B60000Px&yGcYrRCodHnmuR~K@`XTyBrZThzNFS5i3O@pb~@-_dv1GN&;dbf+B)gm=p=Y z!XwRnBt#6xufkG6(rICp-3y8e5S4hUm<4Ey|o`I7C|lAPp$8!Hc$bQ`Qk0!-gPqW52dO$vr{|2gOCT z85vRJ0qfE1bPSEifNqP)L8vpyV=SjuX_Uev(hD@^-5llha0vDVDaTH_L9{od;^A+sU))kVy>{TR)DPq1t+5++nmmdt|) zJfX!%fgPye7S-NtY3W{!hDrCMI`-6YYIIZ{Hpp;jn>y9E?QFU-1rW3+v`tor`nH{o zSDFVQH%1GqEi3s3D>L0vx22+a5b|{BvHD?Ib9B9gWlzHHIfn7Ul~^k;EX)Ms1Gi3JT?+NDYv8PeIh)(c|_xdUM@Ic`tdzAcQ}Q4_HFsP4gL}Z=ey*sS~taRjKin0k8xzR19@JW$#V3FbW_Fq}S|Ou2{Y zuG?6vJ?#jgxyU}$D%5Z7Nm}1J((wqnz#1;2RQ^g~Fwk7@1|=cRZqTZ|DLoKEoG0tg zXkURQh3SC+`Y1FsnXO+AZ(v7+l za%n@tq+^emr?1q@3GIkKJe+$zzJhS%#-GT#)o$t^MK+s1^n`hgXZ3H)o6XJbOn?b6 v0Vco%m;e)C0!)AjFaajO1egF5NJ!u>Q=jMqjE`Gh00000NkvXXu0mjfC@$4x diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more.png deleted file mode 100644 index b3c93eec7b21eb84e3a43cdccbe5c8e6b87cf3be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|1|%PcFuVX#jKx9jP7LeL$-D%zGd*1#Ln;{G zUcVc9$Ux-4M;4ieKn-q(I|tY=8r}d>hJPvwn3=f)+!7g7@2!68Z1K|Ba=Uxq^ZU~$ z-M+2z*VMDQScXHPfq@B~__MTOd)A+y$(@A{81=sL#A9W%zII<;u4~myT}YeZ};`>eH<`-~LR# zEs`P_(Yr@qZ(6QhI*Wiqf(PT|vmIq0RIj~Ow7wPkJ$8l9Ez{pwOQy)}va&9?!_veX z`gvLdgVOvBJsfT<%1Yu3S};RGq2YilM-8*eX@iqDZ>zrn#sGt-tDnm{r-UW|2D7s8 diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_disabled.png deleted file mode 100644 index 390d61d7d93c4d79468dae90dfd96f13df29c2ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|1|%PcFuVX#jKx9jP7LeL$-D%zqdi?5Ln;{G z-Z-0k$Ux*kp>!b&r+n141m+iRJq*$%ix07_VYHRt>=S)vE9k=WQSp(Y#;@m2e{zn0 zJTD(n*vHMtBH+M)Ml_~#RjfXCy>R-Pc~_rV9=>4y(s{Y>;`cFP9a$xf3`+4Y&Tyo; z*eUO-{Iu@MpLMrF+<*qeMI3lCXWif5y}Lbw?I(Y}ef~mpW?WC^hv(lGFDtsfaoy{+ zP9LIs^B>hciIs|(e({U@3;kJ-a+A~kOR+z%nS^8;CL=Q|&b*R4MJ<+5Mm z<~>s$@&Wx)F{j~VqD#F0zNGVV-)B8lKOLSkxlC8_$DDY%_5UXyKDkLsTcP2^bY0^n o$%*GVf;bc!7?{uroA3u5hrSrEf0Mq>9~kBgp00i_>zopr0PX3mt^fc4 diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_highlighted.png deleted file mode 100644 index 5a2c8c54ddd216409f427c75a8e6d156f19510fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|1|%PcFuVX#jKx9jP7LeL$-D%z13g_FLn;{G zUNg*VHV|oe_8926e7H*)m1dGSDY~!s3)OO&Jx92T$;5@Uw>6bAS4L z_?Y~*jU3`k910B#=)`)Fg0#8QpC4PZR+Cp$UM;y|_NC|b=U5m0-sQj`s9%!CVyrYz zaP^KKJ}2MKubh=G=)lmZ$~|Mw<-xGcQP=$Bz99dBC0 zvGd9%xn&tUKZF|D8D{*rp5e6V{jI(t4+OunX z_(JBY2{;_#K3mX#!Blqpy=k}3ZrXo~_ru0-zfb(wd-m;mAG@VxFVAi||F93}gEJZl zMG_akYah-#_FX1_*9Wz~QvXb6&HuQ4?$%>0P0XR+dm9*(;?|wv0J&alK?{bbfdO$q ciRB+d?h3Wt`vVs|1co$&r>mdKI;Vst0I)l&X#fBK diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol.png deleted file mode 100644 index c5af4133edc86fc72229e7f5b1bb8461342e482c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 977 zcmV;?11|iDP)Px&i%CR5RCodHnO{hgQ53-M`L=0)a9R%)fuv+$2Aj$r5|o@!LKN8_bUi5a)I(2! z(L;npZ}rfF&_iz(gf9Q|lAwXxBBdbQOpL&cvVT})xh-|-zT3IAi3}%>d!75@To~W| z_nmvrk8|$1-!5ZRhyW2F0z`la5CI}U1c(3;AOb{y2oM1y66o@c?C-~$4O_|FQdSa zPM>byaG`*}81!wi?y{o57Hsd0FlaCe1fi#V`qa(ef$5b1S(C>dyJy@!|J%QQu>uA3 zocAkqOLgH#SAmp(*vrx&>YWF|C~H8->v=wA4bFrvV~EU{89a`yvHY=Tc_WkR(jel- zxL=OvhJwL9Y}kRY8kIy|q61q7ihXZls0N4|<5XY`m;WHW45Kh9jUPYY3~|p3x%E7HmxCQ-wLD0}cl)7>R}w5STu1V&+)N z61aK3-jucZ@QKReFGhi(Dt$I1(We$L<%0${@W!iTZejM4Q6LCCrPJpbr|k`%EOW#9 zyg6D?GR-}Ke_jSKkq81k$D7zE+gA0@xHJf1$kBuQg5rsWzQbcxAy)72;PzJ0x4dBZ z99rJaq`Guy#En5CH4bnK+gUD~Sc%sz`}?O8OwrFVFE zs}Udw9i>C#p)YVskMakT-0wztP3%Xc2(R{X&_hB;Y&HR8si?ZSUJ|IVBJB~@Jm|%J zVH9<0Z1W6F=usBHiyjUp?IHrv73#XKqLiE?dd9}GL!ZM<7!r0wFvTr;r>m-bcwIFo z;Y5H45CI}U1c(3;AOb{y2oM1xKm>?@Q3?D3JG%$jxOzuV00000NkvXXu0mjfqIAgO diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_disabled.png deleted file mode 100644 index bd2a922714db547c6b6169d63ca6c6166ae73838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 952 zcmV;p14sOcP)Px&a!Eu%RCodHnmugOKorN{yQWR4^GVy3rBW*@0UZiLU67DqL97)6uz}4qhDlxJE10cSHyIoB6ZVlCuU9_WIFZFZxi<2*cQ%+J@>g5bzi!ED(&Amu}>D zsBQV!jujKhDDK#x%}V8rKpeINiessGLyc zg|Ivx*J475n^MC53Kq|`7eX*vDKDSp_;3dDo5w*4oid`BvFy*Sr0ItJtySG_?Gwq! z)NY@xf6kYo;dQt!WvpTrUeofAEOyHDke@Puwi8Q-=F%K&nYcB5As zA$aYATKWQ_mI+qjC8gKA6yhq)6%U&W#_!GTy|?-@G;}lnf|kw&l5-me@j*?Nrr9Y( zyY~{?i$EDfHdi`Wt(HGFakogPN4J{T18Gtp8nO~4Ws8mKXkA`uwDCO?U;=$dKzXwC z6sN7N8Rr5I#OP%6Z}C8iBsd6_Pfp&=#R>qE_eBK zArR5kPYUaLUW)SSTpUo9-cy;|y`Z8I%LJ35OR*DLhLo|72=vY5Wo3AL@{vFu`c^j_$W$8xo3=N4b z_qfjOY&~C^O`Enu^MU1NiL!$(b)cLPBv#8NfC(@GCcp%k02BBh a3H$*XcMj;%8{{GY0000Px&QAtEWRCodHnoVdEK@`XTvxycg{je7=7F+E>J+vNjXraZXAYR3TABPq^^-vHB zDQOTX;vrk>2ejb9n+hUA_2j_{*+guq;=vvi!SDKoh}EWTs-(&IvKmNfQW9p8X5|fR zcJ|HeoA-XanK!!|fD02~0!)AjFaajO1egF5U;<2l2`~XB;79_)kv$l;JWjOTtIkf_t5Zv&L5M?}zS0FpP!_Nx%$5Qs+35)7@= znDegn8v*cB&Jy}o&`=uIh=Rr|+s>LJLQVl9wPtW(0!-llAfRPeW}`4e2O*7S+FgEy zt9Bd%ElW;9qz6PWbd8+uhCqUL*e*K1MuqU8-}}=kFx1oMNTkt*08C(Obu~d4A{e{y z8%Lc2A!Vm}`rMNIh9$JaO;e)R6N4Ff1qzI;B^Y{_RjwiobTz2lp1xNdM4xw&lugqo$SsV&yk+FygFac)~(33S%K3}w&5T}Q(WO5F5Rg<*K zj5`U19uTHALYX5oOFW0M`2hUwpPd3jSNinPmihq*oijLaod)0gXFz*Ub3qxK#d_Kc2h z1g%-DB%Trk`uy+eCm_jU7+nmVdiD{cFDnrH)INfC(@GCg6Aie*o2k$*NTXlkxxn002ovPDHLkV1haHm}LL} diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote.png deleted file mode 100644 index c264814751c3b10f5bed92fb147234fa83a6a801..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1628 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 diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough.png deleted file mode 100644 index 431c7d878c48e6bf813e0b9d05718ea02e9cdac5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1258 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 diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_disabled.png deleted file mode 100644 index b61be7a2f75ca749c636e5e48b8f21e21b7cd5d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|1|%PcFuVX#jKx9jP7LeL$-HD>VA|s8;uuoF z_;%LbZed4>W6$s2sl0czM%0t#;kkQmf-Ks(IwCIGiel5m!pfTJ8*X%bO;lYXAbmRc z+ z zy(33|kKyLF@5ax5$Grb?crw$n9r4jun!&F3kz`bUnE5R7pXQ3~h89x`_BdVp(_Z!S z!SXfl_Ip;JN!=~K=gcFHp)9a`$_<=<3&pkLh}EeKqyc;*jlkADk}u zyW?rv+Y1*9e|x+)7faH1o&IExrIA{s?sV5XY>HpCm3fPlB&hItGxGqOvl+* ztMVMC6nKBh6)1XVu{e7&``J5}6yh#PCOvYUJJ0;A1V`nQ?;+`ZQ@;8vf9`9%&3y@f z8C&6xm~Wkr_xlFz4%CgCe4QyJ^vQ1{Hl?ka0?&5WmCSqUD!A-W)#g24^zMH%v=U%o f#DZqXG|unU`S4w#;^%H)VrKAk^>bP0l+XkK&y`mu diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_highlighted.png deleted file mode 100644 index 9781a9505d0d0d8eb52ab9f2c2377cedacc76e4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 763 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|1|%PcFuVX#jKx9jP7LeL$-HD>VA|^G;uuoF z_;%L*Y!OG14napj-9;IxOOM8WIR4IJbD?-jx^JO>zTZ6&^Wyt+=T^SoY`yt+n%D#t zmX-zq0VXF04h}{|1q7$D-n$`UclQ3fJzM+L7lueaS-T*PGxGNT?%t1$JEY#Zt&wv` zj8D^F*j%-hZIQ)g8Qq?ZH${`bnR6^lY&Fi%EiKKod#V0nmCEx!nZI&+An{Js*< zRiJCrv%;jY@V(`-{yjGr)Ti@(Zp^U1+gMj0cwD^hk?h1i?F_NrQ(KJh{W~aNC*XLU zCG2@|t>D!QEAIJyS@2u0ye44b%lEQdIE(EbYn%B+@&;L~{aPw;pk-?xvr_zp)aJqcneMz6A z!LtvI9&@>;@i#3p@>(iBV`hwR>d97c&_A$OIPm|!#W%%klel-d`^FNE^%(jz28QvHcw0jC=kw0D-5gpUXO@geCw+jZ`K8 diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold.png deleted file mode 100644 index 32cd925b59a08a6f0e658bb325c0e048f5887d87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1340 zcma)+i9Ztx0LM3D=ZL#G<|Irq)=;`wQeOg!vfjS+Xy^&562!81 zwi9RGr9wanSNIz|KSmfXe!6i_?-4j`{+_YJmvCwKMO&g+)}lxQR(;~XR(dpB=WjHxu%99 zQ#3qr?6U3FF%O@wIe4E};vl8S?sDg$eBu4^x6DJ#rzgdFwco-)znYpX9st)PdtB~j zQ<%fBU_uh?L4=rS3tz1)X9a?C(iZ)_;jys3&X=&|$`aL*;Gy-^&tBRSPxQV|j|sX^ z_x4Rh${Y$;Lr0{UdAI!z1A7F|%4Rq;B=S0Lo>s~KbsEK^M!i;WRR}{go`!X2ydsI8VI-Bxzfq~}ZIBTp6>ow~k# zg^r@#U$SjD$sy2?$s2q%!iZ~(u?UN<-EF8t6=V0F<=Swr)gNr@hi1PhAAj|fJE3JS zPz?eq@~)?8Jl2~E9c-l?`X{*^t_hLP`AfREMnguR*Q2k`eV#>kTEu59-EtEj7t)w$ zSg}l1r;U{xF}q&%rfg_NVIgPgBr5|eX8-NII$Ml+WJ49DFgyZ$S?#p+@cqzB3PCB= zwdqQUo-;uRNQKqsoObBt+fRsiW(0_&!*u&)tp#&)@;=0m2Df}x3s&8=%esjWm3%az zK;fz~*K8j$;$}9~JU+lV(YS(HhtY|kVS6@4oM;r21kb6CPAi^pWI~wq#O8`)t^5^N zhN<1Lfvl!D{cpw<)p&)oToppdAP}N>X?fOr`AQXL(o}}~r*~1=ypl7+H6|4E)96=5 z!eI}}a<0zh8Z)Ng*87PY0VV@iS5=h##iKr`gzsHj*}>VNr%8QA!fuy8Rt_OmF{6!N z)qdBMv7cBqa*k!u5GPN}R$ z^C!zOzgWFf3!?!d-718uO&;-K+@&52O3u6ze#?2Y7(bxmXqWwxs?>ht2qQhSxN zmtw>0Je4UZcr)^GEi8;HIo`XFnMNQ002#)ANnXZLrp3eEuwjuYRiZ}o$ZXBiNAfoZ=t2V09TXi zCHozQZi20f%pcQdT64jMd6_cNtY1+E99#x-TRmL^gX5KEAQgTMtyfSL#g0t{H*_m&^=o0uT63)`|Us_ROA8O zd8Ck^Vj1BUvj1He3dLOKs;yhz7*A{@RK;Qm*OtYvR+w|_81VZ)*qeYAURe|544qx| z(a}Lq*co}ctJ!N!n}js?BGpl{$Qg?6ju|QJhWek2yNN6=TaF+xo9WB>f)`pBLa3p8 zpJwfnOOk}jf{NJaII$LbG_yTdezc?11L!7$>#*VX=&Nq0ZK4*@%FNUdH^ zQIS(ETzuKHS$E1KZTZ6!pSy1@q!+^9MHfQf9nQ=DckXo~oMbqRxeqgOO-_Lg#rqF!Me9Rcc#Hn!fS{ zmts56|N(-Nb5@g;!~T>Wg8wF@=EVHQ+bu|kK2e8*Y3_BGvww5ViE2kcO}A$5yUpGh;lQqAJ1K(oprtH|A}cEsXRb)qS2iY3Z8leNde! z;ZeRig*4{PASr9((3IDc#rmAR)_i%O#NKT0o37LXGO>R#8SC8l0L}Eo=l%x)sE0fN diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_highlighted.png deleted file mode 100644 index b07ccec4096da6826ef17247bcc6d37b145e1ba7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1257 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL`2buq^g;aSW+o zd^_8>L&RO=`2Y3k*LGy}D7nR4QK%AR?wsUsz+yLZk^uin#R~2~!;_ASn%?Do6XLgg zlXCHhj;BJqLr2AlgR?v0?!+!m>QH;-=;*lEMd)inL3wQXnJ=GvU%%+_D?i&4ds%)@ z)67-tzP}2+zFt0m)#@w;UoQtv4Mx=kEK?eU0+6?So4|H*6nw*Fe~W=`Hm%r|%*?>b=DP_jzi+UWV&S7$GJ2t5!o6ko7+ z#;jLIrkzXghI$Kni zvM`G!^_cY(&sQxoo#|`#pq(Q_xahdp6_>+JLARRDD)_{SC@dEKb z)qd+HRL2?!&-qiW^zM7m#z^_V1LqXKl;nJs`BBb%xuE^t^vVy*nW}d#kMn%+NLI6r z$zq;jQgIoJ?alcPldX;{K0nRk*OSjRDPgW3Sz??n{rzU3@wf2hCH47_l{ag3nLkjP z)w=oIiSm2Xg#u57=LJgCA9y|OnX1p9*XKLd|2+NH^D+OA)xt+_wkjT*#FTfVo$KfI zrE3ocz9>5UZT{wk50A~eyzA|=ztiI!8uy!*J+}DWV>M0W5%-S#3{$uNc0A7(vHw<) zateROFVDJqQO3TE3Ag+19n9Bq^V2bAoTtnEw)m-gt|Aw!^PSo&R;@9ubJgNqgbf~> z9+>JMS+$2$yBRjH4E>epEQ za6FvClr_WVfU3b6;|II!mCK)e4hog1bSar1amUR1RG&~kpva5V-SGHzH z*Sk0UFWyCP9XD)eaAVsUul@Y$vE@QNPJbAt_s{NN{Uk1A_HBB2xc>kB`>OWdy;Z?n zcPQ=r8>f;TTa8zjkCTmg{^u&*KWnRv;Qyd&{}>)-{!LH zN0F8B1{;0Pms+s*9>~me{-_c#Iat>G<`wH|*K4v*KZjIVTsHMBpPv=Hrz9m_k7b8& zZ1~RkEupc~nAh(m`{6%x-5U)eX6xcm+&78LSWTGFfe4ZqYklq5IJTHH8<6k@3XEis(Y^N)WpD|z`)4i zz`!KXKss{{8zY}p$5}7mU8R+aXLzsueK&m7HFK9IotoOu#N2P$WgUM1Zt~|Dkzt!P zvv(ZZ_-)2LvCZAz+g{Ij9kg`Y>Sq7hpBZxZUfF1GR=Rwm8=GyfTlz&d?z_70ub$)o zzIX5UkBbEE%bn|gWhEHuzD!>2bz^+}p-*#M*1dT1%kfb5;ZmLMs{Hc>p5LS5r_PUh zIHzPy`>fAN8^U()oqs+1^lIY>v7?ns4y@k!M0$Vwr3;@+rJKJu@3XtV z=Z{AJMuvBdQ%mRFTI+0>c*r+*+8(`KuTH1x>%U6QX~>Xo1 zgRak%shuSe5q~)KmBs0c{H6~5KB=+iC%p|zcRe!G{GnrVarw7d`hw~X(!uMD3^(xo zXz=*<_xQo|)|7Mmb^gRm+o`*-d3j%f z#+zv`^ODdkJ5Z*SXm@hotay7HiJkSTE;BaHd$y(M`L3G*F|v}6d&G9$IQu~GhGaT} z#S?pm1B%T4e`bn(syLKw_d@A-$;yz-JM!iNr`1lTPqKdesv`A2f58P;zYNdqHQsU) x?r*$YSj?OoBcSw$Wg*qZ}zka z5;q(VME%p%@f1}(;W=f+*7$q7uXw)Nad6@+?`%15jc<2&D)o8ww1J91aXj z0u2l-WH6sQHcawcbnQ#T_R@~B?z}wpcYB({s?8JXmc2fe{j+o5VY^4?=7zbs#1s|# zZ8_WdujAhIyLa|xNY}>XSIMV*65acM{XQAj_1)P!m+yKTnIk;euG>%iV*8!5yXPH0 z`r-!r+;gdcdu4UEm(JN}IzjUILiUZ1H&(5jv3}yB`)^jf&5%w@{a3Z<>EYxc-n6*) zKkv2&eani_v#t@bnf5s~aaG%wO?GkV$@jGic2204E)U$AwmbJ!r}a}OyKTOADidd} zxo2L)zK!{)|B^Q>8@Q(E3Ey{|{Xr&r|H=-Iur2zl|F2fK_t9p($RpETcUKGXZ&xX| z=lpnn!<}dOS`EAsfuTuBE1z3ishtt~Qfgyx^3}Sw)NS>_EPJ*r|ERLgSLMau2DabR zuPpGJe)C@1xr9pI+bg#3dFa~XA0ekE{rI@qckk9W+pAXpbv?G`#SDuxDVyAD|1WEK z?|wb@XJ~$@isLeS?dOK~XEvq^MKkRbwU_)YE-jF4@;~pKS27jotOtdV1wAFdH#=y85}Sb4q9e0K52v!T5RX98qr`-|UMGvR2f4a%t9k&%8(F&v$=Tzy5qP2P-3sfCB^RMB`qC zgtmD{F0JalRds2S_1D%ruV>Aj7E!IeD*MXjTJ_o|aW)DWJyVZL>R*2J{a;VzvRu8? zTP=;xUd@VF=~i0*?)5~ISJ#Vw-*h#wei>V`$y{%vcuM78k2JmS*ZVc!?ew`5m~iN# z#YY1-z32VuaxYHVYaXi++h}f-Yoq_~{mGCejl8aNCguMV?X~e){BZi&`JaE8$9PCr z`Mi9%We02A8vB!bcP~9R-6C(l*M75|;$_YADs>!x9KMk)^^%pZ=h&C;p0{~ky|{mU zsT)b z8b#KeJOAnMZwQa<{II4aQ%O(FOHyfSUaV00k4PJKb|c-hTi?!pF*C>DZt<&6DGR^( z&6<0CR{rY1Ss&giPF!pJ>p_j;_U!p3tEb&HvzifKm@v_DGdbK?ZR?C0utJHq&~|0Lwi?S8)eZrtN6{CIKvWvRp8UN5~_xoBVOI`vKE65SVGZ+RFc z9>P=?P+31=rk|yRYIfSL`D>c5t>Io9JMC>K@2B;Wl^(wP{+&D=BDOhbXR~H%rNX46 zI!_MjEwDNed7@ch`sN#Z%XmtKE`E6-@pDT;-s1u`rDUfo()V@*X8YI+eLTM++vm%K zPMaGamD2>DMpeH~7q|Z&9-ei-Wr_MJVYPo-w{Oq?zjSiDGNb#=Wr6Gclpd)?#;%R; zY~G!y{WV?-+?oN|F zuyt$INmYKeqIs89_{$87nIn$mtCpTqvA%sWb^`Z-r{?i&F`p71E!>(^{_&%q+Wezi zcQW{F&Emeue15v0{K_=OT=nE9OdIqc^~l-u8=XF9#kFB7yI5DR+!~uNC8D9O{0Eg* zcu!?M-gIgGe~p>%tDEj8F6BJ`%;Z$_*U-H#8_xSxDu_+}v_S5|;ZvU${CxeX=El0a zYm7e~xU@J(?h139`lgeu-g5K&`ueY!HERD}6svUSBy0DsCrPiRRz}XIg!1zA@a_1xf74?oM_fM z@U+$6`PrG9k*`Cp9G~+!N>b*@%oSz5U$a!4q30?CSJOKqrBzV&Fx3_Y`c4HiJHs#{GR^1T-n*_v2R-b zO-~M9f3NpX+;{bVNgfwgHdfp@a&n<<#hG#^>02=~J6%kq-#t+jWMAf%zwmY7BD)}? zb1WNn*3Z2ex#{P}&8O4*>in;{TU}epthYZx%1mFc{c>Ub;&5Zmt^E71FnVupE#~!n xp*@Y=dhHd)_i2?LoAML5iOx$Kq&faD`l)<5|E+4vMPSZn@O1TaS?83{1OV_3*4_XB diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_disabled.png deleted file mode 100644 index a88d483c5d89ad96c93d4d0b260e507c4b41f8da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1001 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL`2bFfaCWaSW+o zd^^iO@3MnP`}3WuQ>7f4LzTrkm=AD8DCjYI{IO(bf4~>hAnahS)1b65fi)+hkX3Ap z#*)leTReN@KRf9zbxP(peZ0@Jep;0J#`HhWWnBOqiD~gEJz5%8R9aj5HF`z1$9~Tf=U#s~+a`ZCGydkZpTQYBgqpn$?7jG+OL12) z=gMQ8DKAocpWXAFzW032ha)v}?6*kD_{1-2Uothv%ur>jq)Zh5w*TjSUpT4-$Uac} zGQnVPhEnxYsaGNs(`zmp)R+8hGnQr_=wbw0THqL$Z-1Zsw zO@+G~g*QCnY022L=i0k|(@8M+{3}Q4n3+d37@}=m!fi#$JE~k|UOI}2uT^@n z|C`rWg~C|VfrwW0U? zqb8r^{<>%Rzw0a41_>@|*Ia6SrskZjgw+DS-K&3c`{lCv`&R9jSyy|_bH2pY|F*1^^O;$lUR5E? z95b_|wrjzwqpiKscPDdSmtEo|*u9Lsah;doys8S>ZaJ0>dagf0`7ge3WLO<|B;mmH zV{_`(uaI-wR<$9U`|s7}15=#;BaEq1*?$Pl*aN3*Wk(<+jy__A4*XN|B^ds;Je3=fsreq zfk|Wm13spLzr!aft9><_%EWz*Mc48PG9NVT;jQoA#=rZa&a-3QxwmJ`UiypOdiME^ zg|VDgjq2I%jF$2yTAQ0rY&N>v{p~6z&z%OtkB?3tWj2TvS$U?)sxkR^^TC>~iUM^v z`GT&B6Cbvm3BBoe|6W;`-{!nBsb!Yw#un-2&!*%`oXGsMJK~8nPhI6TPa*!i|CR0! zSFUaL?SIa{Ant$S$8XQV6eA8EIFNY9@;URlxBG7M{!%(r-tu*6c3jN$>krn7#f1B9 zZD@>Mm+@YEa>~zFYahoamo~)O9EkZUH>JD%-@obiN`=hB*efzCRV4T)MEZVwa4xm9 zp}VJ-)$`rCTR#Otm@6KgKA2$RFs*T)_* zdfWrO4)*e(FHGf*HZR!pN{T1uy;{Co>Cn;Uj`}YOn_B)>Y`x6vf7L(TMJM?R-}zsE zINZLzSQxt7FJa}qGp^hvpLg3mV3+5=sidE;S918io?MDYt<8>EUm4T0SsyX3FMR*x z5nIX9`WMW4M#U3f&fa;#djGD5-8ynIyYwC;eKZK3T5*9r=EXCmVDpVL#rbzN$e-oC z$-YzXXV=!;(l0#cSgr+LUGx0m{;9`S%(eV>Kc*uj4HzJ&tBfMJ&csN>_PcHssD1x( z-nuy}d~d54_f>RRX0Ly6LH*V0T7@fi|2MpSZF{W!eg5rB2U{01-lTPUq5|c=|cJi!blwxXf|hXG)?#Cd1zIr*o9T?wcIw_^TgT(f+a9K3Q?<&Agfi z?ecxMneO`UnSSy2(dwE9$D)4hY%}`O_4uG{Sj~g~7ILRz%-?tulkgju{x=_x-?De_ V9q!jkKENEx;OXk;vd$@?2>`6^yn_G$ diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link.png deleted file mode 100644 index 42da38879528cd7e30a4c6263a1d267b36bd91bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1946 zcma)-YdjMQ1I9OFb6j%I%G}l|xzj0fOLFgebQGc)%55`aj?u_88XI%oO1aEsDzaD< z#q2mPt=yXXoow!kN$z63-cRqx_xrnDs|-`i@$8iy(b zJ1bTIiF`1EtAevZN>)52#a6GC711@*+97#zCc zHF~`TCI_{3q7+xgzh-0+t>T@ojj~lPIK64~{K4;Or1h0BX$q$qOHRsn!1S* zt?BZ553g|~V<~lkX&Dn&UmSv;DqGBk_ zg|hc9$8Jlh!)1^pG3MgA%w;!`N_-^EnR;y-y633B-OkgKejzVe-Vam_$5s(FX3Z9r z^1tR3#}tI#h_-8)#9B06Vq;tkXG_vtIf-)Xz>8^qcH~%EJ4E>G;2`tkOL*!*XggR{d4@zAaPk&VM30Vw@tetSP5JSsd0{5@ z3Jbe}B1Lk>-=FX2I(d5u#1@@uB#Z~tI$LKDk#fQV;&{O#np%dFXq1@Gb@TYAKiF8O z263frv8(Id4x$GNBemB)$D+P`8P!bS^VG!Bdij(ynFbEiAdjfU5B+YHa|3!kJ<>Mj z9yR_|MAJ&PVi%VW>ZfHu3vgzlZE@E3ubZ|JFq4r|>S z>uY3WK@FjrCxM%@>A|nmJbyeybcXb){Dk3$50V0cxJ4rwtp}$%&CA#VQAw_v^Mm$V zv6Y2WOphb8AUN2EzHNB*5i_%X;Q2&bRG!v_btCE>2{(}g`ngv1-{!bvefPmr6IOwk zCK-J|Li zM-A7!)D3z2vbS!Rt9t?xga#R)Y3i7PTHD;c({)zl3X}<^v%~XU6JN?3En%QRB!m|f znPU_eida%f`is?uU^Nr2?eq;VxG9bbyIo?sjXt;86 zm~idRBmq-9Z&6BH(r!YRrL^uZ=}Fj9tX2>z#OaR4Bd#3RF6X$r0;R1hySZnB*QYDv zKPL$S4$wmOFQ(RHCYVLb%XLzQW9g;e5lZV>{|B4?i!f1vxCkVO2btNQo7~=qEx^_B LvIFZJ^4`Azo6N5D diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_disabled.png deleted file mode 100644 index 62ad3bf734f712e0d36ea77134dd0d90316bd449..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1875 zcma)-`9Bkk1IM>#&M~YJ_AN&TvY9QOM@5B9iD4eBn(Lu3$IP{j#1In7HObuM$u+s> z%yNV&$0858d2%#gB6Q&C`}+O?-|r8f&-?ZM3*Pb8mRBKQI2Zr`K+LY0*!<*;|4dBe z=le6!x<3I7w7F^wV81=K0sx3Y%uI}I=|BMsmne&sWvm4c9^eLtYFh@7YMMZ4wPkMJ zGEfp2RTyca9RS^MKd}eOqT5J?qBrvk^Tp*OW>2Y~gxf=ooWNl4+Kf3vp(D}ypijD6 zCtLLSOLyD0*L|#l2R{vLTUv$X_%yHDwXKHE*gFy0!cPi0TQJ1YK(!8`OaRQ~m;Wt4 z#2C(3s`>)Ij$CP|%R8!~Bq~lbmm#SZpFZUAvbNXK7&^B}P= zj%SwAk~)A7B*s5hT4;t;;AbrBcXemu!&a~|p8>A~L`fN$jXM|av@*&=yfC4a+k%@N zoPf*e#_baihl`_Q53?;#{}uUL#k4LJaQR*68FG42%>5AleF(WF-5>q@v%L7+n+ z!%)$C9HpUY``-umW_Y(*ej+Q*BKoA{kH1|Ep1M8 ztD8|j|P$l)Cw-8_jDQub=yhnqUn zVfcs2e{(|2Hs*1Qzb(bj;89BbO!W37DPh1&io25W zYkiHT=B^kH;bq6UkOpr(s?C(7<(X5UpBm{i*50~C{l!Q6>1eJNVfK`%(t7!5!P!+i zw928U`}khx$#Dz=J{w0rB>SKyKUU8&G@E{LwBP?N79^E9C~6b;KlSkOP$@*G^j#=fksT*Yma~g z$EHOk%V#(@#57OWJ&*z!T^aJYE{K03yKx9X?R#eoV38sy9MXGEPj8SMxwu}R$xOJ1 z$YQ*wG`_fvppkRQsssAr`38*e&vJPlNQ%TeQLfZHwSqxgGN)rG!*M@iCfjq|c=H}% zxyofXNQUZp=l)<)%_nyvB|gq$n);?5HVw9^3i-ZI&-2fUO2~U`eOQN@8+xvIC=#5Z z`&U3f8L-Vsc0HTo_bpGF~%Nw^mTtMew8?g&-iyP^qeTxn)YA$*F-YvH#&jrd->xY5t>(&s6rqiGBB{a(Ck{G z3g?+(NR4w>gOs$iQf2|5W%0-gfuxEVb<9$$}$ z#iWc4fSY?$e-{Z~HrY`6Ed?ot${8|E+gu25#;3%IWRC3EnO;9L?dL8h%EdOKue^3{ zr3vnr)Zk7_K+yYY#$OB#=oR@Utt!2G;F#|`xv#L*DtuC8h@@W-q9H%aDj8W9EfV!E z(0=n6d;BgF2FM&TY`yecaYj9D_Eh-d)*(9!csEXKiKVbvx*w*iCnP3NG3|EBg_*R< zz+GxssVwLQAxYs}--rt26AQdL=}qa&um6g))<~!m)D+w^eTAHwpU84R0T^n#k diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_highlighted.png deleted file mode 100644 index fb63462aa07928e567ab1adba498f6f370b2310c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1820 zcma)7X*d*$0-cQ^gvL^qFvU$uvagjb(Ii`wWh}YIJ{NZ|@{(aJMZB(PEHm~!+DOu~3%N3uK7PQo;gHj*U@gp$HQ-1=qXc%z#6D2js&yr&2 zfN78RpLfu(Rv{yiA-K)8+qhud45`EzyV=EC?BcAhkpHns0zN$pNyE#?fNZXbi2*g# z|7YmW0d(J)BGYM`u6oQ6>xMeOl$D`S8<3FB$z-P63_2&E{%nLkH?63_qho`=ZJ(^tc)}`}g|} zQy{xJu5*@6sR@wc+Hs!p%gf(@Gj5kl_gmmp%lH~^)^Ztb-?&N$FhIHdE)OB_FHM(S zoXgOWzmSmKFvkcL(_u%>&6?X?HuKL;5nR&!UpcW@aYYuP1V^(MSRJ~pvVfB8p zAS`o-bA`WzY$1BblpR}uB`d+1MFos6xfzqADhD}1vVEtu6G|kE1NxOanaoVu0q^=; zLXgd{sWH#$8pb4aLHP~Gy9+uH06uO+I-}giez}`UacKylH`&I(uRg6LaEDl$Viq%9l00tv zC2@~@=@b0SNgKTwY2O_VL(;_RX?fxWqC-`sn8dri#j@msHqVg(i%_y!nNJ zj`N_gYvw43+k-6lM)mCVs;f=oi}eY$g42ryi@*`oivBCt{+g>()#5Mo4+=oIBt)mh zSS%Y|+l_4zxqDvnXaM(&#J=^Y{X3?^T0Naa%+>RvKu3Qz3( zSm5)4$G1Gj_6rlE z={#BP;%0m4SJBzizLt!TPKmY3IA%I+ht{B1dnk%ZAC{>#@P)l0oH7Tt`8dy>XvB^Q z6ZMK?iXFah-s`cA7~-KgLpFRkaKW}xWX7CG45WLvsD(;)9tML1F|x65oLw!1QYh{? z!3=qUEVw)#m4ONWq8wKdPgszmxh^uDo&SWD?ZuPXCOZ`=w>`T9e=B%D^P^1##fBD@4 zlJZUfEo642mN1hvWlV3rNQrqxDfOgck{D>8eUUNTSEmOyesoe>L5+Ygx+^e&E*S1b zoEEaG^U|o4(pr(a1|fL)b`Afii)~!9i-J#hT1UaJf9xvw%K;<5Uj`@bZjr`5*-@|Z zRVZ8PNeUCA{98S#K&@l5}2@2xSyL%G=Q;{|s~~rm66sY(yOI mZXQtL|9Oc29!dXUet$9o?dF9_xj6c0Wz_+}LV diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media.png deleted file mode 100644 index e546778f7355d2310f683ffc8faec93c6bd57d88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1214 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL`2buvB=uIEGX( zzMbvs5fUiU@cwJNQ(>sUm+ddoFXk=lwKiDpLffJ z&ABKhB)a*8dDHGQGdWxSndudUvzV&AtX^Jxw*B#s8sp^mcYeE_YuNMs-OlfKiuaX2 zyHk8$y7d9SZ~~K01E&F_+5wgs47fOl{2bcuI%xg=)qY$tyuA8yoRFC4&dDDtKd?v? zeDIl`k#fMhfTiAXQu&mb$;knKpQits#Zt(`lEZngB)?bt>7_q&UfWh}ELFAbw(YWB zt+g)t%mQYeBhMJ#XjhA-SX$UWXPtVvNon0_ zyHgx|U9OR@6{DYcEfiv3!J=I&w~-RI`P}qp+Vmgww@TJ>9xLA9#a*|6 z>*U{KZH{R&8&2)4Q-E`#F8py2ne@AtxA}}kLa6SKMh%tk($Z`*D-T3;acbVHICP*a zbXDc4Q%f!arJF)c+@hCEh;=$OWy+`Pe+1WuR!>lk%CRUtzgIs?efsa`+t_PO;+AQ) ziz%!M()mzyhE;6yrRj`wE?3kZ%e`E9Meg9=uw}IwUz)G6I~HmeGcfEbWjH(E**byo z+vb@!U!MH&;m6gQWQ}$6qi3#V_$GWu`PFw(StBFOh80CEFZv=^9+!wrF|nZh+jM2yWjPjNJGz~b9u6QEt8#`oXlK=_H{3q z8k8R*^`|8G^od2wBMuu*%IE1@vRM0Tzxr|O<%-rX8(thOug?7;^@_vdoaKgxOOuz{ zA9Xis-+PRYFa6cWw3v^RUgj9{NyyI+y}hmY_UV@qMzz-qUF6*od#B5Me#LiuTl
`i$word7_aS$Vg;o=e=cy|MrF)c-&7 zR-ZlT_x;wBi$7$`<{lR*U_3whm6e^O6xQC&7dN z9UQu&<(2Q)#W1|~Vr=>Qabs%*!=;_^rz~FWTiBV<65RRq)WvBI{s zSuzh7Twn;ZOA^?|bv#eyOZe_r0gTg_UOl(WKJH+ixPoD|$-{kLmlQ{?e#V|ZPzinU8O)vI{Q|%#c>}$pE+u3tPEnnTw^I_dC z5A%N=>)F-0idFnIrOi7}l!|l6&%~LNvF7m?${)m~7-N`Z+y3+c3nT_lS3j3^P68%HrJ2E9%bMcZkJ>L-es76J#KGALAs-SPH|*t53fizpOwjesL2rJ! zkPD00^{WD^1Z*mVU!I(-@FhXfGkcQS?6BE$pU=*CV|F)Z@{Z3FKTKm6{q&4sPV_$t^QRtWkW{=`@*6hEF1+t ze9SXd4$LlS`S0p^XJQ(YL%LP?j*|`Z+1Y*{GQS(2yfz|Aw)k&#{*`N&HeXz{FUY<2 ztW>`0L#7R$E_W-Qo4s17=fWVLtL*2ydl8R8TkBrm=&NqBQ;$A)HA6hihr4^P-tQ@A zA8c^gvP&+tJ4QLd;Bm*YqI05q=DHdDwK!z)zsvja>3{cbm^{Ce>oPqzx0m@JcRAld zx&PDi8F&;{Ft*e&Jw3dZ=cYx1WwC0^{h94wQ!SIf*FOCpxH8+O~;qFQEUT*UL&Exm{lXB+qi@%gKrfSbQl9RgXUbkSH_1lKl1pNeAu}hZE z-DdP%xwJJ#=iTw;2cQ4A_-^%W+N)^k2*+9v6cVQul4Tj$Vop^xi!E^sZ#Tx!vodGDga-Bqc# z#CN_r%F4L*@xHqW_3=6P&fiSACVBkFPloODc5ORh`CF{hMNj?FM)Rwimc|qYH2lzb zFSdToTXDY0^ST%Y#ME8d*`!Jz##>ZCe+051|F(0j_maeO;UVLr_L-{tTb=!N_ zZJH>t=cr{v@=Kq(6Vda}StajyTXHfwd^L~4yCs`iJG*2yw`JZbu#Ned_i4||Z-$v1 z1$Cmw|10GF*tn}|!2dBjw?%6Njgac@tIuqPnFMR@KzVRkQr9g z9%8j7dV6TYN7nNXwuBZisGw1Y1WrajQ3?rPG!(O=F`BrA&IH$>SZ3a z16`aNVfhJc#qJyZ8DD+vUn^_y{DWRYLy%zK->{bqcBi&7-;;bP_ju0UB%kLwkNRYU zkIQ{eT(HIK_v9FxbJH&_Hul=P$z$g?$()JrqkJx!HLw2uXiG)z3{_Ct8F3PD5lI`lgHOSUq`}d~A;$K{!y(6|>DYRXqUxU-IZRqB z7A#t_IlwdV8`H~>BZu4!CpcMOmdHJK)*}C~>bs5Gx9_f$uTGR}x%>Uu**AOcpF4Z* z_8rE8WG0^mP6I}@11vKbgcERZ9IkP8tg&8kcK;n7ww(BvmkuQbKTx_8=-0rg?Ji|< zqM_Ml%J(f#WbdD@elMNy@wzXAjqhLCQ?~0Bsk?Eh-`Ty_37 zrgDp&kB(isFkOk|TfR=n%do}#28X_t=;i9@)>`hcd9HaX^VA3FPyX>N+RA~q+rHR7 znN%?IkkyQGeZ~$uha2on`+~lHWQyYVaajLh(u`BLVtzN&?r6eF1z+AI-hUhd6MA8J#p!$P8_X3UoJhpzAR6nKGa@{7rvb1;W?`iLx{QG}?=z?!Y>Sn54-^>&^E$P+ijY9gz z_p)`QudH5YlJY3Su1R(~|EJ=#c$VH>?HunqI2SyBy-j%RUMvB4wF6XJH0=ld;L z|M;ER5AO6A$1YfNZIleqahN-!%~tmEME--7=~`8?^U0EUd{OP#&Wd}4MEIHl}?|vOW+fgnoDf-9D2&0|UbCcB_q!;32U-YHxCX>$PBgY#Sdv zcIfIVe+iEIDYSR~D%Q>MQ@gyq>rSO8ylIav46TsEnLV**+)|c*j7JVIeu}Vo_Yhdb OFnGH9xvXP;h8qU}R#!&G@fb zFz0Xd_TP^!fA^gF^ZKdH)dwLzEpEmz6y$}xVu*Qk`fx+>;vn`1Lh*8JbEKzQF--sQ z$>71A6;~K{98vdy8NMO7apmb}+fSZ2RJ-$w+{rbS^~UKlBWFifK3^1gQThavoWrUu z4C`L-rZDm=ghnxhe@WqlIqjR)2jSE6bU*4;Z@ZFjaocwtqoEX|#ih&@jCl?{ZVY`T zQdtes0*eJ3l;^fdJzzVM!ScYvy%)cy!2W%(_yG5f)gneYA$QAxp~&Fr>gTe~DWM4f D(++(t diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_disabled.png deleted file mode 100644 index 109cfcc799d2ed46304bd6363c574f776c13b7d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL^TniNJvk3^zV3b(gOyCYpZSumW6c19lv!y^S+oopBxhlhk$}Z0|O&Y#({b+ zne_kH-u|mNXSdksf0d=bsYR%rpP4wr9OL2cw}Bqs65_WxSq(`1gm#2c`$VM2s|d@@)YIB7>)^pUXO@geCwW Cws-pg diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_highlighted.png deleted file mode 100644 index b0889f02a1e191c056b6eae17ddc3805dd066367..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL^T^wg+oBWp#dl3!+fUc zFZX|~*tcx{M45v9zNS0W?yKGAW_Z`Ti0^=4ygb_-X;;|><$ZQMJIuSR7~E@WB?|II zN*Vfov~a=<_R}&bz4^ybGIGcI>Gzap>VB{-zBY61&V$zCy$ty(Too>wFBoMW^tv$i zYp~ijFxv#e9MyQ4>(8-G&pqr;&r|;TdGp;TMTd)+9!yf#XFA7wnzO-s-X0DMa~*XC vy~kAw2Yt4K#BXP5*_T04oaNdf-gZqx3 zNoFdT%k%eGTlv+diSy<>j5?Qn#ZuY%@2ay)qJ$N9>Iu#)2@iMQ-;pZCdMWGUimM66 zGk&DZSnST~zb+zH}0vmFhuJTAGY{r0)}>3Gtf>k_Zb&P?yvb3Ujpsb=wx z)r|GVw!2GTrWLv=RLd;miClMLLhAC{-#Xla>pm^H-S>OZHU532o4>R@_{#A{bp7UB z_wUcx<)-fbxt4ir+x>p)oDjRc8#~N?IkRaquiUkN*|#sTMVxGj-?SxL?(4tscadBX z*WZ3~<12%+wKJ7NeEoSVD)Jw-9N2OGR?^J&e>Wd?XE%mQ7ctwd;ktBB_Og$|+Rhc{ zwp=;Ge92|ct3#=K6V)8Avs%nJB|Alahr_bITSvaP1CBH57v`LP85-k!F!*lgbvCvY73L8;Ipy!ZtynEP z`B^~vPb=fyf2Zj_efsc`qVtrmKIy9tubHyw3g54jr!SVxxt?WOG1L2aSm9i`;!Crh z9{TilQkMDmZz=EI&b!wyGyCuNZ5bZ2u%r{p_;p=Sf!+T#y0;jO_Vn)A*7UOCNBfm` zZ@pJ7&02KgYQy0Px7P=L3r@1qQcjs#(xG>H!f$Qmy89)1rf@d5L z+A06GkB#3|81d`i-KOYi>(7aoGxbH!m=c;k@!7%2Qh#=aTvNUz9+%zqBr&zlVO(JG=AT@ilqR=U*&bqlh;{Lv#Ee`NsW>&wQPj U4sUlT0v1UOp00i_>zopr0L6Skv;Y7A diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_disabled.png deleted file mode 100644 index 97e1a3ae011d3f5964f20269c7776f58d405fa2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1180 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL`2bu!MQKIEGX( zzP;_+5gjVR{-JnMPj338XRPXyTYqc}C{YdZ5_b(KTqx~bs(8h}E05KiyEHO3vSnSY zMn}`O#Tp!WBKF<#3L3j6CoY)1sMd3K$}`n%#wU0G%YU-;a^{O87R%4>`N@A~&-CAR z@AmHBSzL5~r=(zAU;~rL0tQwM2S%;{+{^=4Sr1i}JjkiN*!uNo{<^xfUwvt7c8BC{ zDeK(z_}bT=*MHA8%q)E{ziV8oKGL+YTU)`IrN0cWz z-K#~KTHT%JkRYx;L{3O zh-VTubI(Ydbm&>@?jxmf!s`4TJDOJfYkVs`bwNSV<^!`C-2+W7$4!f$vm?4{#wu@* z$a@dIhkkKbI;DPj_`FZ@X`dg2xzGE)s?76fjEZ<&k_3Wckv0sThsueF)?tah`+oCR~&ZlB*_YR7p;=H3T8ZSm#v{Q7d+)@l~q=#di@pa0_Fs&h== zC3RGF*E9ZpC3W2VO5$eooyBjzt-ZVSUH%Ur7tR&?yPnOP(-EtFQFH3Hxqja+?=h7= zc%b&^<0_k;2Xh}ydp=EXy2szVp<2KxVQZwXH>DK<{{|3yr1OW(@L%{TUk^uKyJC+*w)h&g{Udt}bc zDq8vYb&Ts)$+!K<-}mj;b$fIB#u-KaKSG}lT2Gk#W3!CU-L_BvCf~IRw>R5vTs`Tt zBIEwO?n{LZ&L9>~--?mlRDE-C7p znw(bLhu^gpQ$JUHs;FExqket-v`4bW500F9t`xI+mx+yBE6_8hr44mV2ew%Q3KKV$es|0wqzF=((6o6!trFE8+_3m%WK+h#)yOsF9;}dt=Yw>MJGIN~HW?}uq?(s(kc}}JI?p8mu zx7Npe{&ryJANHQzN4~DTvv_w$>AS}}lCHg)9?PS5txTzA_U8x1EO`%4$R4=W=YQd@ zW$0?fr$*mXE${x(++F$M`p@fzkvm-PY?aw*ZpnPFeZQft`!vsc^SzH-B$_v=*XFlG zANgD-UFg0_=Iy;ZtGfQ3UlYqyHs}2-SW-~f$Mh|D>7A`-4}_@KtM8F>G-$eZ&D&yI zvC_UJpR3c@W!iLiyepc+^1VPVX5I0fzyE}N7rd_A_RL&$o+Z%!4Zj8U73dr)eaF6z z`*SzDoWcHyi+|d5Br`>eSlNQ|(@-qHl!ELr_y~pnE z__IFy?q&JIWq(>X%N#sf`Y`azvU_VHm*y$1IJv1Hv1~*8j()El<^o&Z#{Ovf@#m@@ zTey_v{;4~XV?wp>Jvby`Q_8?>7g*^PbJ?5u&g>^brMKW&e2i-SS&q+ed-g9)_5OY?rm{!4Y;(uI4_dzt%kps7U(%P9oF`Q!_*nRl zBA0UO^C@eu32u(&c+>E(;{CMyM{nGAeGzYwy1OY|_)h<4S(&58EdTaR%fEB#&9cmU z>?d093w{!~cxvH^M)|UX%RS2Hc1owM{da@${57$)u0HRdY~MazU`L=xlfcZo{%QZ$ lq~pncut;%W`tSNcUMufIOk9k_M_>uU;OXk;vd$@?2>>#z9&7*r diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote.png deleted file mode 100644 index 0582726fedee22eff12dd5b17860d95ccc7fb739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2215 zcmb8x`6Ck!1IO{P%#pK2jtS*RBE-ynMpTZu3v(^G?<1QlEOHw;B63!n<;oqtu4#lM zvynn0ckXjvPtSkwJU@KiuYci_Y;J1A!6wKC0020Q?-;=UYWLr~EOJKuRTRk_>p*8ONQxqvGs1@1=@gw`$>Y zE5qa;CMi5-Pgbx%pNeHCz31M_iWNkW8OubqP`3z4O4Qy%EbQb5O+tnP1|TI(#$DeUiz;IFheNE`U0z}+iGH`P+S8b^ICNr z)j6{Yzn+*w_A|~o*e{e#z%Ea2<&5*;=Z_|#-;nwr^rVhwy*DAfC{F(oj7&&C4~`Ri z=qhy_^vUo+xD#i~bi>^K^iQ-?g{+ne8D{P4;lrfTOsrDG;(>!f?Vp@^r8FnN`IqoB zZc?|*QI<+y?j#>cE>#Shro*>`SzlupLAaP^taKGU760?j^oTeARS~Xpw)fcR`tTXF zexF%2mc4o1P6vka5N)ADVFJ10AqAH7`t5Y#JZm2*@r?$1s#n?oB&y={Ku~ z2N=BP9{X@^jCjplX*~*Ts%=$P@Ybnh3L~kSmu|1Q$i7^_dXi2Pz=~JeN1IHS{XsM% z-;)Nlo|-KofJ$oa>gSdEnt5b%$&<$=H99=P@qF=Q|JjAj<<;4^lo|;7nyT6smq37>I4oody?d8FbWAfaJ(g3qD7?FGfH?5BvmX!0V(EYs@>ZgAx(njBscSGxIV6>cw*!_AXEu*on3vL{L_yz*k7)DS&y`y2Tz zGVcljA?5~*R8>A)=eXtVkSK!=)HD#K3uo+x=S}h4F^%Sho`sVJtB`%?N#cth%aNTj zO))8TL3xW<%P*V9Y@itr_qhuuUHnU2GwbfIb{~?&s+4ZvXPcSN6Y`(oVjq?je~2)w zfLml)6`g)0GQ3_Y zvB`f)tLJkylE{B~^rIirCrqma1e+0jiOE&|I#T<=u>wa!|Js>^7HoGe)G=iWNnK4D ztCg^_-Rn%nn+T8r!6YH1FfBoj14P^(B$Z^lSy4fL^VyaQpt_%I&IwGwK$lm;8lq&) z2}B*-aPm5sLJj4F&#l(@?jxzZg%IBR1@SC(T|>HAni68Ue)Jt)&nGrZ zmKqU4zmPmB(kj`nfF!><@z_3SNH|&Cz*|L^BrLpMnoB>Q*-BINCbMYnOQ>Rj( zbm&+$B;d?Lbh*Jv&oIw4paXSB;&XC+aNk`eX_-|_QBe0sjnKDXqb`*L_DkEYOJeHj z7W%WGYWi_8HFHm*1magqMOb>TY5k16?Ic6zL|JVO=7|w5$Lga3CiW&HVrYWxjRMud zLog4nAqqFK7_AN8|B`v2bH-23c2pF8X~=H9eg}CBO6QmQ?->+ z7x_$VbqCPbpH$G0^>63Ndfnl_RZVsy3r3JlSnZcH_tf4O1S_A_zBui*&n^l6EY1C4 zH7NsfBu%h#4T%Bh|DKHuh*YwnEM+}DrGDKF)KBIBl;n$dxP5l zzgGD)cahj7xg}*i+3GCxW*8)zVJvBhb0Pj?>9Y6eXMIq2!jlO+0UMo?JM0-`F`(2^ zSp5r8jP|-~G#^ zW8-1?8PL_;oV3Oo*Y^a#KK}r7zuF7U%l1wK1x!6-7@q>y)v*GXa=R$k4w={|jx-y5 zEy4hi)mLurbvb*K=ZD!coF}3^a=&u|lJ$!FEdOxN z*U0K@sSYlP1(%*x>-hi(o)M|jePG+cL$sR%vqQ|czVgo3l@0P)!be4Q`)3X0N;9Pq zmJWB{QR`Q>w)FeSqb&24QWv<7L?kq)%zr3!$^A(_74^s_0Qojp1{+-mmF4$gHo>!B zp$Ummpw}u3qjq_Nrbc~kz1ps9Wy>ak!P{x^B8bRj|46sm<6?Au|E`-0$A&+>Y2-Or z^HGu_lo?S%oQDNnl$?%V+vF~yU^3K%hU~vlUH=7^!E}gcX%Az;Ekdj`x6A`;(XLbQ ze)PcgP5En%n~U#+9m=SMlBKMV84F|oXS&bwx_@+^#!G4#AKd!;JOIYGO$`Wo&QJdX DhYc}) diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_disabled.png deleted file mode 100644 index 973d7b4f18dc2c8a708fee13d808c55fcd8df8fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2170 zcmb8x`6CmI0|xL3g^&}U$#dsF z9Zp8LkxWRvy3rB*mi(u-#t3LaqCj*+6eTnAzJ8(`J5X54oy`Uln@Rc6@4L0s#1mJyjyzy{Ag^zp0s3krNV*21F$ArPMVdZZH)@FUnOo`3CK=%=%7?$a#yt$1E?Hpp3>MVjI^2d$9Zv8 z$>n&4hu zD|RO2tQ4ISmlJ^n5SuR!{Yxc51?;&Ofygk0ZC}6m1~&X{0Z7o*R8AyVXGz+JcR*R@ z26jWo?W1ilKN@GYA>y^Ld5~g~gYpepzhT?LHxeb1V0)al`98j^2y?ZpzsNv&*|h4y zV=o`jcaq{=Vp4q0b){@YsvpaklSb8qGN~XRY;{Hrjvk?5Ig7P00fe1BAgKNTda@CeGR|m>$D5C47?oL|NEVvW|vO z+4U5*zjMB+dGl-d%!lJ*q5R{{nHu$1m174U6i14yd^pK38|FX{-RHMAQdaNR+aZU! zUz3}7i{s4Dr1lo%yObOWOj3JSpK>Zj)8{Eva=|9^aR;R-fmlo87}i2Y2KD9p93enW zA{O-1+xU{!kZYxQS5^ROFGE`{b#VJhA?nD~LQuvu%V{`S^>{&4vl;9WCd))CWYIdK zU07(Sw5@?WKdF>L-!OirGkc@e^M=0G(nY}mA)SSg@g8*dSrpZqbh)OMC+X#$_ZY|< zCdh>r396^Ur>fVHluC-L)bIJTFS1YX`h2E;Af5w(leUprx8IHOmG$8RwuJf9JqgY& z?tKgUA>w(8!RH&xA=TkLF^9G*FKv&eVO@5B$m9fa0*%-g9G`scLoBomQVqhvI2Jr> zLQkZMP+_u@fnz@CCau$d1^Za1{|+gs&)Y-l6YsM)jLbY7|7432ZP>3w_6&9 zO6-6&#)m*HDb%43vt`UJ@1phvm4;Z28u_=D3pG_qi^MM z=Rh8_>C@(%FIEGNCsS!5OFOI{UT+~rt4uTr4(7jQE^2sZdJc1;^!@oHqF~2ixU6P~ z?>mB1*pEj}BtBvNkaNpo8}t{}NKH^`*^hQ2Ia}|hq)W=Rj;;$n$Ba)^KXl=$m1Nv$H1^QVlgd{-8I>P*(>UzWjVXH#my-2np9gpn=m> z4^d9!!GUxWWSqKCG*69C4hXq#Y;FZdUw$sp2Aa??!hb9?8%hv1m=t0fRiSLT8b3#h z8p1}42S*Db$`cgcT#=|bv(SM$lg&f|8P^KCq|FUxhgHc3+hrG^kURC2^S9VP0g9ooYJwo9;+UtG^J>$JNgpC?BI5CSo7YYUb z;d2g^QU+~kgPemGffxI0zwJWM+^k2`h; zPICLC$jlWeuNkK0uHy68oQtA>-^67+&teVUZo%X#AQdf!apv)E-iC?2G^IhIo&nc} zEma!;E3RmCPhVyuNjb>9emjPG~esREIliqwFK|WSS%(2bkMVJl*rm zo>)yS1#ZP??be?XdT`)9P5fb=TtP#$%Lxi^hnZ>6GN3>geV)@>_fdz#O(Grk3yY?AotoRr!l;Z zrE!J@sZ&;urUcmlOVhP4W$x0uO*^C@LjCurjV?_zdRXV6` z#FjG*D(1+Bz5`tfzw>G6JFDC9^)dU>8Jj;PaJxN9?dO-&r~ho(jSq2*PUrq(F)Q31 z&d)*MrR|%a;@qd_Klz_%#s3qynL}ixqrR51k4_$FkMXME!BFHXllqOpqGgj<@e_;D zymv6zZoFakHdS8t3|M`3`BNKT#}fx6f|M N#s(JpG+lJ`e*lrR4Tb;! diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_highlighted.png deleted file mode 100644 index c374e951e636ffa7c646f4fe94874f937aa738a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2021 zcmai#YdjMQ1I9PP%w^Wk}(-}CAD^89}Po6b&-DquJm005|vNp`MV>G?l_ zY>!_N!x*`-vcI(4K zO`RWlqfl$9M)J0xo7?^9I>`AT6awrw$?G5**x9Kd=hOr%_?^7|L-=<^DciDiSi4n% zV9w{hP0^&H=ANN*%b2HD#1qoc-s!Hl(SJ6L&}m_`i!>#H!VX`V;|xV}AVRP$2k`IZ zh|HwNJEPUgN5i9Op2{+CUrMKiyPu~^zXIILUFJ)mv--L4Hph&f->RdenK&KEX&t*G z_#0~DghZ*2YgMif_%r@74YBG;NNLDqW!@80L0HRq)?4MWn&DN({n8$}^P2^T5PLnc=sH&WB_;b^SW%DsinS#grwBjc}Z`VZx^C&&CFOSMs7D{<_zGCcuR^X zS-tmTRPVonpSm#}uEMOt51vpQ|n<-QGv*lB^AL61d}D%#n?rS8(evUhbVQG*lpBaqU+Z5H{4-} z-5{z7X_lkI-UxAIC7I_w*F!Ci42;OB_Wxa23GOceUQo?qzmj~&>Z}{w%`R^zEx06F zpJ{!o#5Knr+rvTAA2(*uC8guCF8GeziyEA?woT|0EM|A!>&BHdeD&g#;t%4{-ei(Z zk@w2}^y!~z=%xc^4>kOLb4QZ$U*CpDG$ou{g@jmof%dI`=R!wbct-?SPs`l3b9~3L z3pLum3wGCHuhyQ2%V<{LafG0i9R_Ye<(=tv?S*guC}(1qj93e9g<@_ORjn9S)A-K} z^M%6(Z>Z)AIn}WI^U6yA5BFUz-TUXROpD4Uf)hMHi%yXWFpia$^-i|r?Gm!pPk+nm z!)%-Ym9-8CP9^$JE<_~d{c&a@ctv2}X=&Ea+bf8g1yG9p^t*^GDeu;x`^R}7J~A>e z#39c(c>`UxdGJol+4KUYgT2TTu2JK13m&O~8|X5=lxcrQR5G3<^kuhxtSYX3_(YuK za@uqpXQRC9@D!V})Y0<*cSESb_5#&0zP)b6 zj;co{xnIxoA0CS>c&>h+VjUmZ+<3Kkj996*>Bl>r9lz0+L0TNEo2$j}1XllmOl81; zZ~R=wc@mXD>-m&YxSAh#Uz9$1aM10+R7j84Xm3{fp}r?(1;j{g5cVnVfL)Ck& zYkW$wR<%r=mrGS{L5%7WNNQqB2@yBr^GD1Y(xmcI{JKkb>J%lT|0S<#GyYF0e1CCtov9A#A|0gLK9BiJQeH1{y7TyvrUpZV zb4%_h`?RFhak3%u+OrS9I#Si6h$kQ*x@JHvLq<;naf3US5!PJK6x<+3KkweeQQn0UJ zqDzaEuWzuU3HGT$mR?s@T3qz)7U`!-hSq(!nNuU3_m0Z`$TSdi8RjzI zhlS1-GQE*GHuoBae{-IiZRZ!F56ZQA2phO_E~q$WbRz- z7?274^$ohA*3srf0K;}se%@rKUum&8C=xKdmquHE*E|?;Y zY6Ly6D(rd*4Eob+GOTk_8#*E1Fob3v`Z`jvkW|To`qSE!mHKOo+W@k?lO2cPoA_TJ@vF4} diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough.png deleted file mode 100644 index 6b8cbe3d553997d66caccf886b58f2f137d8f1a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1496 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 diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_highlighted.png deleted file mode 100644 index b6dfe9d7ba52e00bd7c8ab865158edf104c46130..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1370 zcma)+do&XY0LJIJ8AEv$@~Uo$YE+Zw5Q&PC$C@x)%~@(=NG{i|F|L~{C-Rs)PC_2r z?_DDP zF-UPYqw=7qcOirKc5?<$2KAQ!00m8V7bl;1nPsx%)(uz9o*~AE)6eGR8f2QCtBoSo zfos59O{RL)DP9%o!JN=K>TFX)#CFO%-Dm7spTr%%JuU%9$N1q$`C7Q`3rmY9;} z`0>Tc+9fNpFpNJl%^&3M8Dc)aJ1F8Z@D7Cop9f_x?3HzP1c79XjpS1a>gxYlP$q<* zSjv*_bqk|5>$Vegg*T0*Zjy>B#U*2;u~fde^kwRGJFbD+TSp7-a0&I7lW>`9OBP0S1o5N()M%AO8h29U?f+yrySRz~ znU=AWle=cYHLm&On3ep#+ZBWlR$n40JjB&1= z*;3dX=mL$i0#QT0mo~ z(Ixz5LxM=kmUEoCZ$_vS6E|p0**(Fb#7*M6ZfFv?v^%(P+zjn z->HeUo(fqkZp&5+2$^#?6ly*lNmoMk(-mmpOz#f$O{@mZGWv~4VF9Bwzp=i5b}}mi zJqJSoKSVNaW=j2PTSDhf2BALrV?heNyo7jD3HoPi?e1JLFXMI}<^gb$R4W~;`IGk` zN6kqs_a60Z+JXV@*KJHt|BS|gTeRmQy=6pI5o|6$uw+hqMGA*CO5^=?d~_GbwZCO{ zMju(Iykir5SOuwL?otn{a5ynh45ASG7{`S;wlKG2UYmw-+A6FHeO1&GC|^wzj5_4nNp4vQN4mO4TkUv|2&^$u?Z`a?)zt<+ zFU}{5!npyZUciipIV{!6q~8P=H}Dq1^RI;AnGyp(?mNNLqkFuOZ}0FP z3C(vU^Trr@@5BPFc7j=ySt~DaAM35)6*QNIUsW+P+&@~wxY1%0-Uy5z$`=$PZb(ul!d+6XTW>yI&v}%Q$EneIRGEG9DmV6LNmylGYAJ(I4*AP z>XR29ECb%A;oeC-Zc%wRBu>>o?w#+$j{os7|6Y-_R7t9g4LW*Q@Egq)uq$_0PZx?a GD&=o_n2;_2 diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul.png deleted file mode 100644 index 192486349d8f74f0e6f0ee3f43b60ecef866685d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 906 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL`2bFuQoVIEGX( zzP)XqAsi^f{^9<6p=|csjs=CeMxC=fSU8)mE3t6RZ8;KIZthsPL8_)dCtfA+>G@pedoy>}@gIu4XRfdR{_x{ZpY+^Yc$owm z7+4e-7&#mm@G%Yi8jiD0)>+@VK(>D zGkLeRQ;gwO!D+K!9aG%Qw?@E7Q6RC>H~|e+El~*t+ubjO=|Z4p5pc(%cfUv@0>6u zAJbFvY{v!PhUaceuH6}=8E00epkp33@81P0gUvtG+BVz?G3T3Eny}U7=S3E%m+ScE z6<+$z|L5=|tI#uijRtRD@7W)7R!{D$egE%`Un5)CR^^#_JN?rxt=Pu@hJAAJ>P=H_ zztHx+lc;haD)+B*cHQ^y_d>s2wXc@RIy=|qYu!(;GWEhmF9eX|)Qw}s)lDa!-BX^` zzei)zxofYB7Hz&=vtXL~*ZNlRD~lIjYg)}+yi>iEN#5<=YYyoxz=*tU?d!kxpIH0v zqqk@NoHIKm<#o61+`Y$aS*@AEi@iT;)XO}0EY{@kDE_`_5MTbPGAMjM$2v|) zM?T(Itg|*@;(NEw4R<0ce>wj?;IqD$CvoS-PhZ-vr3+@=dwpfkv0WTf*(_&dE`IZD z`qfaL$ECXuRuxv|$wnk+JXv*p&*D63jn%umHm$liZI@X1>K!}9J&*NXb~upUN=$-f eX#B7EK|DL)L6TX6G%GN3F?hQAxvX8PuqV?putK#yx)3l(lS z${aa+_DX0*@NE^ftrEra?;nnvnEg4feNXngPy3(Vz572-?)~w?@9*xqYU&6yFt8{v zFmgCBFyUi1Ix?APNIa`c^D~XQ%l>J0cUPsK;MLT)k{p*Y^U- zIMD89)@?T$SA>%b{S58rLEeSRQ%_gvAinrZN#HiI^Tcq?Yi?s zt-nFw?ed_RPcQsaU-&j6-)jHK%(-X7mOJgM(oKJT)WJJ1@BYo;@^tQ|K7BJc6qC^Xpuj16moE%SROL5ckkic`Nzss=89f96Snzt zhlkzVpb}3xvweoEU-=k*_t}^Cey-c`#aWjvHyq0~v3~vO=C7><%a?rYUz(I>ck;wJ z_3CZ6tNHs6U%gSa|6J?+%YzRDahTFIk~$ezn*6S&d!9x!|48W{E}Tt+M_# zvpQkXdN;P{yfrqz78WN|s(v|kBmwMcSHrFkPxcqAHk!4f#WCf}2DSK|_a|NYaZfKs z-|zOhM$@(jRkzQ+tDRpFXqI{?_Nwi&TdhgoQYRIb-rqmdKI;Vst0ME;h(EtDd diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_highlighted.png deleted file mode 100644 index a017124ea0ed05daa6febebcba6a9646fbfe8599..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 871 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8khhn#^NA%Cx&(BWL`2bFe`exIEGX( zzP)XjA>t^)_TanOteE5j4ZTY}y>@d5v6wpww1haVyM9Qob-}&FL>H6gO|Dklx~;pz z1ehkRQE*h5JGXP1nbVYv!oW?BXY0Hxe3N?YQQDl_f1*`3f4+Yw#ctZ!J9qd5`8XUH zm;@RaSQHo-@i7lLGSviJxc+OJ)S~kzc`MIX2AO#J%nr)CxblbL+0SwDzq#I=y~CWo zW4-6f9R_93TqfvGk^JeAc;WB53*mYCF?ajdonQCH?cUoOGp#%W zw|GvSxP41O+47cU5<;ng?r%3be?K7g{kEUdip#BqhHEc>ytw1ciFe}F`~I)_dgSUYso3W(--~K; z6i;aWTf5-W>0{!zijp6HaQ^=KVAt_po^5w-Sp2zQYp}ZCjV(GaN2czDT*OCi?wMEowihU8(1!zpGsSjCP6kK9%$C5&O2k&NK5!f7iIR&8=>VPJmW)X5_X@S~tC< xPlnx^{jq3fA^S_G1NXV`CPR2S{qOvMpOJeb`;Dj@Yk@h3!PC{xWt~$(697Z-fW!a* diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold.png deleted file mode 100644 index 83378cd62cd8920e61d2090bb61a602d8c9b847c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2121 zcmcJR`#;l*1IAYyJ~rZ%5(mw&B$tfgG|Qwc5yx<4^@SNKp=TM4olo6{r?7} zck?_pjkk+EvBWcWpnEUWmOvl?jK^Z!685Z=hes&6EB&#`ircKVa?66GW2sm=F-Kcb zyIIE$r}bPbq8n~(aS8hJJSK6IN zDb>=SY@b*Z-z-ew>wHB^DCvH#=^TB1l!dj@a=2XcV?BrAbcccAPe+n|m@d=_q{D zGvTvJKBbs1YxkL0a!ZOCPS;jZ`F_#>kUXp&p*D{pZdtbuBl$M!ejvxqt1Pxn1@w(U)SzC`2mbQ&_ zq80mr2el2gvzm9xgjyv!ZURp!8t!(XjMR9CY~ZWp_DsZG?quY9X-b*qmFk{vP5GX= z^2g3O|4xPbRhL{JfdA$Al|9BO%xI}-8{ciCpN^O`MTV3NlsqjOY|ipi`w${Udj&cd zFxTLFDA=!COH~9vTCYf#j>EecOq{r3zLaJ3rSBxf*zUK0oLO+pOlugVi5^yYezMSI zk-8T^5DNARg$@yHOL34M{=BGd8M+yd3|$Z8*TJ)tY80-|qnSqQUM9CS&iNKLmdH<+ zH;ybEyk^_N5zMo-DP5v|KE_0nMf}L7ZdbiQEr(L%?Du;Hhvuvv5U#Wh8}3N;E^lRA zTD&{$7Q1#e58uers#z_j{o;*{2Z*0T?%hfUtlIOZ0wdD zz0e(mL7RQkVee4>-!#>r0AsD9o4YKZIlC|<4`Enu*akGe8QhqbYQP$*Ol=BkGdsEi za-kQANhse&_rc@)RCSoPe;bw0S?bL^qq+hJ@FMEr7E|xG0`lx}TQ_q`Vv4k(_YCA# zuAH6L#aHQSAB}#MY_Bd17Ox98Z*Kp%Bpu~F1))7f=odazHF}p27ZS1HLzxa)@6T8$$`ohm_IUT)t-3(^)@C(L_UA>875~=iev(y5F*vhktB5tl zZp%Ym7wkyAa$S@Nq?YPyuc&jxg#KgyJX1zxDVd z=`qym3z+swj`*NK>_r&$XiBcjGKl`J3aL`5$BsA47^mG6Q&}IO(=lffus*A@*HF+d*00CsVg%W zo;6eDw0UC(Dsbu-cW?Pi1%77{u)G?&$JXPJ1GDj>swJdnCvMVbE8 z^I=u4EK*9!20&1AGGTmQacN!f&7u6pEiUESU{iOCxMI}j}zeX zdvoP>^X&8X2rrTmJI-Vn=}k_5{i3DdDJykdeTjY4NJAJB< zoP*H_iCoReE>ra=7U_RTPu!sVnPkS5Ke+2~q_M7mE`(L*ZVmC<jIyTcnA=Z$b{bnnk?0ue<+)1Dm|l<1xWpTIedO2&D-n;godcU8%w}Hvgd5o# zcVXeH9niM~Vw`jwV9sBjUh(+niOv)JNKO7ZUG*KTaQ~`}1ctHD23UUaePmK&UDR5{ zxvpNboISU4b+h%m9OT*^uXCIx3@T!EVCMHia!jy?d<)vMZ5IgtyqqADlZw)RCZp5g zD5%U<*x_aWBlYFs^;#*^qgqB$5fIGc>A(b=g`ZGk`*!?cT?_%ec4o{eZg+GSzJ52* zZciZWFD7fn9?iZh`$$y7A9j(7{1mR|oC6@1hBiWezMcjGQvYk6GL)6b=>FImSKDIL Q?tTLh-oY7r&+ZcKU#c6j-T(jq diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_disabled.png deleted file mode 100644 index 3466be62bba3816d87e340bace1bc4f7a56b00da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2072 zcmcIl`#TegAD;VYGKv`WJ+29%F_*qBv4vrp<&vD?R4#MO+*-aalk8x~rRgyDmdq_{ zc-U;pEt$JgnoE~+5DCjY%K5H8;ylm$`Ml5jJns*mAKv%*P|zOE@^TP4001D5bU|Q5 zO#V4QY0>sXq%lM!7K?Fq1T>9mECT>CFOdibuXwT5a%`A}_wg6&w1{g|0kc(LUZos< zpfxGCA9O~!@hzrWIa!Fxy5cE^d4F87)y@k&e&SKs?}}$Jh$Q{HKHYEV3On605~T6{ ziTbJ=uh?9EL^F!`DZal0Z&5loODh+Y3l59^q;Ymr#)iL-ri6yB&C>M$PypTr{L8p- z1BkxS=4BCQW7!#~XR^;4LG%rWI~5qX^5`8Ff#|FhSn+7XseQk?icL60-8hr zHUE$exmE0&nM!=}_+6RdeUsczjVw2*6~!|v=SkRhc(>KHXs>rySl_}d0yRpD4eXw< zEe3~75pIIN<%!SjDn|U)`4jZ^M`%qP2)>sO^x-Aa(HbMr7s39u>o(%u4)g4w=T#Gg{np>{FJ{e$jzoS?u^1?Zq`woQGbQ;s{>NnlgnCuX%MYk!@`{#G1kil9a`dOXjAWbMET%$u$S%(0<7 zm}wuBqvk5Ffyp9WaqRfeeygoCzX4Oi zOlY7b;FHzS%Tj8#Fisq*1yd33qyFZ+s-w19aIg+c%2rQA0k@y979!tfbwe*o1Kv6tFm?L;Ya8!Nw^V}kwhXsj`LU*o#BgDO=hgfX`=yf zbL72Q>JqonAfwQ|bl`LSyxev7^fm5NXx)*?RB=_h*w)u19JUQ@b0&n%Os$S)bvr|R z)44S(gvjN;iXJ+wSHs!^1e>>}hZUL))?*TH>=Cet6Hw$Per`J*HMO0d&u9r4TVw== z11oS+$4a3t7T$?7{>Bh z{X)&DtToI-J4~t5@tj{0&QhU)VKe*UR~11MT30yqy=>5S4yfl_)pPWNu%qyJq=Y9j zL2Jx(g5n2RHC7JU86Y~XRrKEs0`8Oa zmF*Y$5gV&(G^69~)2_BAo4ahB|7%y@JreGKG`X)Yq$ZT->xXWnNw2hWC#ROI@ zik9H5&t-6`l&a%@k^K&MocBQZ!Xp|@y&>DPxCdO~NB8>YQ^`vR&6e<9- zBP?UO3k;cO)Wo~w9!-Q*-&E3;hEFlA zwHo`Y<#~gxEApDM$>ybok&z|fdsFI$9)quvw4wL*iJ`)X%bg*?gi0}ZSaW!(`_r#8 zx`K^od}oah2N_Fm2M-VJlk(J~E|kF~#fw9(C-=9cl8;*HgA{>5q?@n1x+;Ilu&GM8 zzyso$(mP> zXyE3?W*SgbYM@bzC$;gB9(tWTan2vgGULacGgYbvSB1|O@)~XI%AodmP50W89&o@* zhtHPF#iWL!k>0d33J+^}jV&lqJ5b}J@vh6;-?Kn}=ks8TX4cV#GTe@J3HbNQ%Sa*5 z#<`$qsK3mNxG`90GMFtr2C?l7_0`=UrRZhajjY8g?*Jt)0RClE*-9QtO*;KUCR;SW R7QK1^@}dW#$ua28{{fC>ppgIo diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_highlighted.png deleted file mode 100644 index 894b575184811ea0abde78cf073275fa0fe1d396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1974 zcmcJQi8~XF1INc}roD}gC0ERS%duB(#ukx`lp}^M$Lqe&hib`DiXrEa3Q3G|gz?t4 zq|BLfNXofkT5l5K*YA&bpXc-aexB$14}7z+7i=M5DKG#4fSj{KyZmwb$b#>Lhe&@?2o4gi26&!JJSiF}(CS3=>JB;Fncw%>Ajk5Rnwq$Kj|Yj-_oF(J`z zW$P@|BN1LY;|VD*PfDO$S>?8fP~&wK4bqhyo)u$v1d9<{Z-=(2m`w{HA9zvGH{WA~ zT0^>H4gzXsIUAKT6HoV`Ig%jE@dS`7LEBKBy3`H@+zYqvJxuIcUN@!A6r#y?|OeVeSnvoyi$&l=FQ% z%AbCRA~y2?yZ-Kg&vOj~O$fnkA|~t`2v-b~o74Tby+g zxOgV&N*H5uXFaW3yU-F$OBm|{o4@pNYI$DZFa45 zm>W=vydTXgHZ2P7nj@1THQfA#tUEm(Et4ObYf>vEt`Q~?Mwe?&XJrMSO^vP6fncWA;l-ObA+8+bz2{`Oto*KvHU${p0l$xz1hH;AyB!*2N>JG$|1CXEo zLf0Y~4^ygLy;a1fOd4yuCV?-B#C~zIdu&}!wCr$zp|v?skH2vHWX+1BdsX5B%=}GC z`R9&LFq)d+9!T-UjkET*qOBo7J>9JEq?)1bOPxg_sWWXluTH?z&qao&Jj|Z)Etf$f zr%}$6YC>Wg_VeL*!~VYa>(;S(cks`!P?hmET+r|7?3Zp7N8Y0v@f^s$yCaEzu2eqL zob2BwtobL34@gqC+t1BKQF<<(r_R^AuA!gx?O#(V-E(QHY`V(gz;03m3kqNbC} z&1}Awg+wAXu3n8X)4^31{%B5MH`ONd4Qw4w#ij63)KXDKF=BwgD5pQ<=At|F>u0hu z*7(He4_Mn$G)ljFuqJ-g?I7As%My<6T{@9gEa@=-Yw%W`5;;5-!rOGax9M7KPJqGKG58Y4pve+Vy6cM+T!Jf6>2q#46 zPepD;W*9j`4+SHHH_)0N*(GesEG_8~;vk?g3e?qA2FuOl5zPxLcHlPtJ;MIoBA5m{ zwD1oe4wS+l%FL6ToS2dudH03lHTSFC^adx|$}@o&q=X{}PUErFX{xIeuI1*(yfj-Jw05Y><(^mc|${(G7s3 z+p$P=!aMEt`!me5O>R#2ykzHGz%(Vp7M8if?U&i>23Q|czbzS?Itq3 zh?6xt#*y#GLiEVYjtkDt!B*Q&v{DneU;p`WSMPRE?lA zP_L5`(mNiH3q(L}hd81VKT}kb^qnLJAQY%Fn1*y8GLVuga2)&)&jL>@NrDwlb!wG< zxMq49_HD?aKE}fg^pv$PEckRExRGP8Gx&E1>(HPs9utg4m0VvC{Ri0Y>5n&I)@oU! zj^7kr;SZGP2Bj>MEVvO}Zg#%-WhXyYs;s;|ra|2Ta;nRN@#)t(x6o%oV}Tvr%Q;cz zx<_BY*(_4?Uw(~jW9GWc6Uam4jB;w1-K^$({!pgU#XX`O%V_{Kz7m*|8I6m0MxGLM zv?0v)=!0lgDIiaaY4PW-dqjZvfV@x9arN)i`&<$4O&dDVM?dthyh~?@2(SpQUZ?O% z3oXLvNSpUi|5^s!JP7F*Hb|js5`C;uyRwRL0))4Qdt2>R!b$J9#adl#osGlQ*(xAq*c;1mAy-n!=4EKz?UJ Vv;W6malelka1L_;-DK@c{2zGXY}Nn( diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html.png deleted file mode 100644 index ca57ef98ab9a5d2711be93b5ff10211a1337ee53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1426 zcmc(f{Xf$Q0LQ;b9=cuVgl$FSF-aG89R#~ZD(`R$OuI2 za+6kKzIvH4h+_J38DV1g?FN|r&?x{gjfzBs9sb=&AsIkRQT9(%+SAvuzQU{LX&VEH zr1Ik^u+5O=G|rxE@@qjsFy^1<@Fzq_1oS){_&zx(|9pOKGch1Q;yh?#9N^}&&c@7R z6DWH@*?J|3U&UU?LUr|tV{eLCGMMJ8Y8{-Q0C!#hjLn^h-w~I5_lb;?EP78RtG`n++4r0Z#{GER*n}yXc!)F}FaYOWvf-XN(f$d2)jI)r+ zA!J7G7>?%gF(+av3(Ni)6Gl7}VYEv;dhwgRQ%VolJmfjPeQ0 z!h@>O6mflQa^3LPvZK2yrPW37SxIUoD8B8rUtY8c8plRrvM1U1SbrT@^rvv1{9^Lo z<6D^1jZW#Csl%k8EhQhQIVwI4B-4ih&9~!Kz4g@4Ku;?xe65FPBVjOQA&1|BAFQYJ zGwX`xJ5vvOVidTRPiHmpnYZ&(+?`hcv}dIHy_fX?2p@-rC9bJ5^{S1n@70&o|b^wUx4k4(|W5*XUC{z7ZmpE^H}+gaG{C)Yfk>5w*! zoPl6CW!_HeurlP2i(IxnKeRZ)6RN)3anS`Yu8lA21B>;?rjpO zv*wVtUa($ZQFOE@*k$w#&a;!k*qqUl+H1zl#q%4UD$9`$7hv2}UY^t~DBYv)s=m2- zPAs#uZ#7`^&L;NPcrVddA6VHmTs+H$u3rD#)hzjsf@|FEC0+b&84lU+_K@=QZ)+pv zOCfT@I?>*|wbs++r4w!DWbZqd<3#*g1g|tkRdDUuc1l{^Dq;DhHC=VB>6AsEPd-OJ z>wUezo#tq-$&_krVBf!1sz|wR_!;$$emy~~-Mb6rub3%mt;nXIyK!H(6tl7r)8(^_o>xX; uJ@Ox@%G1Va9VWzamv8Bm6`=)M=^Pt4(YCktmsu@K7Kq#%jbQFRe&K&_8y8lxwTW!BnVmjGe>~6g4W1j}m=J3#2P*&oV2wf|j;!?RS1im{ zd>D~)ZzVv=k&qxjv%qm005IK%LhL(w0jL@lQltpG=d+`2ggw-QAKB=0^5+$&*)qS- zy#3>YHryGl^Yt#9^MDdjxPK$Sj?Op)T-+~)Ot)4%;xE+{vbt4on0&B#dT(Do z&4~;i5%5G3N=BnTxmQ*BD5L&!w0@8*e&iJ`{YCXeuRpgO?zc9WxFcE!PoJEKQ@uHh zP5W6HePMu>edx-FiMowZt6?Yt;zPc!%_4J&1KqmL#6! z!EVLowY@jDzPnI>JflUT^PMRPoffz@KAId++hqzN$ZCIste@0&PmDoGJy1j1 zcpyjN^iKZ(eVA#27@)gfN~acQTGz+u%PV0R7`a_4^&@vpuo4gG`iBQ{N~m+s(0gk@ zRm=DZUvdFQt(C=;dmf}!t@nRYU2yc@FJ?e`Y?eEF2_H53dD)nB%5A#)SW!gi5ZmI= zDp%f*B4xaqG_uG`aTVhXhltRmu>jv8ktQ4$;>-}xkfvfl*jHSlJ~26^ubN2c63PAAD*}#sB~S diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_highlighted.png deleted file mode 100644 index f26b36df2802c698af7a4dc5775edd3acdfe2474..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1337 zcmc(f={p++0LG)TMBExJPdBCEVU99GQCCSKqFtyv)V-*q&MG=GN2!!YJsww4_lP=D z=8PkZX-7!vJ|bxAmLSX#BxZj_KfJ%+*Z0f&zOu!j#Ds4M0{{Rqv=zec(#iiv2z1GZ zh!@052|Tq!SpZ11A2tC1-~k$8?hqruX3#UCIN3hVdU3Ei1b9tsP7%EO0SJXUV~-Nv z>h4p!P!dWAAu6(unpX;j9!h-5j!E90PEYo{As(S~E+k{ok2Fu*IpP!)MBT*^TPCJA zM`-OsJCp<3S=1V@TjF5E=r*id@*Y3{_zjV`0O@F=`3GPt`7~zEVDT=3p`|{VADTAI zFo&*Bo<7GHY3X4I8yw0Rim5#w&a~&$x~*<3ENPjrxKy_lZZo*Tl^w9Y(xIUl$F!GO z+Ti4{eu}L+;ut>niEbvGJJ@?%J@Q;mM-s zD<=KUVotS&i&0jMjSuya)0&xrINej<@Pc?zxA>+RvH?oY21i7G?&8Z?&Q|VJ$bHo* zT6bP4jpwy+e7|(*KFgenex!vZ+d7NbS$?TkcHBy-acYg957QI{TvR*ulvbL4rz$Bq zfXS)j2dFL|myxqGlUg`FOFF$Ft#$vzb)DA6EcVD0t>B9itn}cT-PVy4mZ7^-YaaJi zb-Zz`v~h;oj2jS9xH&d#)3gRT2C=77N;PYBn9|VgoMV_kmfy?Q_%KG{#r3E$ce`Fr z;3O~7ce=zRZg!EP=DE`$&sMihOt3P-V*2ZnOYbav-GQs+;*XrliJd38N^Gg>c}lZ! z;os;HYhHdfyeF&8FEvpAi6Y%F)=B%xHfMg+Ma>0ka;+PE0@zAzT=4J!ZT6?siG&WK zgSrQB%-9Hl^1$qRPn=0Y*w4C^{*9G#bK$71jPLVqwlQJ`T0WPANC(rn^a|G0FER~j zQ}w`HBv+4|@Z&H+CA`GkdQZ?I5N2a4g~g91-8wI8?Az=o7I@t=I3t#2zC4Hubzuz2 z8BuejM1OLzD-r)Vf7k1;z29tK6GeI}CRGQ9y4flj+^{N4&N z-8J@^cE&-$Cv6Df;Vp^YczTH9dnD75Bz@@ZpbJueu=7EaPr~Nw^uA+>HXe~X))`3+ z!z0C*;D6gE^>efOrG+OtQuk8H2GP{t&&-D2UolNpz$w|_0)ilfaSVRH4?_4ge|-9? zWL5F$N+MKpNVBQ|H^+^~@C>M!Gg|IjS3c};^WEbMXbAsok~c3mec3K(&d>_qje9&w zxzAyj!RzOClRlm(f`O{O8UAE-AwmS*tP=HY_b&iUQ`nO)d@g9)b6Z5_@(TfIBnCmU H@Jjj*1js#a diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic.png deleted file mode 100644 index 2e766d7b8405bf3513ee491aa5fdce8dacbc5bc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1549 zcmcIk`#%#10ADGwq%E|G*pQWk<>VC(TkKBq*g0$-p)d`*9di~+W7Cwy32Di^6-pk% zC}XIUlt&CZ^Cm|g^GKZgBl>*4kI(1(`TqF*e3P6U?G6Et0RaHOA&foBW!Gu{Q$~7M zol&=nc5M&Y#m)v${$6zk0NCG-L0My?_ROm^T z9z`PqZ^Pouci8NKGV=NjfXt6Zr`#SZL)<1vWpH2sH$8kh^d7mI?%s)FN-z5G*4k!_ z5%nKrb#=2}oo&_U^cNgV4S)ic2ilJ`XMy;p1Wdd-fvyp@em9?3T7zx`A@x+d>j-qT zL!+oZ{OU{%gJ}8;JevSghP3w32i?z|7$c=)fx;)C}N+5X%_q^wf72Hlg zT%xP{tu(C1658P4v1KIT(SI7_^5lb;w{v>Ehq#g+3r_Y>^_8rhXRDh_c0+%pPW`T; ztU7J6kous|)U+GIP?hfGfize!@xjr?oqyTs6FE98&%((B2FV&#p{?rloT8#2nTQ21 z+vK;Q8<9nNdK{(6gp)}kg<1AaZQ8%8xKLzh=oAdFNXZ|6b?KC>L&SAmZ+lY2tVqKcyt4dmMmRtKhxakeYpf=Q!f zb{X>*xfeECtF%OJ5SzH|()`K9=oE^85744a3-iaZLZPXgQ}@CPyUTQ3@Awj)IL8rR zsZ6w=X^=T{WR(OiFhH~l*eYGLKEcdvGL$-NSZ$mqF*HD+Dun)&h<0w~ve9l$up7*r z|F#Kl74(PYSZ&O08)D`tt~OQ1O>yVsV%@K*JLGmFJTy}cR7nWS8A#{2Z)sTRj3 zMati+@L{Q7`g5lk|I+?TOy~8!w3oC<>R8{r2sQMj+4&rIKXCwj+I?d zTg^PR)(Zuo9{u%dTL$xdNG8z>8(*x*2gkvPQ49)obx5qP1byNfVe^!Tw^FOG_Ze4n zO5s9bt_T!nt9`|9j^h@R8R~^au*~56n0=9C1(Ng3sX5CO?C~z7h zBETe4)K!K;JTSI@wd$)!60^hkA&9{Yp1U(~>&IVTF?{hbEbU4%(W=vW_ul~+v?HqA H#y9>y9!|WH diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_disabled.png deleted file mode 100644 index 104f0b73f169f9b4081ca35ce2de55b3d21ec5dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1505 zcmcIk`#X~h03Nl-SI0!O(nl^FBC8>t5$z}Omj>}vNxy@xA ze1CYK_lPU<#T{pQvvb6>3LI3VK6bhY7A`+aLav2KAG1S6v>yL^URyN-U;O)yJ&+ABG`*4J)N1uS9}DQ$9b# zp6+TGvi<92X-e%PB|b9MtDFAX#y$p{cir2ly>TR&8WIxYlxyMI1$0cHgI6X7-F4oi z1O^5^u^X=~QkS6HhoDLxXvmi5DofCg8aHxOu6B+=Cio#_2`0F|B-tZ{4K;k=BQos+ zCi@1d*ymV@(kP7jM3_#0`;=Pg)doHH#KW;tSa9gGaN0-gTzSCFEx12SH7X6luz2TZ zFNmk={Xacw>S?W>?NUNE&2J}stNKOcJ#coVD#u8F?Pk9IyDYfD?^}woZ2B6T@+2-& z;Ac%LnuD|I?96(W!@p7#k+{?qE{PX@ ze@`_X(+dyX@doKT-=hhz3Jd>oJTy_ZQZRhPwy)KXuzd5tmtLqfS@Y@B-g;nwz{hUV z(QERl|Hqbx%gLB^0dPamhtqsu_z1Cj)XW_I=(3P)3u{BG4qkx<;j77Vm=RX6fHPh-zweiI{EZbDnbxO{ z7;9YtmvtX81xv*a_&8SRwbXG*Z;LMQFZDwJ}p&YYuOlYk} z%ZuAHXlHFu-e(zuWhb%>{GLG#bMX+Odq)xHPSSoCF)p6_s%h@KUkG?SgV-nbm=zu`Sg7q49>9n$@8~PA~m$_bMxcBXJ z$9-eydCT^0g=-aNiTT=(q4Z+l89XE0N5;&*yuv1#*KM*8-ljNX}7eay-**%PFv6s6 zX?AIYUfo_0ZT2v_ki>fK+qc9h?SxFMV5HEn9V$6^%~@FpRm60LSOl+)Di>SxEWKN;jNzN^UJ{3%M?|oR+zDbWyW9ENreBMX zp$#Kxvix1mQ~KT*s&!t|!H!LtVm)PsFLJGETvJ2z8a<=>7&zav^9K-ybei?+J?P`h zV(fgdr?I2xnn?C*US)OT_;~G7X%+theJUNY)&`#Z#;)luv@+!~^~pAU$!3=$n%KEi$_Dwj;-3HQR5qSS+G zp;jZRse&$qqgOr_N!~jxUK=?_>Pvq-Ec9udLtUQzAh%8+wo-JwP*Mji7O$0z*+)7% zH56vIR9py=EtiDO&?vB|^;~W(BGu0BRN8|RL39N?5)no)4Mr&GDS*e)L)BXEtRojz2vh{4|3q z89YD2BZ0T|dos1B)QGSNJoV1#WX$Dlnr1xlt8d0z*BXMiby;I7g6#H1b~*z;7%n`4nI%8drS_|MsfTa5Z6eZff({eo1#u5GG-gUpYapcLmvmkd6Pr!*7(mb79KQ=*mANayooK-a@ zyRSrOw(VvSOUHJk8r7eTuXbz2s=NqD|5PKK(>@iBFmL+sCx<=7wwww|R_R`GS&WUJ zCdU-cqaO!QXfqQgohYeisw_`$t2mN*_<35OLYTa7<(Ayq;$SXiBX}HY%W31$ci_nk z(n?eMr1^Hf&H%0)j*F;u)t#ia|Whyk2OLRJtc4Kwg?a#2! z`+kt59>p2_G$W+9246R4s|*__EzQm)j#WXRIp37bl5ZOBk}uEL>TmBnQYLQQ zQse<9-WFDQ^%3J0!t(((DQIy4FGP(57e3q8eEL+qXkOW;HvO%2+8X{87iKMr*fx)&}kl-w*^x-!Zf zf}193wtSjm>Z{tC^A21FGhcix^_@W_JYMRvvLKNhq|b8|o%tz*XkAEn*n;!3x9;|} zcxpp&u%e;%v&!hrUW_a_+|>+0xVJogJ=-d%{vr#_6|^s3ee2RQPn!{V8zvaD_d9T} z?%zkO1T59VPv^r%;ULuNm7TaKw?8jmdjFM+_jWSlN6n_Fl){yl4|*t5Ft{tl#=%uu jZ1R85=wHemH`E#Ax|_yt-VYgCMJ~h#8-U@XBhvo?)R>0l diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link.png deleted file mode 100644 index e4518d2f50c5c1c0660ba0e783c7d56e2f8cb116..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3122 zcmcha`9BkmAIFL2jFDq1W`tZH7IJ)YFGnO-ZiO$gD9MqwMq`#c(&U;swqiLmkz=kc zM-fFt?rY67H6KUB*Y}6-pYZ+u@P54>?;qZe*XzgUJH^q#`h?&qK`t(?6Sg)m=Of4b zXZQg}>I6%Cd1Ty?&ej%OHA82fEvE1u;RJz2nY%d{r>kd2CFg45h?8t@X ziB z$*8~E#HRq0zXHu}lJA?EiD=?%?s1qr`BCfXo1L1hfK+Fu6=VsfnpBN3 zP{tXNF&F)ks+z3Re>2~(KNdxeWR>ly0ff4xl_77UV&a7qJj#i`GabvmxSv-=kg^W> z#|HH5R&?1M+|6XgdU;(*;MCX1G-eYaQE3OQOt#i0o*kX7zB|oi6v3@8Du_G)3U!wY zP8uQP9J^u4c-S<(WTD^YGw?DGB@xQAH=H9gKHH;_(J8IqLjY~!aGhq12Jeg z$Hiy($<#LYe8B`wnA>0$XwnFIp!Tf&y!yEbLhe61zjg=L5(X(d-#maa!ta# z<%TCo<;U##nfr*r4C!+r+UqWu9!+J#0+wY-jE!)8?6zIfjPhL^ILG;b&wWh9heHU! z-&33VSnyDA&v{lSZXs9QVa%J~TA1OA7!{4;YE2fYj4t(B!?CDI6MTE`zWzaN3wZB~ z%Pm#M{YuPY71R|Kx_Ze7a|*rny6ffrQBkkXNhcSVj(v1%_}@%PutGxs-ngUl zx90@7S`v$c-;jcPGI7CgyUAX_+p^PFyTT6Nsj%En^-`*e3|+SN(zPZRrqdvA#wlfH zPgW|hDT`MaD__Xt?0$Ezwh5$hwe}zCkJ-Bi7v=@ynt@QDDDgqh>$`iynwLjaw2FKx z(%dpP$PzFOYB&Xd`L_I_IbS{vn4xQWtReHqYWH&zr{M4r1-#}wsk(=3F<9oWy=;DN z!vO&uN)kfx7(Pn>hY-MLCL3y+L3_nfFn+GTU zIT60Nwe%f%P8FJNvS~LaV3A@6s&ig!8U&LzKT6&qraVu| z(oBTteX!1szKRAKA4hLk-hsbwuO;(Bsz)(log^t9S*@T~;2^O6YLf(eiFG$zmkhZb%7}s`vbJRG`B0j-y^<>YN;$o-U_!Q~Mg_H&q>d#|W zc7LSzg74ID{+LIIQg($yGR@AzItpH$dh+bHX(lyw zQzO&>0nv4lF41|_3UtZ>1^lFd+!$)&%MTP0_c_)rvCD$Bs^jQ^h%@I$dM%MJgr zybF|h+JDd-hs~jcgTgaBM@OR|I;fScYtVDx05gARiDZV=O-k?zbaYBG6k@~Q&Ld5* z*-|0U{Kii3iU-`ikt$_rbbsxe3{w1!NQ*2H2qk`2-?gVS($7I1->QAG@SB{n@EKWi zIxNN;!#B{$=rc~=5Gzf(Fw%#78@m9TJz)#urzS5}z%6};SpVqPZo6lz`b(p_Bv)Mn zVm3e5@v?JWgfZY=Z*U1HF02g1xTwC8n|-1GCoS!bvuSBU=<|!Y^JJdyNH^Vlr``UE z2)7~EW^*rqcu#a(`j*cCs8m4%!y`8icM6c_`y>@|MM54>G0$~MUFbF5_N9HEw^QHk z?ht6!kMwPb;PEGgsO;*L^!H)`buizvr}AT_hoee^S{8IbS^%TSa!pw2947^hkVk5X zNZgXy;)4KuBID6Ko?-#oUO@8{w8O6tm7|f`>rEqXYA*?jTZTe&(M48v17q*Kz2$Vi z2KTM_6O$f+Hma0b;!raLjwitAYo0TtYTtAci~(T`j>WGQhY;y(OS7;4oDb~C2n(Vu z7>6bTd7K(!&QcAtf^%I(qD7%Q%*@{GXD^n$ptd_F&1vh9aU*iGI(j5P zjHOTwM-FfCa@>SAM+;wLOlDs6#?Kmtib7d4nikf7J^Yp@Ug-@{7tZsqf>qjqk_{jl zYj+p>z9WTDG_BPgz`FK;1(#7#hacUnid2QP_v1fJwH<;90R@Bjr7B(jITQa;5B+DSM1*vI{IU|x28>C@zy>qLjezCgs zR|@yCCwKO#pUL>~-QzMh)0664Ze{$S$zykTq0JYJQ;zLw5#bU3(KkOWd~G@$uQuct zo0}F9KmcQpFCx>^soDv?2Sbou#B4}jBiK_&n_hG1y4t`xqg_YKPvY>@Tts%2T-l} zj}5cOx&+4iuCy2=p7^K^2n_Mf&-;6#OajijJO zun^p~V)jDOgqe^p_6SXQ5t;W^RBz&uC0d_16ahw5CHhL$J>fmVQ6tUdHRX~(m)?nY znxnddGp2d7adfWi;+j{oXm>%k@c@iGqXAYtQE7{q4;u-Gb2I@GfX^~&F|if{59xvw}ujP2zLep z`ji5n$ydZ~;*6B439C|i6UG{V`^E1B5>jnv8z{s^vP7=Jx~|uk+OOy+X^fKzEJp16 zD}6Ow>hV>VVVYMc{q>g@SH3zCc{o`+wl>f3e!nLu|*i YxnP=uF_G&ydIGp?FFC+!Ec_Dw4bHsKMgRZ+ diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_disabled.png deleted file mode 100644 index ae686a96eb4bd0589f7170365b566ffc1f62e526..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3070 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 S-R{3!Ph+HKrdthr81o-5h^ABk diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_highlighted.png deleted file mode 100644 index 532bba2aa5dc35bff76c420ddd866260d1b1c7af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2914 zcmchZ`9BkmP)W!+Vsb?yNA6=wjdT!lbIby@6zB?hf87*?G1T?FW1$e>5>p zRP>0M2_GN#iT~~}=@PXQa&&Z8+3V^`J)?CSoU@^5;wijT<@7ey|8v>!A#JCz?3PT* z!bVfb0e4{2Ho*NktP*yTAfGd}m=!;a9bArg@QRzDbY_#pl>Pv5EYrP>Sdm;`-C>GV@^8-9QJD+E#?rsgOiCXnFvN<|;k3W(VT;cT_Ja%+&2O%I+69P1d zFl-K96)A#ayHMTVv@LGAsrmrl*>9|e;;_t9lQ=+;q!ODG$a4Z#zByPA-2=whpizGQ zPDF+?_7rWc#f*YT97Kush*p3S+^eN|LAuiuQ3QE@Ji$ruyTCUjj~n?FsX{rL52;Ir zHW=47=i5E(l^qlN5e}>Ln5`V9?>fq^CUC?fH_NPelQ&V}v4L!I%bd@$^71 zB&>BNiTcW&IR6xWE856AM%Xh06LJ~O6sr4|GLFWa2Abh9d)Te{q8{H8Zh zcOUXoygRc&AdZe{MEGL|u}d~z&|eC7{39aSw`BiXY{;u9WiLPqiDhuD$v+> zv9_3aQP6`+K$+B}IVUGh-qa<)bz<-#9}?Oagvp!m88&GeAuc&GvuE_}+R}ZcVvCZW zqQ<60T{n02dE~aYbih?tf<12KhRJGv@%;5{!f7yyP$I9z+U$Y7gTe(WOx4;=@}5JE zs;Y=dB?rDsG03h}$<>XRW$9yT`THOP`6lAb`xd8SJI4^W;nlbf2*pE zYIl&}d5~hBnw}?rJ2GEaA7pM&DO~Bo{n@LnXiptz%1m^j5qEknimJS-lv&qGjTZ-e6hF$X(6Ps{08#8am+gNsKT@?UKy8$GnyKDPGfh9M5pkA!xuc_>stP(929{ z`0W6WT<+Dr+Ug9ZPZ-9Xo+2xCAc4M3?I#B7#cjSl+;~e+I)}kq5$|nys1oKlvH6*^ z@qIXlA8NPdiaVD2<=6o{wIMKtqw~pF*Sw`YC(z zoV`>ez>7|mygE>m1mDgHxX3$kz?B3Y6j;d_RqD@`MWBd1`*ouN{>}f$7z#m z{}8aho71t(uD~LALhJ)6H_?@)`|rQ@+Wm_VH+Zy&G`}SlTuOQwrR;IDIKGD|?iVx~ zb}gK6B)k-PHiVaE8XG6{pKw+!iPgSeNMTIQ58C3P#Qqf0sYZF|e4FkiDDA9bR-fFm`m&w;Y=M z0d3)mWmZt0v8oQK5990PK>@1GhB{ggq0lGK&=v>V25m0{!=+q05$j^es>gcPcfb;o zz4i9?d|e2oqH=qhZD@_K_&2&}VHoDRPs3*d=I@=3>%$3o)We8Yf5A2^-#M9=vlTzH zESE8qXQ6eArLT+xgjT^QuQ2t9q?e(J-o4Jtv}zKA8}NG#Aosi1f8VffrUdC% zmAx1CJBH4oC~BUuL4Rzqg4=$@N7T7Qr+QuCS)IO`mki~-ckodH@H)u;I9)lA{Xix7 z5!-bwLOV-pD%IBq_cXtn(i!_2`MZUxB+|}i-W|I{575Y-K!j7=_7v$w2J!k$N%Xyo zW9dV~7nB64+ZqL(t>kiO_<8f84ENPP!kUA6_l**VwxA-HNNQxun*bv=39UMtuQP_hh6q#$`=sGzqxq_WbO-M_2#0iLR?gbst5NDZLANDa|$`znv6miJDj=P2{IkIk@5%6 z0T!0+mCzurf=>B~Gt*08=NK#1p6L^OF_urxE-am>(0b^4gJ>bx(Oz%De({!QVe4YZ zJd;`AGYO zESlcq-Jyhw);P`VD`(D{>?;gmy^F%a`N-CbBhH&FLObp9nXF&skVq*|!S_GXg)X#I ztB3f)Noa}*!}305MOBaV5#zSgfgo|`21q>79?)46JDRYz#;`mD925+f9K$e5{kK7( z1I8mZr?)G{c3%Y1&ALNi)o2*LHb*~HIU>cFI`K6{+IA<2aFu_~n-yV`?f>U%+k)2n zj8JJx$SXqGs?Urf9~suZ;6$Qa*A}{;Oz3<}jK(tqesR>m4-FDWnaWM0L=fYNaAgfl zt@+dX^AgTPA>C12!nOo2IT1j=&^Xx>l<`rZZW3vD9#vKyv_bvlpS^~hab_SSaw2nC z#Jw~^8P_CdlssU|Hdx&GHFcyna!E4gVw@NyN;<~uMRg5Dq2S&0=8|!HSJ84)uNW#` zT;$G%z`$==XV#4rx-NC3DZ%jPh2dMwnolc@ODpU%?OQwxUKj@}^^*UE9sa+C#!s6w Z4;7eIwybJ3>%Y>>WqrXGMK<%s{|9pxR_Oo$ diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media.png deleted file mode 100644 index e764b0a12d114cc229442fceee3cdf7af7f936a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2010 zcmcJQ`9Bkk1II_K37IQ-6q|<_xsrRv=3WT-j>qH3a?Mqa93wRMv`Wn5dYGf!M4NIS z#Zb=4+ zUu|!iSn*3-VGb53K>f%C765QM+sYK_7{$dd4D!2RcAoC5S``!Fm0j?kCCE(NuLm@Qc;^c-+T^TMTN{{OgSLKBCV9fS*gp) zjfWFsu20(LcJkT+t+Ez|Ra@qVw|+>d#u#WC?7_R%i}Pk$7Q6+dKnZ~VDcx|94|~o! z)e+D!#++JVlXg9>E*g%tO@XSk@<7ry`WMH;K)u4(!bPF~JpvFlv~hkY*4!ha06cXG z9e^dMH0?RgAGgTfY0C$FdQ{v@m||f%7gfsgS@Ig?6BfxgAN}iv8&xYSLBzzo#W&%+ zPfEo%7#f5P&8_S_@CyNQ$@3sFTEou;__Uyu6o^={@s!*ZEq}-K8iAKHQChyt_a7UY zy8Jod_YZ)xyK(?z)N;D}Gm%X&xi@a3;GNqMf#wGKp-4);#_L<=7@31O{_8opxPPVH zuBy4$<+>j}&Fl70jL2)8%RIhFqtR8p@iAY>se2g4`fJb3AKUzzF#*n}{(yC%pdc8q zb;V04y@y6G`##mK`0PPe#qCnv`B#D0Mvk|u8=m0fPw3e{0Ywwvj z+Yja(I5Gxl?d}3By`FVFT8}t8yzevIfqrZu{U}*aa{E9CE^yp&1!L%2^7Sq zKOQl>sK0k?CFEi@a(v8zq;BbS=-Pw z7|TI5>6}Q79|iXGPH%q|(iUE&k2*iPW$HODyPcb{oequ}ox1r#|IGYZ-Y8 zN_Mbl&7w+dR>|*(9OdvV8Xj#~toYjxuep3*qN)`N%-p76tG{=vA83ifW?5G%`|nYfB`b|?Ro zF-#?VQkIy^w1QYfUEH*WPky^ql|V0UjNQJcAK79dtkOiic;(rIcuv%gu}5o=e?BAf zwRHp4T-8hQhrEU^IWOOQwTMdGN|n|$(b;ajZCJ$t=Ig*W-BHDbb|BPpGqE>pOZyve z`zhs~S>(+nX+`+1hKc80NuT%%M)Yn3Jh)M{0)CN!`W^IXjd?+xQS&$9&YSNnpBiUf zbMN5Lp@S?RzJ1KZyRAa^h|5ObG~9NQ)@--OKq%l4c8kQ~%A!lmY$#9*_F4fQ%^%oB zj%#{tf+7R_S8J0#$t#qI@Cfp;PY>TWH@F$<;Zg%$POrj+9gV0oGIcXM3fx0OPus{Y z{e8_%sYpr*Y1z$dKaWjB6b-xgU2c4fsDD$GlA0`gn=RhAY$4ZOqikP+zMEtV=6Pwd zmb@OJC22CQx=xns@W58BEIvd2p{@Qcc6a7bJl2 zg$sr@gQO{%&80SglY}homAH|nuvtWGG9=cR=pYP|MUU_Qqs;TqDTi#LG1#8iEaU+N z$viG~Pe8?4>0*MHeHbv$TSCM)cZ~M=o)-Z?Q-xQ zSbM@oORfe#&?Y=qVEXZqxmXjthxV?|ptS8k2&nZ(|Ww0W(=Ni`X zlG~bQW;x&?5rI5Uu;~D|zEfnj^p$z{B^{@VkWK?GEj(zXf8OSS)5c z8l=b(JGZp)ALB$XYLADBXZXMKi7QYWl}z#aoa=Xcv5atjjp;dgmKy^2KVuid{qt1F XpYo3Vap}h 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 W-nrY~XUYQ;A%mx@pUXO@geCwf00qSW diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_disabled.png deleted file mode 100644 index bb7b665ed8cc677bcdab1054cfafab1b6729ba99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 682 zcmeAS@N?(olHy`uVBq!ia0vp^Eg;On1|$PrnwJA9#^NA%Cx&(BWL`2bFr|39IEGX( zzP+BoRARSef$8U_d-L??}h~t>pXva@^7``kz?Ty zP;h8qU}T~eqhIYq$Xn*xci-%`0-+ZByRcXrh_(BTV z#=^qboc-V+tJhtXq7C!%uG~ClI)B~%{`Ie~R@B|Qp11#}T-({7AFKbx?YdsF_}sU7 zmDB9Lr@n0BzEV9uIyvgsL&JZz^KE1g8|=R4+1Wjvaql*9Um^YCE?3j9F zCW{gt_Uo?eigwSOd{@e?pIdBEwkrfR^QvdI3q~&hCO!sFS3j3^P6$KIEGX( zzP;n<$K)u$df{M&!H2LlM?|+z+9|2Tous6*WS4K~(}^=?c@E}b|Q4gm#+ z1_nkZYBBDzn7!01`D3&EcIGpu-`hhZ_ng_Y`sP;_kwtN7!RBEdEBAbD({|Z=W?9}E zf#Ay5yx|>HGkxzyC@%YSO?sWcSEJdxHaht{U27hr_$t+`G`V%gsp$M2PFGInygJ5Z zICcBIg4Pw&XZCVpbM=K7g{$(NF>Cvm9~OT0dei;2`_IYx-#)$h{rrjRH@@F`U)D`e zeC}5%S%ZIne*S%Lynb)o`#HDuP8)xI=d;UJ>R(*@?H4Tje-vpua?A`1=%7T7 zpFdALbb=v1&-IJcywHxeg>LJX2ng~xMHHVri;t^hmoxr5?N2YxCAd|SA;1_ uwMp%qc%55J^ax8zi|~{-cD2(NQdMeCgM?CTp4i%Glqz}l2o=>*VomW>wUS5e z@wAp$8?lvAU2H|Ey{L!yeE+_gZ{E*0bM8HJ|J=D}=G-~SP7aqug-;9f@bHLUwn4ZY zal(HKBzV-F5%Fb51R%IvvgBcKzatP%I02bUQim>w0s)jP9 zXS;+2`(I{);597C^Wtquw-TTB<54nLS?sgMh<4Guu=<(wjrvYzfU|t01Q7&ki7$S_ zWgyBchZd>(i!ife7eQ^U!b*Q2o#=%a)LloS%06bQNI_8{x#1>N)^__m5{aaU-AoKF zC4-@8=a8yOorj962$1jo3ip6wb4>n<`vf0_2uwGvoeqoe2Rb+xX zb*3cZ#N;o^j!qpesc~vqxtw7~Vd(!(RRy*sKMdG-w$0un_OK#Y8E^vfe@M4$!Ms&# zWl?qD!?{tOGS$7fs|*TLA#lkgb1>Q$ST5&fi{Rw3o|E zOzBB`&oN3EjUCx>Lvfc)1r!F9A;n@-9vNvyH$=07qrayB?%| z(d4;0tMggTh0^&GP9KRCmbatI-Y_rM{VWkU;PU3?Y3 zmChtc4H_v@`AzvB9=YWgUMPv7l~a6`(hL*EU!efUSbDwtkwQQ(mk zawv3Un)&i~v(?dK6YG>z9LlhEMHpADgvK18M-SLP5@S+}0vqmZr+&(J6-j&9>FGDI zIP&aMvR~ACKCs93*91uAE9UXHbHLXv^X|!88GBZ(zuxunRae*+wJ@o4QVq7qt)VN* z?;qq=eAXtg_z@LJ+I4poQATjd&fPkPL)K-7&?&}Y$-P(G6}zJX|7Ux8RIOSd6UNpS0&rkrDiXH?P-2Xq*+Mux8Fl2BGb-t#IS1Fs++ z;CaHO%kmH02@x+BT`zwOd(G_`EQ!y4Sajj${Ue=q;)55fwOXoW!0H=`_xoiC=Mcz1WwfW9wUW^*t=yp-$ zg+i*yyPoHxV1~?_hFzS7Ez<2!?&#DDyiiSZ0M5o=3JY%PPJ<1oJKtj(NfUFZxg2(dcbFEo-# zo5Jc$ivc9~T&wD=Hg%$!#fn=(cP2>|?S>8YMj}=0OAF@pQ|v%$4Em$Hti@y&c0my! z5r_Zi?;jl9Qn$s3<-(62`h1UIhgG!Ne8m{2Xh$aSBRqBG6cx(pTzw?kMC{4yPvt+a zyh#uHY`gQD4e)k}v~JH&MPOh=-f(izI4w7sF=G$EI@I`zRFbg~kPLqGuO(HgLTogT YPt@dWu<2vaQ9AQnzUY8pSo*~M2O_|Of&c&j diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_disabled.png deleted file mode 100644 index 5bcc8593413679d9bcf4e69acdb6f52bd349caa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1961 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 T240FiYD)kfN5EF0@5KHe2s13~ diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote.png deleted file mode 100644 index d954ef1ed6c12b95de746f1181de9d32b9e05f37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3376 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 Qdx0okJk>%}D_ckWA4=X@X8-^I diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_disabled.png deleted file mode 100644 index 00a61a47497f124cd48d8da42ffa1eb7a0dd9258..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3257 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 diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_highlighted.png deleted file mode 100644 index 82f4f902aab34a07a68c33a1e76b6ab5c4a35d0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3077 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 R>g4TkA*>zYO_skV{R^$!GZX*- diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_disabled.png deleted file mode 100644 index 75076aa87c6a6459a77f7fe8dbab990cc06b6674..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2305 zcmcJRi8~XF1IN{)n8F-6LhnS5EwmifYkD&yGvwZ=oS8SdB9oya*IXeBm0U5$MvA7H zxn?<*d#>^3tTy+N8kJw~^ZOg#=lOiUpa0cdArYodcMq%-@E*yUE3m5Z*l}M!KS`WOyOgBtsl(|| z4TPHiQR&hWXb~cA>hRaKjmJGAwegn803gA`8c1h+?=1Rz{ZeU`iKhe>n_Ix!02VXy3G|nYqSqGgJx+9;H$xiqp@MC8o~arab4k;mqz!?fx@<%=i5$SUyBORgmFV~e`yL z1lHRlBjJ{jXRDg6oP9o`m~KEut-Q4cePjc1@|cO><;aQcKT)Oe^P%?w4nf_(6vVZ4 z>zuHcvhs<0v_45+8soCw#;v?&2XCO+K*kxRu`O?isG(s@WnNn7z;?(+VV2X$*SW3C z2y#+7M(p79pV8G42!d+Yx9ITe!Y|U~gt1jd8Q0$7TWlwECz%ew+^w}okFB~Kll7~@HRtwk!Beg*aVdB`#qDuG3C79w{BEQQ$w28OmL*H+X^l3oE!11{C$5F!mxb+Xh&!H*80p2F zB0tMro?|)=<-04hAV}why>*5Kr@prZI#fIidp-u6WzQ6`4Y6Opc0)z^ORVj8Ts{Mp zu-OqdJZ(!Lf-F*qm!aqoY6c3f2Yr~2N`Hjj@`(T(hnQCQ+d%S;MpNiFP$W(1eUFqx zUVH9bC)`v#VWRPgyprics6P-b$_-b3(EDMlcdtpW{Z#5b zbj#mc0LKc@U?+Svowq;K6dh$FmBlpLOM1di{bdwq$1qUPmDWj0rOit_ z1dm^0zYcvT>``Tsb%^8O&b`k{Y zmk$2soX!DA$vg_3(rD7!pVG!I*;A7bT&dI*a@d8#l?*U^7S1h4h=pfZx96NlkZx`R=h+B9|5 zY-Dp1mhWpymz-Oi5#e)nqm9)>TWw~23C$XIP^W0)so^bB_eHO_z4)k>4$vJayBsRn z!B$GYX%uWM#XK1&(2UTjlV=<%0{mb2p{u@Ts>Tb?J&3`1>DQ)j-m<0d z_%(xADT^ej%37m{*zl-;j$8Lt()~V_CX60|bGGI7^CZu!=r~r^q%seO`%&_r$y z_wi4_ok{3yv!lg7FTAz$7WEhYd@qdvV26K+0lhF@*B8ISch$=vHpE@31#LvM3a4t0 zc**SH0&kaln6>WJxL&}u?D$bY<^AeqLBk0uciv;{SL}RQ?EnvVr+htTAY#cqo@qzcs74Bn)*U z!xDSnG#xLdPCeNi8o1Qo{X}piC$|HjO0^1Z9>dvD;tydFbZR)Q6mYkbL3p$D9&DrmKK p$Ms!%+7LVX|1tVc`-s)dA1tsdprTC6;`gT!LYmtmYT%x6{{su6M~(mh diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_highlighted.png deleted file mode 100644 index a0d194d457055c407640ff8016248ed8b5fc90d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2189 zcmcJR2R9oE1BRoDSl1|OMX6N|sI7yDpsvnsTxJA zR;?&XYp+t3s3sZ*RbTHp-(R@rJn#Gbg7=&^-4<@i%O%bQ004L)R%XawPWd-L_Fs)K zORoJTmN2BH34k;uxd#9MEg@!L`zRJ#=@Q1?Tyi9_orY|3RJG!CFUWMLj7pbzI$90= zOSJixv>DM=nf-f`8FJ?Isx1n~xiQ4ew82f&mF}(j!29zbG6_%CCZ3%C=!>12An1nS`F{so{;wg(NE7P(`-E3kq7`{( zY~-pxVnix@>#8?w`yNHgCyo|o?6^@_79XmxN7(N579F>OlwVQTHmCU{9NtIvan25n z_lGQ#5#M6;rBWMqY-c@pk0w?+N<@9}t9`y7U|RyobTmGVy`z)nbG~T91CCm4IJMG1 zY31pS-~E$64oqe)Pw^%dMxTa?yM2i@qG%9CrQ*Q0RAFYy#aAIA#qZyEuT+NY@r_;m zi#46Yi>(|a9=2c~2dgqN0*?V{)UKtG>-><{B7;w+6gwNDUC=gfP38773E0pZhi=pE z+_;o`o^8lD_(sNZvQ3`W^nvHXu2A+H_SeFLOK!6#_b=?xYxvnYAzgDAv|mwX>U3!w zB`)f;kJ-Wo1hd@|#cVT8z2V2eK3BP9p$m-S)=WQZ{6}Do^xQcYq&_lNA8(rhL=NWO zsdcpqD&_NrVGU&d#`$HE)`z#LggyacvB>CwKu=eMTinM^jkfY2S+)C=qV1SCb+!#i z?{HPYBPGG~ES-?a_~e)8??)5nd0Vr4p5AfJ2f=}5(#&w!r;ayaD5E;7URSv=uMB97 zeE+8`InSH&$G9Vq0oXMQa;1@b6w5V}WpHRkA6hKGcr`o{Z z1xD5>{d|5$lVOBTs~6I={yHMu&OYodF_B?ipsLTcSJxaJEDByZc}r?3p(kvDkXf)HzMAe6oRqtPC7kX2>aQ)rB<0Dw$kZE)r;ZKbVit{ zr5YBDXtskm(ZK6k&!i|}l_W9H&0WM&uDn>jN+$VQ8wvs+gB68nHfQe+x1}+;H}4)n zYK&)>S?51FnfK_8kbN5)D!FSPYuNjd%YCY*B9k>3XoBW;IQjldRk2_){Z1f(%uvuUIMO(Vcsyn)cu> z2ULMQ;-zy$d23j7qp7A<36$oR6NoAvnz#q%=|8c+$al%kTat$1Tu3jfMt1Rs73>njd zLRe+!9`&ZIG2>EVN=@p+ST5qZALzoMw{TnN(O?6w@+5pEbwk@V1K1mAPuM8Uh?IM5gZA?IPkDN3WQ z+)ns-96qpb>pG{5*|ls`nU2`~FJE`Oje{#YEYDi%T~s&cSJ<9I`FnC;K2ICS6$(6x zg;?tA=1>z+Ewz)Hm85*}hJ#ZOxy2vL=@Go{O)K0MlpI8$?}omhg?x8zxa~wtwO<^FG16NO|%%@X;}YQDUI)tPRwIEEVq?JJ!0O zE2skw98ufIM0i@&KS9w{%5Pw+H_nJWjMqoW4%N+cy-m+bWt3j1|B-|{&n0QVe~c~a b(#555mfqll5VGp8e*u7)!_7!0?zsN}7537v diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul.png deleted file mode 100644 index ffba75e96b7e070a0b1b302b7dab0c462bb6034a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1635 zcmb`I`#Tc~7{_Ni?oN7yF6P#SVI)e?%vdgA)f#)4Yo(-y+8Cn44J+kGnfO zFRbUp5N*gnUhNIDnp=@^C7A`O2$I&GN#lk|xQ$83ypP!n0@(GI%CYl$79=vi@1@7V z%7M%Q18-t^+<79hy-HI4&Ply zIoOuuh^e;0sa`izIxpc_SGL7X`I+EiC|mdGyVfhT`w2%1I@ zEy`wP4K|?-rK^LUn6b+6kP1kQ=N1*;dxea%XpUEJxvPzq7HcOP-KtYf0 zy9YFXw1T-1rdlQt%R40G#)gRp6CCC>t;x= z*@7tzOx1_)!#nxp%o5QS56M}|HLf)%bdaBZw%92(EXtzwB;+2J{8{OB8glNCYf@x_ z@RG}BBhi_Rz?nflA{H9F>zB3$CIZW>qjc2TdmTlbud)eFFpcu1(UN3(X2e@uavlSX zSscZJ){`l{N}U}-p@H>$k-)dLGzZ+an|{4^`PH5U`y;hU-_bZHHePSvcCF>#DNbef zJj0>NB;J9kKbu|Ix&$akzdz#`JWmW94;6lUQEYKXmLn{)gTBdfh+dj#31L90xC+V_ zxt3P)i55R>WG*w&JR3DO$(E)HL%MtvKNQA0w$IaHRbdAnlb+-zvNe z5|{81{U+AWV_je+zCBnCvZC=fhrKpJ+VlwzP|vX5K4Ojyj5>1I#_5Y|(zk)8s zITN+@J^UWWy8#q7X*vH30uUXGFRSB0Q?UIcIiXvA?2|65j!M{AF&MXi`JNfQUUhW% zjm~u0NXntvrQ_La1y(bI7LSe(-<({><;QJLsAiPoi8upxu4(9gBPW9${!X?s<;IIX zYmTmQiwr4gX# z+Kza9qO-C)7p0s=4+FDsim&fX_Yn!+7)DG!vyny`nUz)NjGmj(by&rwuW1?O-@QzQ zK^x6We-D?bKU7!2MY^ww_ev(==VJ0d5l!9(J5L7o4ZJOG*Lm}8W@^Cxl5qYj&}F52 zV5x|ecd97Xtk81fI6~c*+-{%hT=R)88+=s(GNOfKe}_G5I;|CNt2A$~&t659%Wq3>(4qa+pU0}W n-+La^9r<%S3Zei2K-|F|1m*R( z?sd;5Rx8~l*!a#DBPMA$FohB?>t;KZ0hZ)zmE+`vlNuH0`UE>an^|6+iZxI z%HCE?#f`kgnx&%LUrwSKr;-K5q-QiZN684Yz1AbSqjB09B)@tJhq3+W?DddU&cN4Z z!+7xQI)(e3tL0^&{$ixm54SFd33K>d3w|2qe-C^$a+qLqln(_w#MW%-Sb`Ff2~iDF zu&fVraDRPIJ>`I92riqEaRF!IsGxRoisYET<$E@kM}X>imNC!~NuFYFtu>{LnXW z%Ua;jo}wM0kv9;=4Sixov{ffRSV}YsEFOn>z2lVb`#Br&!`w*?i@1lUT?ME6nMq&Z z;E7tF586z1FQyVj9zlgSA^hG~6vw(5_L3mX3;;Gjt1 zM{BL!$tGm9&X{u&WzIff&jeF@RkKOmT_8;u_c|njcOS;&kh0aq&I8I}(r=ybKLPNI zs73!Qf^&gcjTC~ke`07*n@$7WjCjqI7-~W*f>gp4l+bw9{x4;8-|-euc#kG1pumE) zu7Fh92grqy3c%u^DQ=`YR$d0D!pfMW5Ze2FW;nnPk>T}^i#%2;5clFe(EW?RQ z*tmu9!acjRivlQMes~Z&_wqQxO%S6yM3P`(fmu!>xPV;*c>p>5?9p0aP|d6diN|oj zt+(7=V37;&Hz=K&|C0dcUdMx*>9CG7T~QQvDKS**bb7Ivb#S9LG_ahM{42HL_b&{7 zrth-80^xvSDv}%QO}T-_wDy@|Hy0h0v+klvopqo2XT#)O=dlIZ-2zfQOl}G(#3NbC ziht7zI|X~D4k_L@z)ni`F3qpBd6hsd7d(6*^h$eT-P0Sv%-H_fxz)!% zL-&Je@L3_SC;hR#6YIu$f<+xgmT7nll69qTYwB37ay3sV+TD*+kO!mN}H zlF?hpILQdb;c#1=wBYY7Ygav--k(Q@eNzn>cd>*wd)ZKyr)^X9X|Y`{c!@sTjTQ3} zr{3dnnfdFX8pO>DS(hGD>7FH#kl5>dC?d}FdH0s2$z1CbAB`ZLzdYLYZ7tS=^VJZi z+Uw6pM^lkW#rkfWi|tl1nQM@*eU{pqOLp?2DjM<<@3=lWIXemd9WcESzp$7Nk{%ib z*#XWGium*wgv#QRD;DJjS8OZw%Kt^OpW62yi{^Cc4Y>}gW97LV7dr1L030qrKxH;w GG5-J%pVadJ diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_highlighted.png deleted file mode 100644 index c0f6c41b4fd08f3bc1e94330aafd887fcbb12a87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1531 zcmb`HZ8Q@K9LBc_n?~A-o4DCrImV8c&P^mQGh(sfCYrN|dCAK#E3Z)*7e!^VG$~?B zAuhw%?nYNdWry7IG8WSH)<#5arn~N!`>Ahz_&?8w=RBYO=lA6M;Erl(>T3c304+}s zjGxMB-wvd%QeR9qTV=o`zoTeCL%+cs0HDV4#JC(!0e%?AM;Z7V2$v;eL^^WUuCyjp zU`fGXHUsGfXL@d(a;axLNLl&?=~5ZzMbBtz-8q&2qXA*@&Tr|AsEqWv)rQI|Dp zFNJE?fIi{FtVdp~*zScwBhDpH94ra$lyIr*e97}a*UN$<&rS4??LO@a0B+N9{*iKV z!ChD;of}@{PcgLf+B0_w{CSFiawoRPbf)zs?Bj;i?UhoXeK^tOWWW8KJC) z^nKMs%65q3YEZmE`5bW`WdK4jZ@f4onJBSqy z{kjw#`Bc#18om91y&WfvW3h0NZfql7cR#T^`~&zWhwxeF;<;Ip`e1MMA%=BVH5(j| zQA~=8XWPbvuYj6bpY~S&cD};J615NjldIdLigeueu=6=usaF77Kt>n7Ckgk!!8$$Wt=44PMrP%ig92f)%-_0bI807w}3Ejj#n<} z=7j9Vv9CPV)l=SuX)X42WOJYu^b=velux^FN9697=wG0EASH#*m!yK%ZOb#CM5(1m zg>O;R%>f6);KJq2h{TmTF+q*np`i<#>VFIWa){@>beZbDH61+JOnwm8bbvR}B5H+i zS%Y@>in@%G9RJT}?pdWJpFFrQV>*@#8t&}7Ht3ni0rIQG#W6J86OvI!dC}SCIU6hi zJY0Sg8)3!}v+V~OYrg=*rj!7gB_*fN;XhcM5rjaC!oAsio=!>7$sOsOw>LZzn + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled.xml new file mode 100755 index 000000000000..1a6fc63134d7 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled_state.xml deleted file mode 100755 index d0ee5f7df590..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_highlighted.xml new file mode 100755 index 000000000000..cdb305cc5c58 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_highlighted.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml deleted file mode 100755 index 9835de551bbf..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selector.xml index 2287d44987a5..e35075d61b59 100755 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selector.xml +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selector.xml @@ -1,11 +1,7 @@ - - - - - - + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html.xml new file mode 100755 index 000000000000..a17d37c9eb1b --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_html.xml @@ -0,0 +1,21 @@ + + + + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled.xml new file mode 100755 index 000000000000..b82938df0878 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled_state.xml deleted file mode 100755 index e5c0e5feae40..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_highlighted.xml new file mode 100755 index 000000000000..1497cf2b596f --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_html_highlighted.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_selected_state.xml deleted file mode 100755 index 4ab895011c24..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_html_selected_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_selector.xml index cc51e2f08dd8..767d6dd6bda9 100755 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_html_selector.xml +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_html_selector.xml @@ -1,11 +1,7 @@ - - - - - - + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic.xml new file mode 100755 index 000000000000..bf4a9ae27589 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_italic.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled.xml new file mode 100755 index 000000000000..acb50bd33d4a --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled_state.xml deleted file mode 100755 index 5c1a6899f233..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_highlighted.xml new file mode 100755 index 000000000000..7c8e4de7959d --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_highlighted.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml deleted file mode 100755 index 3559953de6f0..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selector.xml index 21ba91650fad..6136a680501b 100755 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selector.xml +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selector.xml @@ -1,11 +1,7 @@ - - - - - - + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link.xml new file mode 100755 index 000000000000..9ca70c1b8cbd --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_link.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled.xml new file mode 100755 index 000000000000..d1b4d83f259d --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled_state.xml deleted file mode 100755 index f76c86d1e252..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_highlighted.xml new file mode 100755 index 000000000000..6ce750b27274 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_link_highlighted.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml deleted file mode 100755 index 7aaad74f1008..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_selector.xml index a71854054f07..eaad54d27d8a 100755 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selector.xml +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_link_selector.xml @@ -1,11 +1,7 @@ - - - - - - + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media.xml new file mode 100755 index 000000000000..231c3dce9853 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_media.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled.xml new file mode 100755 index 000000000000..d06f52747960 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled_state.xml deleted file mode 100755 index cdfc9a4b21ba..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_highlighted.xml new file mode 100755 index 000000000000..058e338f439f --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_media_highlighted.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml deleted file mode 100755 index 1c9c0f4fa8c0..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_selector.xml index 883a797a7c2d..d0c31e294a99 100755 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selector.xml +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_media_selector.xml @@ -1,11 +1,7 @@ - - - - - - + + + + diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_more.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_more.xml new file mode 100755 index 000000000000..38d270bd7404 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_more.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_more_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_more_disabled.xml new file mode 100755 index 000000000000..614bbad282b4 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_more_disabled.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_more_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_more_highlighted.xml new file mode 100755 index 000000000000..aa3eff01830a --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_more_highlighted.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol.xml new file mode 100755 index 000000000000..a7160f486c1d --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ol.xml @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled.xml new file mode 100755 index 000000000000..f396c5737c0b --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled.xml @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled_state.xml deleted file mode 100755 index 1109597680db..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_highlighted.xml new file mode 100755 index 000000000000..915e6c8bf2a1 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_highlighted.xml @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selected_state.xml deleted file mode 100755 index 5209bdb8167b..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selected_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selector.xml index 7116a51df2d2..74b0996345ae 100755 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selector.xml +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selector.xml @@ -1,11 +1,7 @@ - - - - - - + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote.xml new file mode 100755 index 000000000000..9bcf8198cdc7 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_quote.xml @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled.xml new file mode 100755 index 000000000000..dd03e26d6cd4 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled.xml @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled_state.xml deleted file mode 100755 index b19edc5bb912..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_highlighted.xml new file mode 100755 index 000000000000..51b1f7d3ed60 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_highlighted.xml @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml deleted file mode 100755 index ea4f0b14dfcc..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selector.xml index 9d2d91a25257..42daf634c0ad 100755 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selector.xml +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selector.xml @@ -1,11 +1,7 @@ - - - - - - + + + + diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough.xml new file mode 100755 index 000000000000..5b11a2448464 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled.xml new file mode 100755 index 000000000000..bb763c150566 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled_state.xml deleted file mode 100644 index dfbb3f6882b4..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_highlighted.xml new file mode 100755 index 000000000000..bd8401f92bfa --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_highlighted.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selected_state.xml deleted file mode 100644 index 17f870fce508..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selected_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selector.xml index 5208dcfcea22..573755e91e99 100644 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selector.xml +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selector.xml @@ -1,11 +1,7 @@ - - - - - - + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul.xml new file mode 100755 index 000000000000..8e23d2154769 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ul.xml @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled.xml new file mode 100755 index 000000000000..c1047a0f7c2e --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled.xml @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled_state.xml deleted file mode 100755 index d2df8a43baae..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_highlighted.xml new file mode 100755 index 000000000000..de0c4958bcd3 --- /dev/null +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_highlighted.xml @@ -0,0 +1,17 @@ + + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selected_state.xml deleted file mode 100755 index 77f0b0021a34..000000000000 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selected_state.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selector.xml index ea9f0217f043..98cffc7a7448 100755 --- a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selector.xml +++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selector.xml @@ -1,12 +1,7 @@ - - - - - - - + + + + \ No newline at end of file diff --git a/WordPressEditor/src/main/res/layout-w380dp/format_bar.xml b/WordPressEditor/src/main/res/layout-w380dp/format_bar.xml index 17d9f6d26358..3ee179ba2cf6 100644 --- a/WordPressEditor/src/main/res/layout-w380dp/format_bar.xml +++ b/WordPressEditor/src/main/res/layout-w380dp/format_bar.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/format_bar" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="@dimen/format_bar_height" android:layout_gravity="bottom" android:background="@color/format_bar_background" @@ -12,87 +12,122 @@ - + android:gravity="center"> + + - + android:gravity="center"> + + - + android:gravity="center"> + + - + android:gravity="center"> + + - + android:gravity="center"> + + - + android:gravity="center"> + + - + android:gravity="center"> + + + + diff --git a/WordPressEditor/src/main/res/layout-w600dp/format_bar.xml b/WordPressEditor/src/main/res/layout-w600dp/format_bar.xml index 58f907084759..f4a64666b403 100644 --- a/WordPressEditor/src/main/res/layout-w600dp/format_bar.xml +++ b/WordPressEditor/src/main/res/layout-w600dp/format_bar.xml @@ -27,13 +27,14 @@ + android:layout_height="fill_parent" + android:gravity="center"> @@ -41,13 +42,14 @@ + android:layout_height="fill_parent" + android:gravity="center"> @@ -56,7 +58,7 @@ android:id="@+id/format_bar_button_italic" style="@style/FormatBarButtonTablet" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="wrap_content" android:contentDescription="@string/format_bar_description_italic" android:background="@drawable/format_bar_button_italic_selector" android:tag="@string/format_bar_tag_italic"/> @@ -65,7 +67,7 @@ android:id="@+id/format_bar_button_strikethrough" style="@style/FormatBarButtonTablet" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="wrap_content" android:background="@drawable/format_bar_button_strikethrough_selector" android:tag="@string/format_bar_tag_strikethrough"/> @@ -73,13 +75,14 @@ + android:layout_height="fill_parent" + android:gravity="center"> @@ -88,13 +91,14 @@ + android:layout_height="fill_parent" + android:gravity="center"> @@ -103,7 +107,7 @@ android:id="@+id/format_bar_button_ol" style="@style/FormatBarButtonTablet" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="wrap_content" android:contentDescription="@string/format_bar_description_ol" android:background="@drawable/format_bar_button_ol_selector" android:tag="@string/format_bar_tag_orderedList"/> @@ -112,7 +116,7 @@ android:id="@+id/format_bar_button_quote" style="@style/FormatBarButtonTablet" android:layout_width="wrap_content" - android:layout_height="fill_parent" + android:layout_height="wrap_content" android:contentDescription="@string/format_bar_description_quote" android:background="@drawable/format_bar_button_quote_selector" android:tag="@string/format_bar_tag_blockquote"/> @@ -121,13 +125,14 @@ + android:layout_height="fill_parent" + android:gravity="center"> diff --git a/libs/editor-common/assets/ZSSRichTextEditor.js b/libs/editor-common/assets/ZSSRichTextEditor.js index eba001cf342e..94c7d11f7805 100755 --- a/libs/editor-common/assets/ZSSRichTextEditor.js +++ b/libs/editor-common/assets/ZSSRichTextEditor.js @@ -257,6 +257,18 @@ ZSSEditor.onMutationObserved = function(mutations) { ZSSEditor.setRange(parentRange); } ZSSEditor.sendMediaRemovedCallback(mediaIdentifier); + } else if (mutation.target.className == "edit-container") { + // A media item wrapped in an edit container was deleted manually - remove its container + // No callback in this case since it's not an uploading or failed media item + var parentRange = ZSSEditor.getParentRangeOfFocusedNode(); + + mutation.target.remove(); + + if (parentRange != null) { + ZSSEditor.setRange(parentRange); + } + + ZSSEditor.getFocusedField().emptyFieldIfNoContents(); } } }); @@ -405,6 +417,19 @@ ZSSEditor.giveFocusToElement = function(element, offset) { selection.addRange(range); }; +ZSSEditor.setFocusAfterElement = function(element) { + var selection = window.getSelection(); + + if (selection.rangeCount) { + var range = document.createRange(); + + range.setStartAfter(element); + range.setEndAfter(element); + selection.removeAllRanges(); + selection.addRange(range); + } +}; + ZSSEditor.getSelectedText = function() { var selection = window.getSelection(); return selection.toString(); @@ -1538,7 +1563,7 @@ ZSSEditor.insertLocalVideo = function(videoNodeIdentifier, posterURL) { var videoContainerEnd = ''; if (posterURL == '') { - posterURL = "wpposter.svg"; + posterURL = "svg/wpposter.svg"; } var image = ''; @@ -1788,7 +1813,7 @@ ZSSEditor.applyVideoPressFormattingCallback = function( match ) { return match.content; } var videopressID = match.attrs.numeric[0]; - var posterSVG = '"wpposter.svg"'; + var posterSVG = '"svg/wpposter.svg"'; // The empty 'onclick' is important. It prevents the cursor jumping to the end // of the content body when `-webkit-user-select: none` is set and the video is tapped. var out = 'I'm a link! - + Strikethrough @@ -50,4 +50,9 @@

Fanny pack Odd Future Intelligentsia lo-fi semiotics whatever. Selvage keffiyeh mustache sustainable ethnic, chambray mumblecore McSweeney's biodiesel Pitchfork four loko disrupt post-ironic art party American Apparel. Kitsch umami beard salvia, Vice before they sold out vegan tousled lomo jean shorts pickled PBR&B. Tousled Wes Anderson Shoreditch flannel, 90's XOXO quinoa whatever mumblecore cliche Truffaut stumptown. Photo booth crucifix plaid Brooklyn. Authentic letterpress PBR&B, sustainable VHS master cleanse ethnic High Life. Messenger bag umami pug flannel. -

\ No newline at end of file +

+ + + +Wow, such sample, much text. + diff --git a/libs/editor-common/assets/svg/delete-image.svg b/libs/editor-common/assets/svg/delete-image.svg new file mode 100755 index 000000000000..4d961ebbd50f --- /dev/null +++ b/libs/editor-common/assets/svg/delete-image.svg @@ -0,0 +1,12 @@ + + + + delete-image + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/libs/editor-common/assets/svg/edit-image.svg b/libs/editor-common/assets/svg/edit-image.svg new file mode 100755 index 000000000000..d60fa4965e3d --- /dev/null +++ b/libs/editor-common/assets/svg/edit-image.svg @@ -0,0 +1,12 @@ + + + + gridicons-pencil + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/libs/editor-common/assets/svg/more-2x.png b/libs/editor-common/assets/svg/more-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c976e506db106b663c032eaa306d55abbc9478c3 GIT binary patch literal 603 zcmeAS@N?(olHy`uVBq!ia0y~y;JX22Yp^f_Nt;(p2Z5AIfKQ04PiEn{bLWm7J9g&G znZt(<0~r@CT-d#P_ntj__U+qu@ZiA%2M(xh4fzFB&t4Mb7t9d3zy9+XpMuUK5)2HC z_dQ)4Ln>~)y=$1IlqhrTp*T;?#?5z%@*WBn&HdT(RDR8xYsxpOdTj5B887zUbk$0L z`TXT4p+PK(KNd=+3jxhU2VqxU%~H|7y4>CLoc(h3RjW>|W?|qzTDC6R|5KFd)or@Y zIgAfJ-jJJ=5?||?t-DcoBWr_cQgx00q|@)`<*YuRUmEQn#q0TYj|;VVo2e>xMo_F44xouv|vdK&CJ--omM2sP<^X+ZTo8PWY{yanF_N?S; zv1o<})or;xw{BEzs^QKsukWc5jsD^HYQ3@4{*wOlU!ULjCjMR}x5ifG_iNj2vn{u+ zExVjAKmUEew%p&3H|lKL_V>!hyL;59$G-OD-F`!FqG@^VW&wPbY%;zPjQW zd+vXIUY47Zp1=U~_FkRsay#yy-`0=8NmPm literal 0 HcmV?d00001 diff --git a/libs/editor-common/assets/svg/pagebreak-2x.png b/libs/editor-common/assets/svg/pagebreak-2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e5cb33bb4be7223b52de5c6d007f126ad51d9a43 GIT binary patch literal 835 zcmV-J1HAl+P) z0008YNklI78{{BHPP6Ai&R z(rZ~f=)jV7RpoLy0RR910000000000000000002sKO3rQ>_?A}=H9uts?JGLRki!2 z*ZvMul1&|)PXKrswslF8eb36Fs_OJ3Y-{deThC#;s?$Aem&xe_fHz?~C&|(>cU?V5 zzlUw@de}bqwr#{aOv&27764v`?Ud{*N$Rhu4RFU~b?Kwk$CoyBNotqW>8UsT)25ZD zWIsEb0PrSkS9M6%=k1)dEWLN053fCJhx1eKcv)`!3vFNw0K5p>)FIiNR+VI3w>M$C z^swDNhwb&SAKMr1>#G2O*I_%1sa>+Eyc^lxTG(!$!?xPtF!g200KluTUDqx-Ub5WU zB=O6z-PW#8BhQcC`kd{YWSBMvw(yavlv4j^-E;IRm3ahMFJuY@J)BgsoEQd)VHd@^qN*Vf*Vn+f|KE+ci#K zx!O0mIOjMETctkqItM;sHFA=DwIOa>=(PPAw%Jcf?XrxIU#;qEYsaZApaKBihV4>q zljOGP;;XP7PD$FJR@HqJ?Aadx_-)wMEy;0gi;Z7~?Xit)S9Q4ehB?W)Y}W_? ze-7JKyA^xt?<3g0yJx#gmhs-(Pf1dT{vfUw5dgsZux+<$H!oO*BFo+}vU_Fo?FFaQ7m00000000000000000000008(z{{lIxlDr8>t@Z!_ N002ovPDHLkV1i2Ko^1dC literal 0 HcmV?d00001 diff --git a/libs/editor-common/assets/svg/retry-image-large.svg b/libs/editor-common/assets/svg/retry-image-large.svg new file mode 100644 index 000000000000..d726ef9b4715 --- /dev/null +++ b/libs/editor-common/assets/svg/retry-image-large.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/libs/editor-common/assets/svg/retry-image.svg b/libs/editor-common/assets/svg/retry-image.svg new file mode 100644 index 000000000000..b85bfb713dd4 --- /dev/null +++ b/libs/editor-common/assets/svg/retry-image.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/libs/editor-common/assets/wpposter.svg b/libs/editor-common/assets/svg/wpposter.svg similarity index 100% rename from libs/editor-common/assets/wpposter.svg rename to libs/editor-common/assets/svg/wpposter.svg