@@ -31,6 +31,7 @@ import android.view.MenuItem
3131import android.view.MotionEvent
3232import android.view.View
3333import android.widget.PopupMenu
34+ import android.widget.ToggleButton
3435import org.wordpress.android.util.AppLog
3536import org.wordpress.android.util.ImageUtils
3637import org.wordpress.android.util.PermissionUtils
@@ -59,7 +60,6 @@ import org.wordpress.aztec.plugins.wpcomments.toolbar.PageToolbarButton
5960import org.wordpress.aztec.source.SourceViewEditText
6061import org.wordpress.aztec.toolbar.AztecToolbar
6162import org.wordpress.aztec.toolbar.IAztecToolbarClickListener
62- import org.wordpress.aztec.toolbar.RippleToggleButton
6363import org.wordpress.aztec.util.AztecLog
6464import org.xml.sax.Attributes
6565import java.io.File
@@ -139,32 +139,32 @@ open class MainActivity : AppCompatActivity(),
139139
140140 private val EXAMPLE =
141141 IMG +
142- HEADING +
143- BOLD +
144- ITALIC +
145- UNDERLINE +
146- STRIKETHROUGH +
147- ORDERED +
148- LINE +
149- UNORDERED +
150- QUOTE +
151- PREFORMAT +
152- LINK +
153- HIDDEN +
154- COMMENT +
155- COMMENT_MORE +
156- COMMENT_PAGE +
157- CODE +
158- UNKNOWN +
159- EMOJI +
160- NON_LATIN_TEXT +
161- LONG_TEXT +
162- VIDEO +
163- VIDEOPRESS +
164- VIDEOPRESS_2 +
165- AUDIO +
166- GUTENBERG_CODE_BLOCK +
167- QUOTE_RTL
142+ HEADING +
143+ BOLD +
144+ ITALIC +
145+ UNDERLINE +
146+ STRIKETHROUGH +
147+ ORDERED +
148+ LINE +
149+ UNORDERED +
150+ QUOTE +
151+ PREFORMAT +
152+ LINK +
153+ HIDDEN +
154+ COMMENT +
155+ COMMENT_MORE +
156+ COMMENT_PAGE +
157+ CODE +
158+ UNKNOWN +
159+ EMOJI +
160+ NON_LATIN_TEXT +
161+ LONG_TEXT +
162+ VIDEO +
163+ VIDEOPRESS +
164+ VIDEOPRESS_2 +
165+ AUDIO +
166+ GUTENBERG_CODE_BLOCK +
167+ QUOTE_RTL
168168
169169 private val isRunningTest: Boolean by lazy {
170170 try {
@@ -347,8 +347,10 @@ open class MainActivity : AppCompatActivity(),
347347 visualEditor.externalLogger = object : AztecLog .ExternalLogger {
348348 override fun log (message : String ) {
349349 }
350+
350351 override fun logException (tr : Throwable ) {
351352 }
353+
352354 override fun logException (tr : Throwable , message : String ) {
353355 }
354356 }
@@ -360,7 +362,7 @@ open class MainActivity : AppCompatActivity(),
360362 mediaMenu?.setOnMenuItemClickListener(this @MainActivity)
361363 mediaMenu?.inflate(R .menu.menu_gallery)
362364 mediaMenu?.show()
363- if (view is RippleToggleButton ) {
365+ if (view is ToggleButton ) {
364366 view.isChecked = false
365367 }
366368 }
@@ -373,32 +375,32 @@ open class MainActivity : AppCompatActivity(),
373375 mediaMenu?.setOnMenuItemClickListener(this @MainActivity)
374376 mediaMenu?.inflate(R .menu.menu_camera)
375377 mediaMenu?.show()
376- if (view is RippleToggleButton ) {
378+ if (view is ToggleButton ) {
377379 view.isChecked = false
378380 }
379381 }
380382 })
381383
382384 aztec = Aztec .with (visualEditor, sourceEditor, toolbar, this )
383- .setImageGetter(GlideImageLoader (this ))
384- .setVideoThumbnailGetter(GlideVideoThumbnailLoader (this ))
385- .setOnImeBackListener(this )
386- .setOnTouchListener(this )
387- .setHistoryListener(this )
388- .setOnImageTappedListener(this )
389- .setOnVideoTappedListener(this )
390- .setOnAudioTappedListener(this )
391- .setOnMediaDeletedListener(this )
392- .setOnVideoInfoRequestedListener(this )
393- .addPlugin(WordPressCommentsPlugin (visualEditor))
394- .addPlugin(MoreToolbarButton (visualEditor))
395- .addPlugin(PageToolbarButton (visualEditor))
396- .addPlugin(CaptionShortcodePlugin (visualEditor))
397- .addPlugin(VideoShortcodePlugin ())
398- .addPlugin(AudioShortcodePlugin ())
399- .addPlugin(HiddenGutenbergPlugin ())
400- .addPlugin(galleryButton)
401- .addPlugin(cameraButton)
385+ .setImageGetter(GlideImageLoader (this ))
386+ .setVideoThumbnailGetter(GlideVideoThumbnailLoader (this ))
387+ .setOnImeBackListener(this )
388+ .setOnTouchListener(this )
389+ .setHistoryListener(this )
390+ .setOnImageTappedListener(this )
391+ .setOnVideoTappedListener(this )
392+ .setOnAudioTappedListener(this )
393+ .setOnMediaDeletedListener(this )
394+ .setOnVideoInfoRequestedListener(this )
395+ .addPlugin(WordPressCommentsPlugin (visualEditor))
396+ .addPlugin(MoreToolbarButton (visualEditor))
397+ .addPlugin(PageToolbarButton (visualEditor))
398+ .addPlugin(CaptionShortcodePlugin (visualEditor))
399+ .addPlugin(VideoShortcodePlugin ())
400+ .addPlugin(AudioShortcodePlugin ())
401+ .addPlugin(HiddenGutenbergPlugin ())
402+ .addPlugin(galleryButton)
403+ .addPlugin(cameraButton)
402404
403405 // initialize the plugins, text & HTML
404406 if (! isRunningTest) {
0 commit comments