react-native-advanced-text 0.1.19 → 0.1.21

package/android/src/main/java/com/advancedtext/AdvancedTextView.kt

@@ -32,6 +32,7 @@ class AdvancedTextView : TextView {
     private var lastSelectedText: String = ""
     private var customActionMode: ActionMode? = null
     private var currentText: String = ""
+    private var textColor: String = "#000000"
 
     // Cache for word positions to avoid recalculating
     private var wordPositions: List<WordPosition> = emptyList()
@@ -41,53 +42,58 @@ class AdvancedTextView : TextView {
     constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { init() }
 
     private fun init() {
-        Log.d(TAG, "AdvancedTextView initialized")
-
-        // Set default properties
-        textSize = 16f
-        setPadding(16, 16, 16, 16)
-        movementMethod = LinkMovementMethod.getInstance()
-        setTextIsSelectable(true)
-
-        customSelectionActionModeCallback = object : ActionMode.Callback {
-            override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-                customActionMode = mode
-                return true
-            }
-
-            override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-                menu?.clear()
-
-                val selectionStart = selectionStart
-                val selectionEnd = selectionEnd
-
-                if (selectionStart >= 0 && selectionEnd >= 0 && selectionStart != selectionEnd) {
-                    lastSelectedText = text.subSequence(selectionStart, selectionEnd).toString()
-
-                    menuOptions.forEachIndexed { index, option ->
-                        menu?.add(0, index, index, option)
-                    }
-
-                    sendSelectionEvent(lastSelectedText, "selection")
-                    return true
-                }
-                return false
-            }
+    Log.d(TAG, "AdvancedTextView initialized")
+
+    textSize = 16f
+    setPadding(16, 16, 16, 16)
+
+    movementMethod = ClickableMovementMethod.getInstance()
+    isClickable = false
+    isLongClickable = false
+
+    setTextIsSelectable(true)
+
+    customSelectionActionModeCallback = object : ActionMode.Callback {
+          override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+              customActionMode = mode
+              return true
+          }
+
+          override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+              menu?.clear()
+              val selectionStart = selectionStart
+              val selectionEnd = selectionEnd
+
+              if (selectionStart >= 0 && selectionEnd >= 0 && selectionStart != selectionEnd) {
+                  lastSelectedText = text.subSequence(selectionStart, selectionEnd).toString()
+                  menuOptions.forEachIndexed { index, option ->
+                      menu?.add(0, index, index, option)
+                  }
+                  sendSelectionEvent(lastSelectedText, "selection")
+                  return true
+              }
+              return false
+          }
+
+          override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
+              item?.let {
+                  sendSelectionEvent(lastSelectedText, it.title.toString())
+                  mode?.finish()
+                  return true
+              }
+              return false
+          }
+
+          override fun onDestroyActionMode(mode: ActionMode?) {
+              customActionMode = null
+          }
+        }
+    }
 
-            override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
-                item?.let {
-                    val menuItemText = it.title.toString()
-                    sendSelectionEvent(lastSelectedText, menuItemText)
-                    mode?.finish()
-                    return true
-                }
-                return false
-            }
 
-            override fun onDestroyActionMode(mode: ActionMode?) {
-                customActionMode = null
-            }
-        }
+    fun setAdvancedTextColor(colorInt: Int) {
+        textColor = String.format("#%06X", 0xFFFFFF and colorInt)
+        updateTextWithHighlights()
     }
 
     fun setAdvancedText(text: String) {
@@ -165,7 +171,7 @@ class AdvancedTextView : TextView {
             // Apply indicator color
             if (wordPos.index == indicatorWordIndex) {
                 spannableString.setSpan(
-                    ForegroundColorSpan(Color.RED),
+                    ForegroundColorSpan(Color.parseColor(textColor)),
                     wordPos.start,
                     wordPos.end,
                     Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
@@ -213,8 +219,8 @@ class AdvancedTextView : TextView {
     }
 
     private inner class WordClickableSpan(
-        private val wordIndex: Int,
-        private val word: String
+    private val wordIndex: Int,
+    private val word: String
     ) : ClickableSpan() {
 
         override fun onClick(widget: View) {
@@ -231,6 +237,7 @@ class AdvancedTextView : TextView {
         override fun updateDrawState(ds: TextPaint) {
             super.updateDrawState(ds)
             ds.isUnderlineText = false
+            ds.color = Color.parseColor(textColor)
         }
     }
 

package/android/src/main/java/com/advancedtext/AdvancedTextViewManager.kt

@@ -86,7 +86,9 @@ class AdvancedTextViewManager : SimpleViewManager<AdvancedTextView>() {
     @ReactProp(name = "color", customType = "Color")
     fun setColor(view: AdvancedTextView?, color: Int?) {
         android.util.Log.d(NAME, "setColor called with: $color")
-        view?.setTextColor(color ?: Color.BLACK)
+        if (color != null) {
+            view?.setAdvancedTextColor(color)
+        }
     }
 
     @ReactProp(name = "fontSize")

package/android/src/main/java/com/advancedtext/ClickableMovementMethod.kt

@@ -0,0 +1,59 @@
+package com.advancedtext
+
+import android.text.Layout
+import android.text.Selection
+import android.text.Spannable
+import android.text.method.BaseMovementMethod
+import android.text.style.ClickableSpan
+import android.view.MotionEvent
+import android.widget.TextView
+
+class ClickableMovementMethod : BaseMovementMethod() {
+
+    companion object {
+        private var sInstance: ClickableMovementMethod? = null
+
+        fun getInstance(): ClickableMovementMethod {
+            if (sInstance == null) {
+                sInstance = ClickableMovementMethod()
+            }
+            return sInstance!!
+        }
+    }
+
+    override fun canSelectArbitrarily(): Boolean = false
+
+    override fun onTouchEvent(widget: TextView, buffer: Spannable, event: MotionEvent): Boolean {
+        val action = event.actionMasked
+        if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_DOWN) {
+
+            var x = (event.x - widget.totalPaddingLeft + widget.scrollX).toInt()
+            var y = (event.y - widget.totalPaddingTop + widget.scrollY).toInt()
+
+            val layout: Layout = widget.layout
+            val links: Array<ClickableSpan>? = if (y < 0 || y > layout.height) {
+                null
+            } else {
+                val line = layout.getLineForVertical(y)
+                if (x < layout.getLineLeft(line) || x > layout.getLineRight(line)) null
+                else {
+                    val offset = layout.getOffsetForHorizontal(line, x.toFloat())
+                    buffer.getSpans(offset, offset, ClickableSpan::class.java)
+                }
+            }
+
+            if (!links.isNullOrEmpty()) {
+                if (action == MotionEvent.ACTION_UP) links[0].onClick(widget)
+                else Selection.setSelection(buffer, buffer.getSpanStart(links[0]), buffer.getSpanEnd(links[0]))
+                return true
+            } else {
+                Selection.removeSelection(buffer)
+            }
+        }
+        return false
+    }
+
+    override fun initialize(widget: TextView, text: Spannable) {
+        Selection.removeSelection(text)
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-advanced-text",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": " Advanced text component for React Native with custom select options.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",