Squashed 'libs/editor/' changes from 7932116..087a5b2

087a5b2 Merge pull request #450 from wordpress-mobile/issue/445-image-settings-alignement-issue
88577e2 Fix typo s/alignement/alignment/
65a253c Fix translated alignement issue in ImageSettings screen
d846356 Merge pull request #449 from wordpress-mobile/issue/broken-example-and-tests
333855c Clear test dependencies from library gradle file
f540179 Fix broken integration tests
81054ec Correct require paths in mocha tests and update README
50d827c Move unit tests to example project
40b2966 Implement EditorDragAndrDropListener in EditorExampleActivity and MockEditorActivity
364a1fc Moved example activities to android.editor.example package

git-subtree-dir: libs/editor
git-subtree-split: 087a5b20733f4ac06eaa81c1c4e75b608f6d6300

Author: maxme

README.md

@@ -22,13 +22,13 @@ This project also has unit tests for the JS part of the editor using [Mocha](htt
 
 To be able to run the tests, [npm](https://www.npmjs.com/) and Mocha (`npm install -g mocha`) are required.
 
-With npm and Mocha installed, from within `WordPressEditor/src/test/js`, run:
+With npm and Mocha installed, from within `example/src/test/js`, run:
 
     npm install chai
 
 And then run `mocha` inside the same folder:
 
-    cd WordPressEditor/src/test/js; mocha test*; cd -
+    cd example/src/test/js; mocha test*; cd -
 
 ## LICENSE ##
 

WordPressEditor/build.gradle

@@ -49,16 +49,6 @@ dependencies {
     compile 'com.android.support:support-v4:24.1.1'
     compile 'com.android.support:design:24.1.1'
     compile 'org.wordpress:utils:1.11.0'
-
-    // Test libraries
-    testCompile 'junit:junit:4.11'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.robolectric:robolectric:3.0'
-
-    // Workaround for IDE bug
-    // http://stackoverflow.com/questions/22246183/android-studio-doesnt-recognize-espresso-classes
-    provided 'junit:junit:4.11'
-    provided 'org.mockito:mockito-core:1.10.19'
 }
 
 signing {
@@ -116,12 +106,3 @@ uploadArchives {
         }
     }
 }
-
-//
-// Testing
-//
-
-android.testOptions.unitTests.all {
-    include '**/*Test.class'
-    exclude '**/ApplicationTest.class'
-}

WordPressEditor/src/androidTest/AndroidManifest.xml

@@ -3,6 +3,7 @@
     package="org.wordpress.android.editor" >
     <application>
         <activity android:name=".MockActivity"
+                  android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
                   android:exported="false" />
         <activity android:name=".MockEditorActivity"
                   android:theme="@style/Theme.AppCompat.Light.DarkActionBar"

WordPressEditor/src/androidTest/java/org.wordpress.android.editor/EditorFragmentTest.java

@@ -80,7 +80,7 @@ public void testFormatBarToggledOnSelectedFieldChanged() {
         selectionArgs.put("id", "zss_field_content");
         mFragment.onSelectionChanged(selectionArgs);
 
-        waitFor(100);
+        waitFor(500);
 
         // The formatting buttons should be enabled while the content field is selected
         assertTrue(mediaButton.isEnabled());
@@ -130,6 +130,8 @@ public void run() {
 
         uiThreadLatch1.await();
 
+        waitFor(500);
+
         // The HTML mode fields should be populated with the raw HTML loaded into the WebView on load
         // (see MockEditorActivity)
         assertEquals("A title", titleText.getText().toString());

WordPressEditor/src/androidTest/java/org.wordpress.android.editor/MockEditorActivity.java

@@ -2,14 +2,21 @@
 
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.view.DragEvent;
 import android.widget.LinearLayout;
 
+import org.wordpress.android.editor.EditorFragmentAbstract.EditorDragAndDropListener;
+import org.wordpress.android.editor.EditorFragmentAbstract.EditorFragmentListener;
 import org.wordpress.android.editor.EditorFragmentAbstract.TrackableEvent;
 import org.wordpress.android.util.helpers.MediaFile;
 
-public class MockEditorActivity extends AppCompatActivity implements EditorFragmentAbstract.EditorFragmentListener {
+import java.util.ArrayList;
+
+public class MockEditorActivity extends AppCompatActivity implements EditorFragmentListener,
+        EditorDragAndDropListener {
     public static final int LAYOUT_ID = 999;
 
     EditorFragment mEditorFragment;
@@ -34,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     public void onEditorFragmentInitialized() {
         mEditorFragment.setTitle("A title");
-        mEditorFragment.setContent(Utils.getHtmlFromFile(this, "example/example-content.html"));
+        mEditorFragment.setContent("<p>Example <strong>content</strong></p>");
     }
 
     @Override
@@ -81,5 +88,15 @@ public void saveMediaFile(MediaFile mediaFile) {
     public void onTrackableEvent(TrackableEvent event) {
 
     }
+
+    @Override
+    public void onMediaDropped(ArrayList<Uri> mediaUri) {
+
+    }
+
+    @Override
+    public void onRequestDragAndDropPermissions(DragEvent dragEvent) {
+
+    }
 }
 

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

@@ -32,7 +32,6 @@
 import org.wordpress.android.util.ToastUtils;
 
 import java.util.Arrays;
-import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -52,6 +51,7 @@ public class ImageSettingsDialogFragment extends DialogFragment {
     private EditText mCaptionText;
     private EditText mAltText;
     private Spinner mAlignmentSpinner;
+    private String[] mAlignmentKeyArray;
     private EditText mLinkTo;
     private EditText mWidthText;
     private CheckBox mFeaturedCheckBox;
@@ -159,12 +159,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
                 mAltText.setText(mImageMeta.getString("alt"));
 
                 String alignment = mImageMeta.getString("align");
-
-                // Capitalize the alignment value to match the spinner entries
-                alignment = alignment.substring(0, 1).toUpperCase(Locale.US) + alignment.substring(1);
-
-                String[] alignmentArray = getResources().getStringArray(R.array.alignment_array);
-                mAlignmentSpinner.setSelection(Arrays.asList(alignmentArray).indexOf(alignment));
+                mAlignmentKeyArray = getResources().getStringArray(R.array.alignment_key_array);
+                int alignmentIndex = Arrays.asList(mAlignmentKeyArray).indexOf(alignment);
+                mAlignmentSpinner.setSelection(alignmentIndex == -1 ? 0 : alignmentIndex);
 
                 mLinkTo.setText(mImageMeta.getString("linkUrl"));
 
@@ -306,7 +303,9 @@ private JSONObject extractMetaDataFromFields(JSONObject metaData) {
             metaData.put("title", mTitleText.getText().toString());
             metaData.put("caption", mCaptionText.getText().toString());
             metaData.put("alt", mAltText.getText().toString());
-            metaData.put("align", mAlignmentSpinner.getSelectedItem().toString().toLowerCase(Locale.US));
+            if (mAlignmentSpinner.getSelectedItemPosition() < mAlignmentKeyArray.length) {
+                metaData.put("align", mAlignmentKeyArray[mAlignmentSpinner.getSelectedItemPosition()]);
+            }
             metaData.put("linkUrl", mLinkTo.getText().toString());
 
             int newWidth = getEditTextIntegerClamped(mWidthText, 10, mMaxImageWidth);

WordPressEditor/src/main/res/values/strings.xml

@@ -52,11 +52,23 @@
     <string name="image_link_to">Link to</string>
     <string name="image_width">Width</string>
 
-    <string-array name="alignment_array">
-        <item>None</item>
-        <item>Left</item>
-        <item>Center</item>
-        <item>Right</item>
+    <string name="alignment_none">None</string>
+    <string name="alignment_left">Left</string>
+    <string name="alignment_center">Center</string>
+    <string name="alignment_right">Right</string>
+
+    <string-array name="alignment_key_array" translatable="false">
+        <item>none</item>
+        <item>left</item>
+        <item>center</item>
+        <item>right</item>
+    </string-array>
+
+    <string-array name="alignment_array" translatable="false">
+        <item>@string/alignment_none</item>
+        <item>@string/alignment_left</item>
+        <item>@string/alignment_center</item>
+        <item>@string/alignment_right</item>
     </string-array>
 
     <!-- Accessibility - format bar button descriptions -->

example/build.gradle

@@ -34,4 +34,23 @@ android {
 
 dependencies {
     compile project(":WordPressEditor");
+
+    // Test libraries
+    testCompile 'junit:junit:4.11'
+    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.robolectric:robolectric:3.0'
+
+    // Workaround for IDE bug
+    // http://stackoverflow.com/questions/22246183/android-studio-doesnt-recognize-espresso-classes
+    provided 'junit:junit:4.11'
+    provided 'org.mockito:mockito-core:1.10.19'
 }
+
+//
+// Testing
+//
+
+android.testOptions.unitTests.all {
+    include '**/*Test.class'
+    exclude '**/ApplicationTest.class'
+}

…press/example/EditorExampleActivity.java …ditor/example/EditorExampleActivity.javaexample/src/main/java/org/wordpress/example/EditorExampleActivity.java renamed to example/src/main/java/org/wordpress/android/editor/example/EditorExampleActivity.java example/src/main/java/org/wordpress/example/EditorExampleActivity.java renamed to example/src/main/java/org/wordpress/android/editor/example/EditorExampleActivity.java

@@ -6,10 +6,12 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.ContextMenu;
+import android.view.DragEvent;
 import android.view.MenuItem;
 import android.view.View;
 
 import org.wordpress.android.editor.EditorFragmentAbstract;
+import org.wordpress.android.editor.EditorFragmentAbstract.EditorDragAndDropListener;
 import org.wordpress.android.editor.EditorFragmentAbstract.EditorFragmentListener;
 import org.wordpress.android.editor.EditorFragmentAbstract.TrackableEvent;
 import org.wordpress.android.editor.EditorMediaUploadListener;
@@ -19,10 +21,12 @@
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.helpers.MediaFile;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-public class EditorExampleActivity extends AppCompatActivity implements EditorFragmentListener {
+public class EditorExampleActivity extends AppCompatActivity implements EditorFragmentListener,
+        EditorDragAndDropListener {
     public static final String EDITOR_PARAM = "EDITOR_PARAM";
     public static final String TITLE_PARAM = "TITLE_PARAM";
     public static final String CONTENT_PARAM = "CONTENT_PARAM";
@@ -331,4 +335,14 @@ public void run() {
 
         thread.start();
     }
+
+    @Override
+    public void onMediaDropped(ArrayList<Uri> mediaUri) {
+        // TODO
+    }
+
+    @Override
+    public void onRequestDragAndDropPermissions(DragEvent dragEvent) {
+        // TODO
+    }
 }