Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Aztec-Android into issue/345-fixing-toolbar-highlight-issues

# Conflicts:
#	aztec/src/main/kotlin/org/wordpress/aztec/formatting/InlineFormatter.kt

Author: khaykov

.travis.yml

@@ -9,15 +9,15 @@ android:
     - extra-google-m2repository
     - platform-tools
     - tools
-    - build-tools-25.0.2
+    - build-tools-25.0.3
     - android-25
 
 env:
   global:
     - MALLOC_ARENA_MAX=2
     - GRADLE_OPTS="-XX:MaxPermSize=4g -Xmx4g"
-    - ANDROID_SDKS=android-14
-    - ANDROID_TARGET=android-14
+    - ANDROID_SDKS=android-16
+    - ANDROID_TARGET=android-16
 
 before_install:
   # TODO: Remove the following line when Travis' platform-tools are updated to v24+

README.md

@@ -6,7 +6,7 @@
 Aztec (which extends EditText) is a rich-text editor component for writing HTML
 documents in Android.
 
-Supports Android 4.0+
+Supports Android 4.1+ (API 16 - Jelly Bean)
 
 ## Build and test
 

app/build.gradle

@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "org.wordpress.aztec"
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
@@ -34,11 +34,12 @@ dependencies {
     compile project(':aztec')
     compile project(':glide-loader')
     compile project(':picasso-loader')
+    compile project(':wordpress-comments')
 
     //noinspection GradleCompatible
-    compile "com.android.support:appcompat-v7:25.3.1"
+    compile "com.android.support:appcompat-v7:25.4.0"
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "org.wordpress:utils:1.14.0"
+    compile "org.wordpress:utils:1.16.0"
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     }

app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt

@@ -33,19 +33,21 @@ import org.wordpress.android.util.ToastUtils
 import org.wordpress.aztec.*
 import org.wordpress.aztec.glideloader.GlideVideoThumbnailLoader
 import org.wordpress.aztec.picassoloader.PicassoImageLoader
+import org.wordpress.aztec.plugins.wpcomments.WordPressCommentsPlugin
+import org.wordpress.aztec.plugins.wpcomments.toolbar.MoreToolbarButton
+import org.wordpress.aztec.plugins.wpcomments.toolbar.PageToolbarButton
 import org.wordpress.aztec.source.SourceViewEditText
-import org.wordpress.aztec.spans.AztecMediaSpan
 import org.wordpress.aztec.toolbar.AztecToolbar
-import org.wordpress.aztec.toolbar.AztecToolbarClickListener
+import org.wordpress.aztec.toolbar.IAztecToolbarClickListener
 import org.xml.sax.Attributes
 import java.io.File
 
 class MainActivity : AppCompatActivity(),
         AztecText.OnImeBackListener,
         AztecText.OnImageTappedListener,
         AztecText.OnVideoTappedListener,
-        AztecToolbarClickListener,
-        HistoryListener,
+        IAztecToolbarClickListener,
+        IHistoryListener,
         OnRequestPermissionsResultCallback,
         PopupMenu.OnMenuItemClickListener,
         View.OnTouchListener {
@@ -124,7 +126,7 @@ class MainActivity : AppCompatActivity(),
                 LONG_TEXT +
                 VIDEO
 
-        private val isRunningTest : Boolean by lazy {
+        private val isRunningTest: Boolean by lazy {
             try {
                 Class.forName("android.support.test.espresso.Espresso")
                 true
@@ -143,11 +145,9 @@ class MainActivity : AppCompatActivity(),
     private val REQUEST_MEDIA_PHOTO: Int = 2003
     private val REQUEST_MEDIA_VIDEO: Int = 2004
 
-    private lateinit var aztec: AztecText
+    private lateinit var aztec: Aztec
     private lateinit var mediaFile: String
     private lateinit var mediaPath: String
-    private lateinit var source: SourceViewEditText
-    private lateinit var formattingToolbar: AztecToolbar
 
     private lateinit var invalidateOptionsHandler: Handler
     private lateinit var invalidateOptionsRunnable: Runnable
@@ -191,7 +191,7 @@ class MainActivity : AppCompatActivity(),
                 REQUEST_MEDIA_VIDEO -> {
                     mediaPath = data?.data.toString()
 
-                    aztec.videoThumbnailGetter?.loadVideoThumbnail(mediaPath, object : Html.VideoThumbnailGetter.Callbacks {
+                    aztec.visualEditor.videoThumbnailGetter?.loadVideoThumbnail(mediaPath, object : Html.VideoThumbnailGetter.Callbacks {
                         override fun onThumbnailFailed() {
                         }
 
@@ -218,14 +218,14 @@ class MainActivity : AppCompatActivity(),
 
     fun insertImageAndSimulateUpload(bitmap: Bitmap?, mediaPath: String) {
         val (id, attrs) = generateAttributesForMedia(mediaPath, isVideo = false)
-        val mediaSpan = aztec.insertImage(BitmapDrawable(resources, bitmap), attrs)
-        insertMediaAndSimulateUpload(id, attrs, mediaSpan)
+        aztec.visualEditor.insertImage(BitmapDrawable(resources, bitmap), attrs)
+        insertMediaAndSimulateUpload(id, attrs)
     }
 
     fun insertVideoAndSimulateUpload(bitmap: Bitmap?, mediaPath: String) {
         val (id, attrs) = generateAttributesForMedia(mediaPath, isVideo = true)
-        val mediaSpan = aztec.insertVideo(BitmapDrawable(resources, bitmap), attrs)
-        insertMediaAndSimulateUpload(id, attrs, mediaSpan)
+        aztec.visualEditor.insertVideo(BitmapDrawable(resources, bitmap), attrs)
+        insertMediaAndSimulateUpload(id, attrs)
     }
 
     private fun generateAttributesForMedia(mediaPath: String, isVideo: Boolean): Pair<String, AztecAttributes> {
@@ -243,42 +243,42 @@ class MainActivity : AppCompatActivity(),
         return Pair(id, attrs)
     }
 
-    private fun insertMediaAndSimulateUpload(id: String, attrs: AztecAttributes, mediaSpan: AztecMediaSpan) {
+    private fun insertMediaAndSimulateUpload(id: String, attrs: AztecAttributes) {
         val predicate = object : AztecText.AttributePredicate {
             override fun matches(attrs: Attributes): Boolean {
                 return attrs.getValue("id") == id
             }
         }
 
-        aztec.setOverlay(predicate, 0, ColorDrawable(0x80000000.toInt()), Gravity.FILL)
-        aztec.updateElementAttributes(predicate, attrs)
+        aztec.visualEditor.setOverlay(predicate, 0, ColorDrawable(0x80000000.toInt()), Gravity.FILL)
+        aztec.visualEditor.updateElementAttributes(predicate, attrs)
 
         val progressDrawable = ContextCompat.getDrawable(this, android.R.drawable.progress_horizontal)
         // set the height of the progress bar to 2 (it's in dp since the drawable will be adjusted by the span)
         progressDrawable.setBounds(0, 0, 0, 4)
 
-        aztec.setOverlay(predicate, 1, progressDrawable, Gravity.FILL_HORIZONTAL or Gravity.TOP)
-        aztec.updateElementAttributes(predicate, attrs)
+        aztec.visualEditor.setOverlay(predicate, 1, progressDrawable, Gravity.FILL_HORIZONTAL or Gravity.TOP)
+        aztec.visualEditor.updateElementAttributes(predicate, attrs)
 
         var progress = 0
 
         // simulate an upload delay
         val runnable: Runnable = Runnable {
-            aztec.setOverlayLevel(predicate, 1, progress)
-            aztec.updateElementAttributes(predicate, attrs)
-            aztec.updateMediaSpan(mediaSpan)
+            aztec.visualEditor.setOverlayLevel(predicate, 1, progress)
+            aztec.visualEditor.updateElementAttributes(predicate, attrs)
+            aztec.visualEditor.resetAttributedMediaSpan(predicate)
             progress += 2000
 
             if (progress >= 10000) {
                 attrs.removeAttribute(attrs.getIndex("uploading"))
-                aztec.clearOverlays(predicate)
+                aztec.visualEditor.clearOverlays(predicate)
 
                 if (attrs.hasAttribute("video")) {
                     attrs.removeAttribute(attrs.getIndex("video"))
-                    aztec.setOverlay(predicate, 0, ContextCompat.getDrawable(this, android.R.drawable.ic_media_play), Gravity.CENTER)
+                    aztec.visualEditor.setOverlay(predicate, 0, ContextCompat.getDrawable(this, android.R.drawable.ic_media_play), Gravity.CENTER)
                 }
 
-                aztec.updateElementAttributes(predicate, attrs)
+                aztec.visualEditor.updateElementAttributes(predicate, attrs)
             }
         }
 
@@ -288,7 +288,7 @@ class MainActivity : AppCompatActivity(),
         Handler().postDelayed(runnable, 6000)
         Handler().postDelayed(runnable, 8000)
 
-        aztec.refreshText()
+        aztec.visualEditor.refreshText()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -301,37 +301,32 @@ class MainActivity : AppCompatActivity(),
             mHideActionBarOnSoftKeyboardUp = true
         }
 
-        aztec = findViewById(R.id.aztec) as AztecText
-
-        aztec.imageGetter = PicassoImageLoader(this, aztec)
-        aztec.videoThumbnailGetter = GlideVideoThumbnailLoader(this)
-
-        aztec.setOnImageTappedListener(this)
-        aztec.setOnVideoTappedListener(this)
-
-        source = findViewById(R.id.source) as SourceViewEditText
-
-        formattingToolbar = findViewById(R.id.formatting_toolbar) as AztecToolbar
-        formattingToolbar.setEditor(aztec, source)
-        formattingToolbar.setToolbarListener(this)
-        aztec.setToolbar(formattingToolbar)
+        val visualEditor = findViewById(R.id.aztec) as AztecText
+        val sourceEditor = findViewById(R.id.source) as SourceViewEditText
+        val toolbar = findViewById(R.id.formatting_toolbar) as AztecToolbar
+
+        aztec = Aztec.with(visualEditor, sourceEditor, toolbar, this)
+            .setImageGetter(PicassoImageLoader(this, visualEditor))
+            .setVideoThumbnailGetter(GlideVideoThumbnailLoader(this))
+            .setOnImeBackListener(this)
+            .setOnTouchListener(this)
+            .setHistoryListener(this)
+            .setOnImageTappedListener(this)
+            .setOnVideoTappedListener(this)
+            .addPlugin(WordPressCommentsPlugin(visualEditor))
+            .addPlugin(MoreToolbarButton(visualEditor))
+            .addPlugin(PageToolbarButton(visualEditor))
 
         // initialize the text & HTML
         if (!isRunningTest) {
-            source.displayStyledAndFormattedHtml(EXAMPLE)
+            aztec.sourceEditor.displayStyledAndFormattedHtml(EXAMPLE)
         }
 
         if (savedInstanceState == null) {
-            aztec.fromHtml(source.getPureHtml())
-            source.history = aztec.history
+            aztec.visualEditor.fromHtml(aztec.sourceEditor.getPureHtml())
+            aztec.initHistory()
         }
 
-        aztec.history.setHistoryListener(this)
-        aztec.setOnImeBackListener(this)
-        aztec.setOnTouchListener(this)
-        source.setOnImeBackListener(this)
-        source.setOnTouchListener(this)
-
         invalidateOptionsHandler = Handler()
         invalidateOptionsRunnable = Runnable { invalidateOptionsMenu() }
     }
@@ -364,7 +359,7 @@ class MainActivity : AppCompatActivity(),
     override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
         super.onRestoreInstanceState(savedInstanceState)
 
-        source.history = aztec.history
+        aztec.initHistory()
 
         savedInstanceState?.let {
             if (savedInstanceState.getBoolean("isPhotoMediaDialogVisible")) {
@@ -465,16 +460,16 @@ class MainActivity : AppCompatActivity(),
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.undo ->
-                if (aztec.visibility == View.VISIBLE) {
-                    aztec.undo()
+                if (aztec.visualEditor.visibility == View.VISIBLE) {
+                    aztec.visualEditor.undo()
                 } else {
-                    source.undo()
+                    aztec.sourceEditor.undo()
                 }
             R.id.redo ->
-                if (aztec.visibility == View.VISIBLE) {
-                    aztec.redo()
+                if (aztec.visualEditor.visibility == View.VISIBLE) {
+                    aztec.visualEditor.redo()
                 } else {
-                    source.redo()
+                    aztec.sourceEditor.redo()
                 }
             else -> {
             }
@@ -484,8 +479,8 @@ class MainActivity : AppCompatActivity(),
     }
 
     override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
-        menu?.findItem(R.id.redo)?.isEnabled = aztec.history.redoValid()
-        menu?.findItem(R.id.undo)?.isEnabled = aztec.history.undoValid()
+        menu?.findItem(R.id.redo)?.isEnabled = aztec.visualEditor.history.redoValid()
+        menu?.findItem(R.id.undo)?.isEnabled = aztec.visualEditor.history.undoValid()
         return super.onPrepareOptionsMenu(menu)
     }
 
@@ -659,7 +654,7 @@ class MainActivity : AppCompatActivity(),
     override fun onToolbarExpandButtonClicked() {
     }
 
-    override fun onToolbarFormatButtonClicked(format: TextFormat, isKeyboardShortcut: Boolean) {
+    override fun onToolbarFormatButtonClicked(format: ITextFormat, isKeyboardShortcut: Boolean) {
     }
 
     override fun onToolbarHeadingButtonClicked() {
@@ -672,20 +667,20 @@ class MainActivity : AppCompatActivity(),
             }
         }
 
-        val mediaPending = aztec.getAllElementAttributes(uploadingPredicate).isNotEmpty()
+        val mediaPending = aztec.visualEditor.getAllElementAttributes(uploadingPredicate).isNotEmpty()
 
         if (mediaPending) {
             ToastUtils.showToast(this, R.string.media_upload_dialog_message)
         } else {
-            formattingToolbar.toggleEditorMode()
+            aztec.toolbar.toggleEditorMode()
         }
     }
 
     override fun onToolbarListButtonClicked() {
     }
 
     override fun onToolbarMediaButtonClicked() {
-        mediaMenu = PopupMenu(this, formattingToolbar)
+        mediaMenu = PopupMenu(this, aztec.toolbar)
         mediaMenu?.setOnMenuItemClickListener(this)
         mediaMenu?.inflate(R.menu.media)
         mediaMenu?.show()

aztec/build.gradle

@@ -3,10 +3,10 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 25
         versionName "1.0"
     }
@@ -25,15 +25,15 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v4:25.3.1"
+    compile "com.android.support:support-v4:25.4.0"
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
     compile 'org.jsoup:jsoup:1.10.2'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.robolectric:robolectric:3.3.2'
 
-    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:design:25.4.0'
     //https://github.com/robolectric/robolectric/issues/1932
     testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
 }