Merge pull request #468 from wordpress-mobile/feature/add-headless-factory-method

Aztec constructor without source editor

Author: 0nko

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

@@ -341,11 +341,11 @@ class MainActivity : AppCompatActivity(),
 
         // initialize the text & HTML
         if (!isRunningTest) {
-            aztec.sourceEditor.displayStyledAndFormattedHtml(EXAMPLE)
+            aztec.sourceEditor?.displayStyledAndFormattedHtml(EXAMPLE)
         }
 
         if (savedInstanceState == null) {
-            aztec.visualEditor.fromHtml(aztec.sourceEditor.getPureHtml())
+            aztec.visualEditor.fromHtml(aztec.sourceEditor?.getPureHtml()!!)
             aztec.initHistory()
         }
 
@@ -485,13 +485,13 @@ class MainActivity : AppCompatActivity(),
                 if (aztec.visualEditor.visibility == View.VISIBLE) {
                     aztec.visualEditor.undo()
                 } else {
-                    aztec.sourceEditor.undo()
+                    aztec.sourceEditor?.undo()
                 }
             R.id.redo ->
                 if (aztec.visualEditor.visibility == View.VISIBLE) {
                     aztec.visualEditor.redo()
                 } else {
-                    aztec.sourceEditor.redo()
+                    aztec.sourceEditor?.redo()
                 }
             else -> {
             }
@@ -694,7 +694,7 @@ class MainActivity : AppCompatActivity(),
         if (mediaPending) {
             ToastUtils.showToast(this, R.string.media_upload_dialog_message)
         } else {
-            aztec.toolbar.toggleEditorMode()
+            aztec.toolbar?.toggleEditorMode()
         }
     }
 

aztec/src/main/kotlin/org/wordpress/aztec/Aztec.kt

@@ -10,8 +10,8 @@ import org.wordpress.aztec.toolbar.AztecToolbar
 import org.wordpress.aztec.toolbar.IAztecToolbarClickListener
 import java.util.*
 
-open class Aztec private constructor(val visualEditor: AztecText, val sourceEditor: SourceViewEditText,
-                                     val toolbar: AztecToolbar, val toolbarClickListener: IAztecToolbarClickListener) {
+open class Aztec private constructor(val visualEditor: AztecText, val toolbar: AztecToolbar,
+                                     private val toolbarClickListener: IAztecToolbarClickListener) {
 
     private var imageGetter: Html.ImageGetter? = null
     private var videoThumbnailGetter: Html.VideoThumbnailGetter? = null
@@ -23,16 +23,27 @@ open class Aztec private constructor(val visualEditor: AztecText, val sourceEdit
     private var onAudioTappedListener: AztecText.OnAudioTappedListener? = null
     private var onMediaDeletedListener: AztecText.OnMediaDeletedListener? = null
     private var plugins: ArrayList<IAztecPlugin> = visualEditor.plugins
+    var sourceEditor: SourceViewEditText? = null
 
     init {
         initHistory()
         initToolbar()
     }
-    
-    constructor(activity: Activity, @IdRes aztecTextId: Int,
+
+    private constructor(activity: Activity, @IdRes aztecTextId: Int,
                 @IdRes sourceTextId: Int, @IdRes toolbarId: Int,
-                toolbarClickListener: IAztecToolbarClickListener) : this(activity.findViewById(aztecTextId),
-            activity.findViewById(sourceTextId), activity.findViewById(toolbarId), toolbarClickListener)
+                toolbarClickListener: IAztecToolbarClickListener) : this(activity.findViewById<AztecText>(aztecTextId),
+            activity.findViewById<SourceViewEditText>(sourceTextId), activity.findViewById<AztecToolbar>(toolbarId), toolbarClickListener)
+
+    private constructor(activity: Activity, @IdRes aztecTextId: Int,
+                @IdRes toolbarId: Int,
+                toolbarClickListener: IAztecToolbarClickListener) : this(activity.findViewById<AztecText>(aztecTextId),
+            activity.findViewById<AztecToolbar>(toolbarId), toolbarClickListener)
+
+    private constructor(visualEditor: AztecText, sourceEditor: SourceViewEditText,
+                toolbar: AztecToolbar, toolbarClickListener: IAztecToolbarClickListener) : this(visualEditor, toolbar, toolbarClickListener) {
+        this.sourceEditor = sourceEditor
+    }
 
     companion object Factory {
         @JvmStatic
@@ -46,6 +57,10 @@ open class Aztec private constructor(val visualEditor: AztecText, val sourceEdit
                  toolbar: AztecToolbar, toolbarClickListener: IAztecToolbarClickListener) : Aztec {
             return Aztec(visualEditor, sourceEditor, toolbar, toolbarClickListener)
         }
+
+        fun with(visualEditor: AztecText, toolbar: AztecToolbar, toolbarClickListener: IAztecToolbarClickListener) : Aztec {
+            return Aztec(visualEditor, toolbar, toolbarClickListener)
+        }
     }
 
     fun setImageGetter(imageGetter: Html.ImageGetter) : Aztec {
@@ -113,7 +128,7 @@ open class Aztec private constructor(val visualEditor: AztecText, val sourceEdit
     }
 
     fun initHistory() {
-        sourceEditor.history = visualEditor.history
+        sourceEditor?.history = visualEditor.history
     }
 
     private fun initToolbar() {

aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbar.kt

@@ -312,7 +312,7 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
         return editor != null && editor is AztecText
     }
 
-    fun setEditor(editor: AztecText, sourceEditor: SourceViewEditText) {
+    fun setEditor(editor: AztecText, sourceEditor: SourceViewEditText?) {
         this.sourceEditor = sourceEditor
         this.editor = editor
 
@@ -465,6 +465,9 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
     }
 
     fun toggleEditorMode() {
+        // only allow toggling if sourceEditor is present
+        if (sourceEditor == null) return;
+
         if (editor!!.visibility == View.VISIBLE) {
             sourceEditor!!.displayStyledAndFormattedHtml(editor!!.toPlainHtml(true))
             editor!!.visibility = View.GONE