Squashed 'libs/editor/' changes from 244a513..ce4343d

ce4343d Merge pull request #244 from wordpress-mobile/feature/13-edit-images
11425f6 Updated the image settings dialog FormatBar to use a custom layout with a TextView
40d2e08 Updated the image settings dialog to always keep the ActionBar visible
c96d170 Added a check to avoid creating a second image settings fragment if one already exists
136dc70 Reverted image settings dialog bg color back to white
40439dd Added semi-transparent dark background to edit overlay for older APIs
2f33e3c Adjusted thumbnail margins
9dc5aa2 Added new 'close dialog' drawable for 720dp width mode, with padding to align title with dialog indentation
499a0c9 Added extra padding to image settings dialog when screen width is at least 720dp
f8300a1 Added isAdded() safety check
c536123 Clear existing actionbar menu items in image settings dialog
e6b9dda Merge branch 'develop' into feature/13-edit-images
0424688 Added more space between thumbnail and filename
ba463ef Added the image's thumbnail and filename to the image settings dialog
58bfffd Deleted unused layouts
c3e7507 Replaced a magic number with a constant
474bf1c Cleaned up unused resources
e9f8909 Updated image settings dialog to restore previous actionbar on save (was only working for close)
de5bbd5 Renamed save menu item
27d2950 Give focus to title field when opening image settings dialog
5424abc Adjust image settings dialog padding and background color
3aec367 Restore previous ActionBar state when exiting the image settings dialog
9af68e2 Added an actionbar menu to the image settings dialog, with save and close buttons
c5710cb Changed the image settings dialog into a full-screen fragment
6407b5a Merge pull request #249 from wordpress-mobile/issue/243-persist-post-keyboard-switch
12affc1 Merge pull request #248 from wordpress-mobile/feature/247-debug-html
6336fde Merge pull request #246 from wordpress-mobile/issue/245-upgrade-gradle-1.3.1
4f1816f Persist title and content onSaveInstanceState and restore it on re-creation
e14f9a5 Added a 'Log HTML' button to the format bar in debug mode
aa24797 Added a method to EditorFragmentAbstract for enabling debug mode
3beb931 Updated travis.yml to use API 23
4242049 Updated gradle and target SDK to latest versions
cd7de84 Added an image icon in front of the width slider in the image settings dialog
515e1df Changed label colors for image settings dialog to WP Gray
0a3dc32 Changed the image settings dialog to use a SeekBar for width instead of a Spinner with preset sizes
3d2b019 Updated fill_parents to match_parents
c250f38 Fixed an issue where alignment meta data was being lost
69022b7 Added support for the alignment drop-down menu in image options
9a004ec Fixed an image editing bug in API<19
fc90559 Fixed a bug where the edit overlay could receive cursor focus and be editable
285e4c2 Updated image settings to return the new text input values and update the image meta
5b0d20f Removed some padding between labels and input fields
b5e9a4e Added some padding above the top separator in the image options dialog for API>19 (it was too close to the dialog title)
02f0c70 Updated the image settings dialog to use the new container layout
0496580 Split the image options dialog layout into API<21 and API>=21 versions
15449e4 Updated the color of the image options labels to match WPAndroid
27f30d7 Adjusted the color of the title and separator for ImageSettingsDialog when a separator is present (API < 19)
74212fe Cleaned up hardcoded dimens from image options dialog
6a1407e Adjusted margins to align spinners and checkboxes with their labels
95daa7c Set the colorControlActivated theme color in the example app to match WPAndroid
3e0622d Image settings dialog v2
95af194 Renamed link dialog xml for consistency
d106e31 Added a dialog for image options (based on legacy editor's version)
d10c875 Merge pull request #236 from wordpress-mobile/feature/187-insert-media
aca4a8d Merge branch 'develop' into feature/187-insert-media
48b396c Merge pull request #235 from wordpress-mobile/issue/196-action-bar
ecafc6e Merge pull request #229 from wordpress-mobile/issue/219-format-bar-cut-off
28af050 Remove margin round format bar buttons for small tablets
0273838 Reset layout-w610dp back to w600dp
03719ec Fixes action not hiding properly on resume.
06f4d2f Merge pull request #237 from wordpress-mobile/issue/234-robolectric-3
af8bdb5 Updated Robolectric to 3.0 and dropped robolectric-gradle-plugin dependency
52b4bcd Added a soft keyboard check to hideActionBarIfNeeded()
ddb5454 Updated a string resource, generalizing from images to media
7c20e43 Disabled HTML format bar button while uploading media
56e7c8c Disabled media format bar button in HTML mode
06bbcd1 Refactored id > mediaId for clarity
412d07e Added support for stopping a media upload
48ab0b1 Fixed broken integration tests (missing abstract method implementation)
9fbb480 Fixed NPE in callback-image-tap handling (caused by test data)
51c6ae9 Added support for retrying failed uploads (with demo code in EditorExampleActivity)
6cdf34c Handled extracting upload status from image when receiving callback-image-tap
96fe4a6 Added onMediaRetryClicked() to EditorFragmentListener interface
440ff00 Added handling for callback-image-tap
7e2c8b6 Added a context menu for media in EditorExampleActivity, with a new option for simulating a failed upload
7c5cf6c Mirrored changes to ZSSEditor.insertLocalImage in ZSSEditor.insertImage for remote images
d3b01be Fixed an issue where backspace couldn't be used to delete an image
ad83c1a EditorFragment cleanup
71ff1a9 Added media upload handling to example activity
85e42b3 Fixed float handling in onMediaUploadProgress
1138861 Updated media methods for thread safety
486a021 Added methods for handling media upload status updates (success, failure, upload progress)
a0a8f62 Added support for inserting media passed by the editor's host activity
a26408d Registered the media button for a context menu with media options
0ddb006 Changed width of layout-w600dp to layout-w610dp

git-subtree-dir: libs/editor
git-subtree-split: ce4343df9500be66712f953ae365dadc88451c87

.travis.yml

@@ -5,8 +5,8 @@ android:
   components:
     - extra-android-m2repository
     - extra-android-support
-    - build-tools-22.0.1
-    - android-22
+    - build-tools-23.0.1
+    - android-23
 
 env:
   global:

WordPressEditor/build.gradle

@@ -1,34 +1,32 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'org.robolectric:robolectric-gradle-plugin:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.3.1'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'org.robolectric'
 apply plugin: 'jacoco'
 apply plugin: 'maven'
 apply plugin: 'signing'
 
 repositories {
-    mavenCentral()
+    jcenter()
 }
 
 android {
     publishNonDefault true
 
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
 
     defaultConfig {
         versionCode 3
         versionName "0.3"
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     buildTypes {
         release {
@@ -48,21 +46,20 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support:support-v4:22.2.0'
+    compile 'com.android.support:appcompat-v7:23.0.1'
+    compile 'com.android.support:support-v4:23.0.1'
     compile 'org.wordpress:analytics:1.0.0'
     compile 'org.wordpress:utils:1.6.0'
 
     // Test libraries
     testCompile 'junit:junit:4.11'
     testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'org.robolectric:robolectric:2.4'
+    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'
-    provided 'org.robolectric:robolectric:2.4'
 }
 
 signing {

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

@@ -46,6 +46,16 @@ public void onAddMediaClicked() {
 
     }
 
+    @Override
+    public void onMediaRetryClicked(String mediaId) {
+
+    }
+
+    @Override
+    public void onMediaUploadCancelClicked(String mediaId) {
+
+    }
+
     @Override
     public void saveMediaFile(MediaFile mediaFile) {