Create ActionableTextView interface

Author: nevenz

app/src/main/java/com/orgzly/android/ui/views/TextViewWithMarkup.kt

@@ -17,13 +17,12 @@ import com.orgzly.android.ui.views.style.DrawerSpan
 import com.orgzly.android.util.LogUtils
 import com.orgzly.android.util.OrgFormatter
 
-
 /**
  * [TextView] with markup support.
  *
  * Used for title, content and preface text.
  */
-class TextViewWithMarkup : TextViewFixed {
+class TextViewWithMarkup : TextViewFixed, ActionableTextView {
     constructor(context: Context) : super(context) {
         // addTextChangedListener(EditTextWatcher())
     }
@@ -67,15 +66,15 @@ class TextViewWithMarkup : TextViewFixed {
     }
 
     // TODO: Consider getting MainActivity's *ViewModel* here instead
-    fun followLinkToNoteWithProperty(name: String, value: String) {
+    override fun followLinkToNoteWithProperty(name: String, value: String) {
         MainActivity.followLinkToNoteWithProperty(name, value)
     }
 
-    fun followLinkToFile(path: String) {
+    override fun followLinkToFile(path: String) {
         MainActivity.followLinkToFile(path)
     }
 
-    fun toggleDrawer(drawerSpan: DrawerSpan) {
+    override fun toggleDrawer(drawerSpan: DrawerSpan) {
         val textSpanned = text as Spanned
 
         val drawerStart = textSpanned.getSpanStart(drawerSpan)
@@ -109,7 +108,7 @@ class TextViewWithMarkup : TextViewFixed {
         text = builder
     }
 
-    fun toggleCheckbox(checkboxSpan: CheckboxSpan) {
+    override fun toggleCheckbox(checkboxSpan: CheckboxSpan) {
         if (BuildConfig.LOG_DEBUG) LogUtils.d(TAG, checkboxSpan)
 
         val content = if (checkboxSpan.isChecked()) "[ ]" else "[X]"
@@ -171,3 +170,10 @@ class TextViewWithMarkup : TextViewFixed {
         val TAG: String = TextViewWithMarkup::class.java.name
     }
 }
+
+interface ActionableTextView {
+    fun toggleCheckbox(checkboxSpan: CheckboxSpan)
+    fun followLinkToNoteWithProperty(name: String, value: String)
+    fun toggleDrawer(drawerSpan: DrawerSpan)
+    fun followLinkToFile(path: String)
+}

app/src/main/java/com/orgzly/android/ui/views/style/CheckboxSpan.kt

@@ -3,17 +3,17 @@ package com.orgzly.android.ui.views.style
 import android.text.TextPaint
 import android.text.style.ClickableSpan
 import android.view.View
-import com.orgzly.android.ui.views.TextViewWithMarkup
+import com.orgzly.android.ui.views.ActionableTextView
 
 /**
  * @param content is `[ ]` or `[X]`
  * @param rawStart is a position of dash
  */
 class CheckboxSpan(val content: CharSequence, val rawStart: Int, val rawEnd: Int) : ClickableSpan() {
 
-    override fun onClick(widget: View) {
-        if (widget is TextViewWithMarkup) {
-            widget.toggleCheckbox(this)
+    override fun onClick(view: View) {
+        if (view is ActionableTextView) {
+            view.toggleCheckbox(this)
         }
     }
 

app/src/main/java/com/orgzly/android/ui/views/style/CustomIdLinkSpan.kt

@@ -1,12 +1,12 @@
 package com.orgzly.android.ui.views.style
 
 import android.view.View
-import com.orgzly.android.ui.views.TextViewWithMarkup
+import com.orgzly.android.ui.views.ActionableTextView
 
 class CustomIdLinkSpan(override val type: Int, val value: String, override val name: String?) : LinkSpan(type, value, name) {
-    override fun onClick(widget: View) {
-        if (widget is TextViewWithMarkup) {
-            widget.followLinkToNoteWithProperty(PROPERTY, value)
+    override fun onClick(view: View) {
+        if (view is ActionableTextView) {
+            view.followLinkToNoteWithProperty(PROPERTY, value)
         }
     }
 

app/src/main/java/com/orgzly/android/ui/views/style/DrawerSpan.kt

@@ -3,12 +3,13 @@ package com.orgzly.android.ui.views.style
 import android.text.TextPaint
 import android.text.style.ClickableSpan
 import android.view.View
+import com.orgzly.android.ui.views.ActionableTextView
 import com.orgzly.android.ui.views.TextViewWithMarkup
 
 class DrawerSpan(val name: String, val content: CharSequence, var isFolded: Boolean) : ClickableSpan() {
-    override fun onClick(widget: View) {
-        if (widget is TextViewWithMarkup) {
-            widget.toggleDrawer(this)
+    override fun onClick(view: View) {
+        if (view is ActionableTextView) {
+            view.toggleDrawer(this)
         }
     }
 

app/src/main/java/com/orgzly/android/ui/views/style/FileLinkSpan.kt

@@ -1,15 +1,14 @@
 package com.orgzly.android.ui.views.style
 
 import android.os.Handler
-import android.text.style.ClickableSpan
 import android.view.View
-import com.orgzly.android.ui.views.TextViewWithMarkup
+import com.orgzly.android.ui.views.ActionableTextView
 
 class FileLinkSpan(override val type: Int, val path: String, override val name: String?) : LinkSpan(type, path, name) {
-    override fun onClick(widget: View) {
-        if (widget is TextViewWithMarkup) {
+    override fun onClick(view: View) {
+        if (view is ActionableTextView) {
             Handler().post { // Run after onClick to prevent Snackbar from closing immediately
-                widget.followLinkToFile(path)
+                view.followLinkToFile(path)
             }
         }
     }

app/src/main/java/com/orgzly/android/ui/views/style/IdLinkSpan.kt

@@ -1,13 +1,12 @@
 package com.orgzly.android.ui.views.style
 
-import android.text.style.ClickableSpan
 import android.view.View
-import com.orgzly.android.ui.views.TextViewWithMarkup
+import com.orgzly.android.ui.views.ActionableTextView
 
 class IdLinkSpan(override val type: Int, val value: String, override val name: String?) : LinkSpan(type, value, name) {
-    override fun onClick(widget: View) {
-        if (widget is TextViewWithMarkup) {
-            widget.followLinkToNoteWithProperty(PROPERTY, value)
+    override fun onClick(view: View) {
+        if (view is ActionableTextView) {
+            view.followLinkToNoteWithProperty(PROPERTY, value)
         }
     }