Merge branch 'develop' into cleanup

theck13 · theck13 · commit c0a8b1c275e7 · 2017-05-24T22:57:58.000-06:00
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/watchers/EndOfParagraphMarkerAdder.kt b/aztec/src/main/kotlin/org/wordpress/aztec/watchers/EndOfParagraphMarkerAdder.kt
@@ -47,7 +47,11 @@ class EndOfParagraphMarkerAdder(aztecText: AztecText, val verticalParagraphMargi
         }
     }
 
-    override fun afterTextChanged(text: Editable) {}
+    override fun afterTextChanged(text: Editable) {
+        text.getSpans(0, text.length, EndOfParagraphMarker::class.java).forEach {
+            text.setSpan(it, text.getSpanStart(it), text.getSpanEnd(it), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        }
+    }
 
     companion object {
         fun install(editText: AztecText, verticalParagraphMargin: Int) {
diff --git a/aztec/src/main/res/drawable/format_bar_button_bold_selector.xml b/aztec/src/main/res/drawable/format_bar_button_bold_selector.xml
@@ -5,7 +5,6 @@
 
     <item android:drawable="@drawable/format_bar_button_bold_disabled" android:state_enabled="false" />
     <item android:drawable="@drawable/format_bar_button_bold_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_bold_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_bold_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_bold" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_heading_selector.xml b/aztec/src/main/res/drawable/format_bar_button_heading_selector.xml
@@ -4,7 +4,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item android:drawable="@drawable/format_bar_button_heading_disabled" android:state_enabled="false" />
-    <item android:drawable="@drawable/format_bar_button_heading_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_heading_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_heading" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_html_selector.xml b/aztec/src/main/res/drawable/format_bar_button_html_selector.xml
@@ -5,7 +5,6 @@
 
     <item android:drawable="@drawable/format_bar_button_html_disabled" android:state_enabled="false" />
     <item android:drawable="@drawable/format_bar_button_html_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_html_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_html_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_html" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_italic_selector.xml b/aztec/src/main/res/drawable/format_bar_button_italic_selector.xml
@@ -5,7 +5,6 @@
 
     <item android:drawable="@drawable/format_bar_button_italic_disabled" android:state_enabled="false" />
     <item android:drawable="@drawable/format_bar_button_italic_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_italic_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_italic_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_italic" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_link_selector.xml b/aztec/src/main/res/drawable/format_bar_button_link_selector.xml
@@ -5,7 +5,6 @@
 
     <item android:drawable="@drawable/format_bar_button_link_disabled" android:state_enabled="false" />
     <item android:drawable="@drawable/format_bar_button_link_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_link_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_link_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_link" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_media_selector.xml b/aztec/src/main/res/drawable/format_bar_button_media_selector.xml
@@ -4,8 +4,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item android:drawable="@drawable/format_bar_button_media_disabled" android:state_enabled="false" />
-    <item android:drawable="@drawable/format_bar_button_media_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_media_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_media_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_media" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_more_selector.xml b/aztec/src/main/res/drawable/format_bar_button_more_selector.xml
@@ -4,7 +4,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item android:drawable="@drawable/format_bar_button_more_disabled" android:state_enabled="false" />
-    <item android:drawable="@drawable/format_bar_button_more_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_more_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_more" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_ol_selector.xml b/aztec/src/main/res/drawable/format_bar_button_ol_selector.xml
@@ -5,7 +5,6 @@
 
     <item android:drawable="@drawable/format_bar_button_ol_disabled" android:state_enabled="false" />
     <item android:drawable="@drawable/format_bar_button_ol_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_ol_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_ol_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_ol" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_page_selector.xml b/aztec/src/main/res/drawable/format_bar_button_page_selector.xml
@@ -4,7 +4,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item android:drawable="@drawable/format_bar_button_page_disabled" android:state_enabled="false" />
-    <item android:drawable="@drawable/format_bar_button_page_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_page_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_page" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_quote_selector.xml b/aztec/src/main/res/drawable/format_bar_button_quote_selector.xml
@@ -5,7 +5,6 @@
 
     <item android:drawable="@drawable/format_bar_button_quote_disabled" android:state_enabled="false" />
     <item android:drawable="@drawable/format_bar_button_quote_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_quote_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_quote_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_quote" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_strikethrough_selector.xml b/aztec/src/main/res/drawable/format_bar_button_strikethrough_selector.xml
@@ -5,7 +5,6 @@
 
     <item android:drawable="@drawable/format_bar_button_strikethrough_disabled" android:state_enabled="false" />
     <item android:drawable="@drawable/format_bar_button_strikethrough_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_strikethrough_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_strikethrough_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_strikethrough" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_ul_selector.xml b/aztec/src/main/res/drawable/format_bar_button_ul_selector.xml
@@ -5,7 +5,6 @@
 
     <item android:drawable="@drawable/format_bar_button_ul_disabled" android:state_enabled="false" />
     <item android:drawable="@drawable/format_bar_button_ul_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_ul_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_ul_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_ul" />
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_underline_selector.xml b/aztec/src/main/res/drawable/format_bar_button_underline_selector.xml
@@ -5,7 +5,6 @@
 
     <item android:drawable="@drawable/format_bar_button_underline_disabled" android:state_enabled="false" />
     <item android:drawable="@drawable/format_bar_button_underline_highlighted" android:state_checked="true" />
-    <item android:drawable="@drawable/format_bar_button_underline_highlighted" android:state_pressed="true" />
     <item android:drawable="@drawable/format_bar_button_underline_highlighted" android:state_focused="true" />
     <item android:drawable="@drawable/format_bar_button_underline" />
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,11 @@ class EndOfParagraphMarkerAdder(aztecText: AztecText, val verticalParagraphMargi`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- override fun afterTextChanged(text: Editable) {}`
	`50`	`+ override fun afterTextChanged(text: Editable) {`
	`51`	`+ text.getSpans(0, text.length, EndOfParagraphMarker::class.java).forEach {`
	`52`	`+ text.setSpan(it, text.getSpanStart(it), text.getSpanEnd(it), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)`
	`53`	`+ }`
	`54`	`+ }`
`51`	`55`
`52`	`56`	`companion object {`
`53`	`57`	`fun install(editText: AztecText, verticalParagraphMargin: Int) {`