Squashed 'libs/editor/' changes from 86805a0..571b0b7

571b0b7 add license file
48a14b0 add assets link
9dcfa23 Add 'libs/editor-common/' from commit '9d488d2a1c610380aa9446f8c9fea50d15354a84'
9d488d2 initial commit
cdcc2a8 Initial commit
1b5d1fd add dependency on WordPressUtils and use AppLog instead of Log

git-subtree-dir: libs/editor
git-subtree-split: 571b0b7

LICENSE-MIT

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Automattic Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -3,3 +3,7 @@
 ## Introduction
 
 The WordPress-Android-Editor is the text editor used in the [WordPress Android app](https://github.com/wordpress-mobile/WordPress-Android) to create and edit pages & posts. In short it's a simple, straightforward way to visually edit HTML.
+
+## LICENSE
+
+This library is licensed under[MIT](LICENSE-MIT)

editor/src/main/assets

@@ -0,0 +1 @@
+../../../libs/editor-common/assets

editor/src/main/java/org/wordpress/android/editor/EditorActivity.java

@@ -1,21 +1,7 @@
 package org.wordpress.android.editor;
 
-import android.annotation.SuppressLint;
-import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
-import android.util.Log;
-import android.webkit.ConsoleMessage;
-import android.webkit.JsResult;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 
 public class EditorActivity extends ActionBarActivity {
     @Override

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

@@ -4,7 +4,6 @@
 import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +14,9 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.AppLog.T;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -63,32 +65,31 @@ public void onDetach() {
         super.onDetach();
     }
 
-    // TODO: use AppLog instead of Log
     @SuppressLint("SetJavaScriptEnabled")
     private void initWebView() {
         WebSettings webSettings = mWebView.getSettings();
         webSettings.setJavaScriptEnabled(true);
         webSettings.setDefaultTextEncodingName("utf-8");
         mWebView.setWebViewClient(new WebViewClient() {
             public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
-                Log.e("WordPress-Editor", description);
+                AppLog.e(T.EDITOR, description);
             }
         });
         mWebView.setWebChromeClient(new WebChromeClient() {
             public boolean onConsoleMessage(ConsoleMessage cm) {
-                Log.e("WordPress-Editor", cm.message() + " -- From line " + cm.lineNumber() + " of " + cm.sourceId());
+                AppLog.e(T.EDITOR, cm.message() + " -- From line " + cm.lineNumber() + " of " + cm.sourceId());
                 return true;
             }
 
             @Override
             public boolean onJsAlert(WebView view, String url, String message, JsResult result) {
-                Log.e("WordPress-Editor", message);
+                AppLog.e(T.EDITOR, message);
                 return true;
             }
 
             @Override
             public void onConsoleMessage(String message, int lineNumber, String sourceId) {
-                Log.e("WordPress-Editor", message + " -- from line " + lineNumber + " of " + sourceId);
+                AppLog.e(T.EDITOR, message + " -- from line " + lineNumber + " of " + sourceId);
             }
         });
         String htmlEditor = getHtmlEditor();
@@ -117,7 +118,7 @@ private String getHtmlEditor() {
         try {
             return getStringFromAsset("android-editor.html");
         } catch (IOException e) {
-            Log.e("WordPress-Editor", e.getMessage());
+            AppLog.e(T.EDITOR, e.getMessage());
             return null;
         }
     }

example/build.gradle

@@ -7,6 +7,10 @@ buildscript {
     }
 }
 
+repositories {
+    mavenCentral()
+}
+
 apply plugin: 'com.android.application'
 
 android {

libs/editor-common/LICENSE-MIT

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Automattic Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

libs/editor-common/README.md

@@ -0,0 +1,5 @@
+# WordPress-Common-Editor
+Common code of Android and iOS rich text editor component.
+
+## LICENSE
+This library is licensed under[MIT](LICENSE-MIT)