Optimize on recyclerview, make more consistent

eriffanani · eriffanani · commit e06f77f85278 · 2023-07-17T15:38:30.000+07:00
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/src/main/java/com/erif/readmoretextview/ActDetail.java b/app/src/main/java/com/erif/readmoretextview/ActDetail.java
@@ -28,12 +28,8 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         TextViewReadMore txtEntered = findViewById(R.id.act_detail_txtEntered);
-        txtEntered.onClickExpand(v -> {
-            txtEntered.toggle();
-        });
-        txtEntered.onClickCollapse(v -> {
-            txtEntered.toggle();
-        });
+        txtEntered.onClickExpand(v -> txtEntered.toggle());
+        txtEntered.onClickCollapse(v -> txtEntered.toggle());
 
     }
 
diff --git a/app/src/main/java/com/erif/readmoretextview/MainActivity.java b/app/src/main/java/com/erif/readmoretextview/MainActivity.java
@@ -66,9 +66,18 @@ protected void onCreate(Bundle savedInstanceState) {
         };
 
         int [] img = new int[] {
-                R.mipmap.img1, R.mipmap.img3, R.mipmap.img2, R.mipmap.img5, R.mipmap.img4,
-                R.mipmap.img1, R.mipmap.img2, R.mipmap.img3, R.mipmap.img4, R.mipmap.img5,
-                R.mipmap.img2, R.mipmap.img1
+                R.mipmap.img1,
+                R.mipmap.img3,
+                R.mipmap.img2,
+                R.mipmap.img5,
+                R.mipmap.img4,
+                R.mipmap.img1,
+                R.mipmap.img2,
+                R.mipmap.img3,
+                R.mipmap.img4,
+                R.mipmap.img5,
+                R.mipmap.img2,
+                R.mipmap.img1
         };
 
         for (int i=0; i<arr.length; i++) {
diff --git a/app/src/main/java/com/erif/readmoretextview/adapter/AdapterRecyclerView.java b/app/src/main/java/com/erif/readmoretextview/adapter/AdapterRecyclerView.java
@@ -41,6 +41,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                 item.setCollapsed(collapsed);
                 update(position);
             });
+
+            mHolder.img.setOnClickListener(v -> update(position));
+
         }
     }
 
diff --git a/app/src/main/res/layout/act_detail.xml b/app/src/main/res/layout/act_detail.xml
@@ -11,13 +11,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginStart="15dp"
         android:layout_marginTop="15dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="18sp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
             android:text="Click to expand"
             android:textStyle="bold"/>
 
@@ -27,10 +28,22 @@
             android:layout_height="wrap_content"
             android:lineSpacingExtra="3dp"
             android:textSize="16sp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
             android:text="@string/lorem_entered"
             android:layout_marginTop="15dp"
             app:readMoreMaxLines="2"/>
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Another Title"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:textStyle="bold"
+            android:layout_marginTop="10dp"
+            android:textSize="18sp"/>
+
     </LinearLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/item_recycler_view.xml b/app/src/main/res/layout/item_recycler_view.xml
@@ -37,10 +37,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:lineSpacingExtra="3dp"
-            android:textSize="14sp"
+            android:textSize="15sp"
             android:text="@string/lorem_ipsum1"
             android:textColor="@color/black"
             android:padding="10dp"
+            android:animationDuration="300"
             app:readMoreMaxLines="3"
             app:ellipsisType="dots"/>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,10 +1,10 @@
 <resources>
     <string name="app_name">ReadMoreTextView</string>
 
-    <string name="lorem_ipsum2">Long text 1 Lorem ipsum at placerat massa Maecenas sodales rutrum est sed efficitur Nunc at Nunc at placerat massa Maecenas sodales
+    <string name="lorem_ipsum2">Long text 2 Lorem ipsum at placerat massa Maecenas sodales rutrum est sed efficitur Nunc at Nunc at placerat massa Maecenas sodales
         placerat massa. asdfasf Maecenas sodales rutrum est sed efficitur.</string>
 
-    <string name="lorem_ipsum1">Long text 2 Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+    <string name="lorem_ipsum1">Long text 1 Lorem ipsum dolor sit amet, consectetur adipiscing elit.
         Maecenas sodales rutrum est sed efficitur. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
         Fusce eget ligula sed dolor accumsan tristique id vel turpis. Nam congue nunc hendrerit eros fermentum eleifend.
         Sed tristique facilisis imperdiet. Donec eget interdum dui.</string>
diff --git a/readMoreTextView/build.gradle b/readMoreTextView/build.gradle
@@ -9,7 +9,7 @@ afterEvaluate {
             release(MavenPublication) {
                 groupId = "com.github.eriffanani"
                 artifactId = "TextViewReadMore"
-                version = "3.0.0"
+                version = "3.1.0"
                 afterEvaluate {
                     artifact(tasks.getByName("bundleReleaseAar"))
                 }
diff --git a/readMoreTextView/src/main/java/com/erif/readmoretextview/TextViewReadMore.java b/readMoreTextView/src/main/java/com/erif/readmoretextview/TextViewReadMore.java
@@ -25,7 +25,6 @@
 import android.text.style.StyleSpan;
 import android.text.style.UnderlineSpan;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -73,6 +72,11 @@ public class TextViewReadMore extends AppCompatTextView {
     private int actionClickColor = 0;
     private int ellipsisType = ELLIPSIS_TYPE_DOTS;
 
+    private int totalMarginSide = 0;
+
+    private SpannableStringBuilder spanCollapsed;
+    private SpannableStringBuilder spanExpanded;
+
     private static long mLastClickTime = 0;
 
     public TextViewReadMore(@NonNull Context context) {
@@ -122,6 +126,10 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
 
                 ellipsisType = typedArray.getInt(R.styleable.TextViewReadMore_ellipsisType, ELLIPSIS_TYPE_DOTS);
 
+                int marginStart = typedArray.getDimensionPixelSize(R.styleable.TextViewReadMore_android_layout_marginStart, 0);
+                int marginEnd = typedArray.getDimensionPixelSize(R.styleable.TextViewReadMore_android_layout_marginEnd, 0);
+                totalMarginSide = marginStart + marginEnd;
+
             } finally {
                 typedArray.recycle();
             }
@@ -154,13 +162,24 @@ public void setText(CharSequence text, BufferType type) {
                 rebuild = true;
             }
         }
-        super.setText(text, type);
+        if (isEllipsized(text)) {
+            if (spanExpanded != null && !collapsed) {
+                super.setText(spanExpanded, type);
+            } else if (spanCollapsed != null && collapsed) {
+                super.setText(spanCollapsed, type);
+            } else {
+                super.setText(text, type);
+            }
+        } else {
+            super.setText(text, type);
+        }
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int givenWidth = MeasureSpec.getSize(widthMeasureSpec);
-        lineWidth = givenWidth - getCompoundPaddingStart() - getCompoundPaddingEnd();
+        int sidePadding = getCompoundPaddingStart() + getCompoundPaddingEnd();
+        lineWidth = givenWidth - sidePadding - totalMarginSide;
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
@@ -172,7 +191,6 @@ protected void onDraw(Canvas canvas) {
     }
 
     private void buildSpan() {
-        debug("mHeight("+getHeight()+") "+text);
         if (!TextUtils.isEmpty(text)) {
             isEllipsized = isEllipsized(text);
             if (isEllipsized) {
@@ -212,30 +230,39 @@ private void buildSpan() {
                             finalText = truncatedText.toString().replace(DOTS_CODE, "");
                         String collapsedText = finalText + SPACE_CODE + exp;
                         StaticLayout layout = getStaticLayoutCollapsed(collapsedText);
-                        SpannableStringBuilder spanCollapsed = spanCollapsed(collapsedText);
+                        spanCollapsed = spanCollapsed(collapsedText);
                         if (spanCollapsed != null) {
                             updateParam(layout.getHeight());
                             setText(spanCollapsed);
                         }
+                        spanExpanded = spanExpanded();
                     } else {
-                        String collapsedTextSpace = collapseText.replaceAll(" ", SPACE_CODE);
-                        String fullText = text + SPACE_CODE + collapsedTextSpace;
-                        SpannableStringBuilder spanExpanded = spanExpanded(fullText);
-                        StaticLayout layout = getStaticLayout(fullText);
-                        setText(spanExpanded);
+                        spanExpanded = spanExpanded();
+                        StaticLayout layout = getStaticLayout(spanExpanded.toString());
                         updateParam(layout.getHeight());
+                        setText(spanExpanded);
                     }
                     setMovementMethod(LinkMovementMethod.getInstance());
                     rebuild = false;
                 }
             } else {
+                rebuild = false;
                 StaticLayout layout = getStaticLayout(text);
-                updateParam(layout.getHeight());
+                post(() -> updateParam(layout.getHeight()));
             }
         }
     }
 
-    private boolean isEllipsized(String text) {
+    private boolean isEllipsized(@Nullable CharSequence charSequence) {
+        if (charSequence == null)
+            return false;
+        StaticLayout layout = getStaticLayout(charSequence.toString());
+        return layout.getLineCount() > maxLines;
+    }
+
+    private boolean isEllipsized(@Nullable String text) {
+        if (text == null)
+            return false;
         StaticLayout layout = getStaticLayout(text);
         return layout.getLineCount() > maxLines;
     }
@@ -287,6 +314,13 @@ public void updateDrawState(@NonNull TextPaint ds) {
         return span;
     }
 
+    private SpannableStringBuilder spanExpanded() {
+        String collapsedTextSpace = collapseText.replaceAll(" ", SPACE_CODE);
+        String fullText = text + SPACE_CODE + collapsedTextSpace;
+        spanExpanded = spanExpanded(fullText);
+        return spanExpanded;
+    }
+
     private SpannableStringBuilder spanExpanded(String text) {
         SpannableStringBuilder span = new SpannableStringBuilder(text);
         int start = text.length() - collapseText.length();
@@ -311,7 +345,7 @@ private SpannableStringBuilder spanExpanded(String text) {
             public void onClick(@NonNull View widget) {
                 if (onClickCollapse != null) {
                     new Handler(Looper.getMainLooper()).postDelayed(
-                            () -> onClickCollapse.onClick(widget), 150
+                            () -> onClickCollapse.onClick(widget), 100
                     );
                 }
             }
@@ -364,7 +398,9 @@ public void onAnimationStart(Animator animation) {
                 super.onAnimationStart(animation);
                 isAnimate = true;
                 if (collapsed) {
-                    setText(text, BufferType.SPANNABLE);
+                    collapsed = false;
+                    setText(spanExpanded);
+                    collapsed = true;
                 }
             }
             @Override
@@ -374,7 +410,8 @@ public void onAnimationEnd(Animator animation) {
                 collapsed = !collapsed;
                 rebuild = true;
                 new Handler(Looper.getMainLooper()).postDelayed(() -> {
-                    if (toggleListener != null) toggleListener.onToggle(collapsed);
+                    if (toggleListener != null)
+                        toggleListener.onToggle(collapsed);
                 }, 0);
             }
         });
@@ -421,10 +458,11 @@ private String ellipsize(String text, int size) {
     }
 
 
+    /* Unused function
     private void debug(String message) {
         Log.d("TextViewReadMore", message);
     }
-    /* Unused function
+
     private String textReplaceSpace() {
         return text.replaceAll(" ", SPACE_CODE);
     }
diff --git a/readMoreTextView/src/main/res/values/attrs.xml b/readMoreTextView/src/main/res/values/attrs.xml
@@ -27,6 +27,8 @@
             <flag name="dots" value="0"/>
             <flag name="none" value="1"/>
         </attr>
+        <attr name="android:layout_marginStart"/>
+        <attr name="android:layout_marginEnd"/>
     </declare-styleable>
 
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,8 @@ protected void onCreate(Bundle savedInstanceState) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`TextViewReadMore txtEntered = findViewById(R.id.act_detail_txtEntered);`
`31`		`- txtEntered.onClickExpand(v -> {`
`32`		`- txtEntered.toggle();`
`33`		`- });`
`34`		`- txtEntered.onClickCollapse(v -> {`
`35`		`- txtEntered.toggle();`
`36`		`- });`
	`31`	`+ txtEntered.onClickExpand(v -> txtEntered.toggle());`
	`32`	`+ txtEntered.onClickCollapse(v -> txtEntered.toggle());`
`37`	`33`
`38`	`34`	`}`
`39`	`35`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi`
`41`	`41`	`item.setCollapsed(collapsed);`
`42`	`42`	`update(position);`
`43`	`43`	`});`
	`44`	`+`
	`45`	`+ mHolder.img.setOnClickListener(v -> update(position));`
	`46`	`+`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ afterEvaluate {`
`9`	`9`	`release(MavenPublication) {`
`10`	`10`	`groupId = "com.github.eriffanani"`
`11`	`11`	`artifactId = "TextViewReadMore"`
`12`		`- version = "3.0.0"`
	`12`	`+ version = "3.1.0"`
`13`	`13`	`afterEvaluate {`
`14`	`14`	`artifact(tasks.getByName("bundleReleaseAar"))`
`15`	`15`	`}`