From 2fc5ed53ebc4b07101f22adfb8c5a840ad8efe09 Mon Sep 17 00:00:00 2001
From: egeysn <yasinege1328@gmail.com>
Date: Fri, 9 Jun 2023 16:52:16 +0300
Subject: [PATCH 1/2] Add optional less more action.

---
 app/src/main/res/layout/activity_main.xml     | 19 ++++++++++++++
 .../expandable_textview/ExpandableTextView.kt | 26 +++++++++++++++++--
 .../src/main/res/values/attrs.xml             |  1 +
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 246a3fd..593229f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -46,6 +46,25 @@
             app:expandActionColor="@color/blue_500"
             app:originalText="@string/long_text" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/purple_500"
+            android:padding="16dp"
+            android:text="More / Less Text"
+            android:textColor="@android:color/white"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
+        <io.github.giangpham96.expandable_textview.ExpandableTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/purple_100"
+            android:padding="16dp"
+            app:expandAction="More"
+            app:expandActionColor="@color/blue_500"
+            app:lessMoreAction="Less More"
+            app:originalText="@string/long_text" />
+
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/expandable_textview/src/main/java/io/github/giangpham96/expandable_textview/ExpandableTextView.kt b/expandable_textview/src/main/java/io/github/giangpham96/expandable_textview/ExpandableTextView.kt
index 5f4b0f6..1f8af6c 100644
--- a/expandable_textview/src/main/java/io/github/giangpham96/expandable_textview/ExpandableTextView.kt
+++ b/expandable_textview/src/main/java/io/github/giangpham96/expandable_textview/ExpandableTextView.kt
@@ -51,6 +51,18 @@ class ExpandableTextView @JvmOverloads constructor(
             )
             updateCollapsedDisplayedText(ctaChanged = true)
         }
+    private var lessMoreAction: String? = null
+        set(value) {
+            field = value
+            if(field == null) return
+            lessMoreActionSpannable = SpannableString(" $value")
+            lessMoreActionSpannable.setSpan(
+                ForegroundColorSpan(expandActionColor),
+                0,
+                lessMoreActionSpannable.length,
+                SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+        }
     var limitedMaxLines: Int = 3
         set(value) {
             check(maxLines == -1 || value <= maxLines) {
@@ -83,6 +95,7 @@ class ExpandableTextView @JvmOverloads constructor(
     private var expandActionSpannable = SpannableString("")
     private var expandActionStaticLayout: StaticLayout? = null
     private var collapsedDisplayedText: CharSequence? = null
+    private var lessMoreActionSpannable = SpannableString("")
 
     init {
         ellipsize = END
@@ -91,6 +104,7 @@ class ExpandableTextView @JvmOverloads constructor(
         expandActionColor = a.getColor(R.styleable.ExpandableTextView_expandActionColor, expandActionColor)
         originalText = a.getString(R.styleable.ExpandableTextView_originalText) ?: originalText
         limitedMaxLines = a.getInt(R.styleable.ExpandableTextView_limitedMaxLines, limitedMaxLines)
+        lessMoreAction = a.getString(R.styleable.ExpandableTextView_lessMoreAction)
         check(maxLines == -1 || limitedMaxLines <= maxLines) {
             """
                 maxLines ($maxLines) must be greater than or equal to limitedMaxLines ($limitedMaxLines). 
@@ -143,7 +157,7 @@ class ExpandableTextView @JvmOverloads constructor(
             return
         }
         val height0 = height
-        text = if (collapsed) originalText else collapsedDisplayedText
+        text = if (collapsed) originalText.addLessMoreSpan() else collapsedDisplayedText
         measure(MeasureSpec.makeMeasureSpec(width, EXACTLY), MeasureSpec.makeMeasureSpec(height, UNSPECIFIED))
         val height1 = measuredHeight
         animator?.cancel()
@@ -166,7 +180,7 @@ class ExpandableTextView @JvmOverloads constructor(
 
                     override fun onAnimationEnd(animation: Animator) {
                         super.onAnimationEnd(animation)
-                        text = if (collapsed) collapsedDisplayedText else originalText
+                        text = if (collapsed) collapsedDisplayedText else originalText.addLessMoreSpan()
                         val params = layoutParams
                         layoutParams.height = WRAP_CONTENT
                         layoutParams = params
@@ -271,4 +285,12 @@ class ExpandableTextView @JvmOverloads constructor(
         }
     }
 
+    private fun CharSequence.addLessMoreSpan(): CharSequence {
+        return when (lessMoreAction) {
+            null -> this@addLessMoreSpan
+            else -> return SpannableStringBuilder(this)
+                .append(lessMoreActionSpannable)
+        }
+    }
+
 }
diff --git a/expandable_textview/src/main/res/values/attrs.xml b/expandable_textview/src/main/res/values/attrs.xml
index 0573ac7..623630e 100644
--- a/expandable_textview/src/main/res/values/attrs.xml
+++ b/expandable_textview/src/main/res/values/attrs.xml
@@ -5,6 +5,7 @@
         <attr name="originalText" format="string" />
         <attr name="expandAction" format="string" />
         <attr name="expandActionColor" format="string" />
+        <attr name="lessMoreAction" format="string" />
     </declare-styleable>
 
 </resources>

From 3882e7bd95598e7ca773492ba25e100fc9941d97 Mon Sep 17 00:00:00 2001
From: egeysn <yasin.ege@bilyoner.com>
Date: Sun, 6 Aug 2023 23:44:45 +0300
Subject: [PATCH 2/2] Change collapse action params name.

---
 README.md                                     |  8 +++----
 .../io/github/giangpham96/app/MainActivity.kt |  4 ++--
 app/src/main/res/layout/activity_main.xml     | 10 ++++----
 .../expandable_text_compose/ExpandableText.kt | 20 ++++++++--------
 .../expandable_textview/ExpandableTextView.kt | 24 +++++++++----------
 .../src/main/res/values/attrs.xml             |  4 ++--
 6 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 4aeb5b2..e93d3a2 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ dependencies {
     android:maxLines="10" 
     app:expandAction="More" 
     app:limitedMaxLines="2"
-    app:expandActionColor="@color/blue_500" 
+    app:actionColor="@color/blue_500" 
     app:originalText="@string/long_text" />
 ```
 
@@ -72,7 +72,7 @@ dependencies {
 |:---------------------:|:------:|:-----------------------------------------------------------:|:-------------------------------------------------------:|
 |  app:limitedMaxLines  |  Int   |     The maximum line counts when the text is collapsed      |                            3                            |
 |   app:expandAction    | String | The action at the end of truncated text such as "View more" | "" (Nothing will be shown at the end of truncated text) |
-| app:expandActionColor | Color  |                 The color of expand action                  |                        #ffaa66cc                        |
+| app:actionColor | Color  |             The color of expand/collapse action             |                        #ffaa66cc                        |
 |   app:originalText    | String |         The text to be displayed on this text view          |                           ""                            |
 
 #### Public functions
@@ -80,7 +80,7 @@ dependencies {
 - `limitedMaxLines` public getter & setter for the maximum line counts when the text is collapsed.
 - `expandAction` public getter & setter for the action at the end of truncated text such as "View
   more".
-- `expandActionColor` public getter & setter for the color of expand action.
+- `actionColor` public getter & setter for the color of expand/collapse action.
 - `originalText` public getter & setter for the text to be displayed on this text view.
 - `collapsed` public getter to determine if the text is being collapsed
 - `expanded` public getter to determine if the text is being expanded
@@ -108,7 +108,7 @@ ExpandableText(
     originalText = "a very long text that will be truncated at some points",
     expandAction = "See more",
     expand = expand,
-    expandActionColor = Color.Blue,
+    actionColor = Color.Blue,
     limitedMaxLines = 2,
     animationSpec = spring(),
     modifier = Modifier
diff --git a/app/src/main/java/io/github/giangpham96/app/MainActivity.kt b/app/src/main/java/io/github/giangpham96/app/MainActivity.kt
index c5a30c3..35152bc 100644
--- a/app/src/main/java/io/github/giangpham96/app/MainActivity.kt
+++ b/app/src/main/java/io/github/giangpham96/app/MainActivity.kt
@@ -61,7 +61,7 @@ class MainActivity : AppCompatActivity() {
         btnExpandCtaColor.setOnClickListener {
             val ctaColorSet =
                 setOf(Color.WHITE, Color.BLACK, Color.BLUE, Color.CYAN, Color.MAGENTA, Color.RED, Color.DKGRAY)
-            tvDynamic.expandActionColor = ctaColorSet.random()
+            tvDynamic.actionColor = ctaColorSet.random()
         }
         btnMaxLines.setOnClickListener {
             tvDynamic.maxLines = Random.nextInt(7, 20)
@@ -120,7 +120,7 @@ class MainActivity : AppCompatActivity() {
                 originalText = stringResource(id = R.string.long_text),
                 expandAction = "See more",
                 expand = expand,
-                expandActionColor = androidx.compose.ui.graphics.Color.Blue,
+                actionColor = androidx.compose.ui.graphics.Color.Blue,
             )
         }
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 593229f..c1a51cb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -43,7 +43,7 @@
             android:background="@color/purple_100"
             android:padding="16dp"
             app:expandAction="More"
-            app:expandActionColor="@color/blue_500"
+            app:actionColor="@color/blue_500"
             app:originalText="@string/long_text" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -61,8 +61,8 @@
             android:background="@color/purple_100"
             android:padding="16dp"
             app:expandAction="More"
-            app:expandActionColor="@color/blue_500"
-            app:lessMoreAction="Less More"
+            app:actionColor="@color/blue_500"
+            app:collapseAction="Less More"
             app:originalText="@string/long_text" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -123,7 +123,7 @@
             android:padding="16dp"
             app:limitedMaxLines="2"
             app:expandAction="More"
-            app:expandActionColor="@color/blue_500"
+            app:actionColor="@color/blue_500"
             app:originalText="@string/long_text" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -174,7 +174,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
-            android:text="Change expandActionColor"
+            android:text="Change actionColor"
             tools:ignore="HardcodedText" />
 
         <androidx.appcompat.widget.AppCompatButton
diff --git a/expandable_text_compose/src/main/java/io/github/giangpham96/expandable_text_compose/ExpandableText.kt b/expandable_text_compose/src/main/java/io/github/giangpham96/expandable_text_compose/ExpandableText.kt
index d6476c4..9f86199 100644
--- a/expandable_text_compose/src/main/java/io/github/giangpham96/expandable_text_compose/ExpandableText.kt
+++ b/expandable_text_compose/src/main/java/io/github/giangpham96/expandable_text_compose/ExpandableText.kt
@@ -51,7 +51,7 @@ import androidx.compose.ui.unit.dp
  * @param originalText The text that might be truncated/collapsed if too long
  * @param expandAction The text that is appended at the end of the collapsed text
  * @param expand Whether the text should be expanded or not. Default to false
- * @param expandActionColor The color of [expandAction]
+ * @param actionColor The color of [expandAction]
  * @param limitedMaxLines The number of lines displayed when the text collapses
  * @param modifier [Modifier] to apply to this layout node.
  * @param color [Color] to apply to the text. If [Color.Unspecified], and [style] has no color set,
@@ -78,7 +78,7 @@ fun ExpandableText(
     expandAction: String,
     modifier: Modifier = Modifier,
     expand: Boolean = false,
-    expandActionColor: Color = Color.Unspecified,
+    actionColor: Color = Color.Unspecified,
     limitedMaxLines: Int = 3,
     color: Color = Color.Unspecified,
     fontSize: TextUnit = TextUnit.Unspecified,
@@ -110,7 +110,7 @@ fun ExpandableText(
             originalText = originalText,
             expandAction = expandAction,
             expand = expand,
-            expandActionColor = expandActionColor,
+            actionColor = actionColor,
             limitedMaxLines = limitedMaxLines,
             softWrap = softWrap,
             textStyle = mergedStyle,
@@ -143,7 +143,7 @@ fun Constraints.rememberExpandableTextData(
     originalText: String,
     expandAction: String,
     expand: Boolean,
-    expandActionColor: Color,
+    actionColor: Color,
     limitedMaxLines: Int,
     softWrap: Boolean,
     textStyle: TextStyle,
@@ -175,7 +175,7 @@ fun Constraints.rememberExpandableTextData(
         originalText = originalText,
         expandAction = expandAction,
         expandActionWidth = expandActionWidth,
-        expandActionColor = expandActionColor,
+        actionColor = actionColor,
     )
     var displayedText by remember {
         mutableStateOf(if (expand) AnnotatedString(originalText) else collapsedText)
@@ -215,11 +215,11 @@ private fun TextLayoutResult.rememberCollapsedText(
     originalText: String,
     expandAction: String,
     expandActionWidth: Int,
-    expandActionColor: Color,
+    actionColor: Color,
 ): AnnotatedString {
     val lastLine = lineCount - 1
     val lastCharacterIndex = getLineEnd(lastLine)
-    return remember(originalText, expandAction, expandActionWidth, expandActionColor) {
+    return remember(originalText, expandAction, expandActionWidth, actionColor) {
         if (lastCharacterIndex == originalText.length) {
             AnnotatedString(originalText)
         } else {
@@ -247,7 +247,7 @@ private fun TextLayoutResult.rememberCollapsedText(
                 append(cutText)
                 append('…')
                 append(' ')
-                withStyle(SpanStyle(color = expandActionColor)) {
+                withStyle(SpanStyle(color = actionColor)) {
                     append(expandAction)
                 }
             }
@@ -335,7 +335,7 @@ private fun PreviewRtl() = CompositionLocalProvider(LocalLayoutDirection provide
                 .background(Color.Gray)
                 .padding(16.dp),
             expand = expand,
-            expandActionColor = Color.Blue
+            actionColor = Color.Blue
         )
     }
 }
@@ -360,6 +360,6 @@ private fun Preview() = Box {
             .background(Color.Gray)
             .padding(16.dp),
         expand = expand,
-        expandActionColor = Color.Blue
+        actionColor = Color.Blue
     )
 }
diff --git a/expandable_textview/src/main/java/io/github/giangpham96/expandable_textview/ExpandableTextView.kt b/expandable_textview/src/main/java/io/github/giangpham96/expandable_textview/ExpandableTextView.kt
index 1f8af6c..dbba9e9 100644
--- a/expandable_textview/src/main/java/io/github/giangpham96/expandable_textview/ExpandableTextView.kt
+++ b/expandable_textview/src/main/java/io/github/giangpham96/expandable_textview/ExpandableTextView.kt
@@ -44,22 +44,22 @@ class ExpandableTextView @JvmOverloads constructor(
             val start = ellipsis.toString().length
             expandActionSpannable = SpannableString("$ellipsis $value")
             expandActionSpannable.setSpan(
-                ForegroundColorSpan(expandActionColor),
+                ForegroundColorSpan(actionColor),
                 start,
                 expandActionSpannable.length,
                 SPAN_EXCLUSIVE_EXCLUSIVE
             )
             updateCollapsedDisplayedText(ctaChanged = true)
         }
-    private var lessMoreAction: String? = null
+    private var collapseAction: String? = null
         set(value) {
             field = value
             if(field == null) return
-            lessMoreActionSpannable = SpannableString(" $value")
-            lessMoreActionSpannable.setSpan(
-                ForegroundColorSpan(expandActionColor),
+            collapseActionSpannable = SpannableString(" $value")
+            collapseActionSpannable.setSpan(
+                ForegroundColorSpan(actionColor),
                 0,
-                lessMoreActionSpannable.length,
+                collapseActionSpannable.length,
                 SPAN_EXCLUSIVE_EXCLUSIVE
             )
         }
@@ -76,7 +76,7 @@ class ExpandableTextView @JvmOverloads constructor(
         }
 
     @ColorInt
-    var expandActionColor: Int = ContextCompat.getColor(context, android.R.color.holo_purple)
+    var actionColor: Int = ContextCompat.getColor(context, android.R.color.holo_purple)
         set(value) {
             field = value
             val colorSpan = ForegroundColorSpan(value)
@@ -95,16 +95,16 @@ class ExpandableTextView @JvmOverloads constructor(
     private var expandActionSpannable = SpannableString("")
     private var expandActionStaticLayout: StaticLayout? = null
     private var collapsedDisplayedText: CharSequence? = null
-    private var lessMoreActionSpannable = SpannableString("")
+    private var collapseActionSpannable = SpannableString("")
 
     init {
         ellipsize = END
         val a = context.obtainStyledAttributes(attrs, R.styleable.ExpandableTextView)
         expandAction = a.getString(R.styleable.ExpandableTextView_expandAction) ?: expandAction
-        expandActionColor = a.getColor(R.styleable.ExpandableTextView_expandActionColor, expandActionColor)
+        actionColor = a.getColor(R.styleable.ExpandableTextView_actionColor, actionColor)
         originalText = a.getString(R.styleable.ExpandableTextView_originalText) ?: originalText
         limitedMaxLines = a.getInt(R.styleable.ExpandableTextView_limitedMaxLines, limitedMaxLines)
-        lessMoreAction = a.getString(R.styleable.ExpandableTextView_lessMoreAction)
+        collapseAction = a.getString(R.styleable.ExpandableTextView_collapseAction)
         check(maxLines == -1 || limitedMaxLines <= maxLines) {
             """
                 maxLines ($maxLines) must be greater than or equal to limitedMaxLines ($limitedMaxLines). 
@@ -286,10 +286,10 @@ class ExpandableTextView @JvmOverloads constructor(
     }
 
     private fun CharSequence.addLessMoreSpan(): CharSequence {
-        return when (lessMoreAction) {
+        return when (collapseAction) {
             null -> this@addLessMoreSpan
             else -> return SpannableStringBuilder(this)
-                .append(lessMoreActionSpannable)
+                .append(collapseActionSpannable)
         }
     }
 
diff --git a/expandable_textview/src/main/res/values/attrs.xml b/expandable_textview/src/main/res/values/attrs.xml
index 623630e..208effa 100644
--- a/expandable_textview/src/main/res/values/attrs.xml
+++ b/expandable_textview/src/main/res/values/attrs.xml
@@ -4,8 +4,8 @@
         <attr name="limitedMaxLines" format="integer" />
         <attr name="originalText" format="string" />
         <attr name="expandAction" format="string" />
-        <attr name="expandActionColor" format="string" />
-        <attr name="lessMoreAction" format="string" />
+        <attr name="actionColor" format="string" />
+        <attr name="collapseAction" format="string" />
     </declare-styleable>
 
 </resources>