Merge branch 'dev'

Author: amlwin

example/src/main/java/com/banner/example/MainActivity.kt

@@ -2,11 +2,16 @@ package com.banner.example
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        tv_tester.text = "Hello World \n" +
+                "Lwin\n" +
+                "Aye"
     }
 }

example/src/main/res/layout/activity_main.xml

@@ -7,6 +7,7 @@
     tools:context=".MainActivity">
 
     <com.banner.expander.ExpanderTextView
+        android:id="@+id/tv_tester"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.!"

expander/src/main/java/com/banner/expander/ExpanderTextView.kt

@@ -67,8 +67,17 @@ class ExpanderTextView(context: Context, attributeSet: AttributeSet) :
         })
     }
 
+//    Start of a string = ^ ,
+//    End of a string = $ ,
+//    regex combination = | ,
+//    Linebreak = \r\n|[\n\x0B\x0C\r\u0085\u2028\u2029]
+
     override fun setText(text: CharSequence?, type: BufferType?) {
-        this.originalText = text!!
+        this.originalText = text?.replace(
+            Regex("\n"),
+            ""
+        ) as CharSequence
+        Log.d(TAG, "original text $originalText")
         this.bufferType = type!!
         setText()
     }
@@ -97,7 +106,7 @@ class ExpanderTextView(context: Context, attributeSet: AttributeSet) :
     private fun prepareTrimText(): CharSequence {
         if (lineIndexEnd != INVALID_LINE_INDEX) {
             val trimTextIndex = lineIndexEnd - (ELLIPSIZE.length + DEFAULT_CONTINUE_TEXT.length)
-
+            Log.d(TAG, "size is ${originalText.length} and text is $originalText")
             val trimText = SpannableStringBuilder(originalText, 0, trimTextIndex)
                 .append(ELLIPSIZE)
                 .append(DEFAULT_CONTINUE_TEXT)