Optimized calculating height and getting rid of app:fullHeight="true"

Author: Stjin

README.md

@@ -32,12 +32,12 @@ implementation 'com.github.Stjinchan:ExpandableCardView:1.1.2'
 
 ### Beta
 ```gradle
-implementation 'com.github.Stjinchan:ExpandableCardView:1.2.0-beta01'
+implementation 'com.github.Stjinchan:ExpandableCardView:1.2.0-beta05'
 ```
 
 ```
-This is a beta, introducing ```app:fullHeight``` as a workaround for the [Innerview issue](https://github.com/AleSpero/ExpandableCardView/issues/9)
-I hope to fix this in the future and might remove this attribute
+This is a beta, introducing a different way of calculating inner_view height as a fix for the [Innerview issue](https://github.com/AleSpero/ExpandableCardView/issues/9)
+I am still testing if this works as intended
 ```
 
 Or get the aar in the [Releases](https://github.com/Stjinchan/ExpandableCardView/releases) section.

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

@@ -108,7 +108,6 @@
             android:layout_marginRight="20dp"
             android:layout_marginBottom="10dp"
             app:animationDuration="900"
-            app:fullHeight="true"
             app:expandOnClick="true"
             app:icon="@drawable/ic_dates"
             app:inner_view="@layout/test"

app/src/main/res/layout/test.xml

@@ -1,4 +1,5 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/expand_card_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -17,16 +18,8 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/module_always_on_display_CardText"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="false"
+        android:layout_alignParentBottom="true"
         android:layout_marginEnd="16dp" />
 
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/card_module_always_on_display_enable_switch1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/card_module_always_on_display_enable_switch"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="false"
-        android:layout_marginEnd="16dp" />
 
 </RelativeLayout>

expandablecardview/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
 ext {
     PUBLISH_GROUP_ID = 'host.stjin'
     PUBLISH_ARTIFACT_ID = 'expandable-cardview'
-    PUBLISH_VERSION = '1.2.0-beta04'
+    PUBLISH_VERSION = '1.2.0-beta05'
 }
 
 android {
@@ -14,7 +14,7 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 29
-        versionCode 9
+        versionCode 10
         versionName PUBLISH_VERSION
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

expandablecardview/src/main/java/host/stjin/expandablecardview/ExpandableCardView.kt

@@ -62,7 +62,6 @@ class ExpandableCardView @JvmOverloads constructor(context: Context, attrs: Attr
     private var cardRadius: Float = 4f
     private var cardElevation: Float = 4f
     private var cardRipple: Boolean = false
-    private var fullHeight: Boolean = false
     private var expandableCardTitleBold: Boolean = false
     private var iconDrawable: Drawable? = null
 
@@ -118,7 +117,6 @@ class ExpandableCardView @JvmOverloads constructor(context: Context, attrs: Attr
         animDuration = typedArray.getInteger(R.styleable.ExpandableCardView_animationDuration, DEFAULT_ANIM_DURATION).toLong()
         startExpanded = typedArray.getBoolean(R.styleable.ExpandableCardView_startExpanded, false)
         cardRipple = typedArray.getBoolean(R.styleable.ExpandableCardView_expandableCardRipple, false)
-        fullHeight = typedArray.getBoolean(R.styleable.ExpandableCardView_fullHeight, false)
         expandableCardTitleBold = typedArray.getBoolean(R.styleable.ExpandableCardView_expandableCardTitleBold, false)
         cardStrokeColor = typedArray.getInteger(R.styleable.ExpandableCardView_expandableCardStrokeColor, android.R.color.transparent)
         cardArrowColor = typedArray.getInteger(R.styleable.ExpandableCardView_expandableCardArrowColor, android.R.color.black)
@@ -184,12 +182,7 @@ class ExpandableCardView @JvmOverloads constructor(context: Context, attrs: Attr
         }
 
 
-        val targetHeight = if (fullHeight) {
-            getFullHeight(card_layout)
-        } else{
-            card_layout.measure(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
-            card_layout.measuredHeight
-        }
+        val targetHeight = getFullHeight(card_layout)
 
         if (targetHeight - initialHeight != 0) {
             animateViews(initialHeight,
@@ -214,14 +207,12 @@ class ExpandableCardView @JvmOverloads constructor(context: Context, attrs: Attr
         val numberOfChildren = layout.childCount
         for (i in 0 until numberOfChildren) {
             val child = layout.getChildAt(i)
-            totalHeight += if (child is ViewGroup) {
-                getFullHeight(child)
-            } else {
-                val desiredWidth = MeasureSpec.makeMeasureSpec(layout.width,
-                        MeasureSpec.AT_MOST)
-                child.measure(desiredWidth, MeasureSpec.UNSPECIFIED)
-                child.measuredHeight
-            }
+
+            val desiredWidth = MeasureSpec.makeMeasureSpec(layout.width,
+                    MeasureSpec.AT_MOST)
+            child.measure(desiredWidth, MeasureSpec.UNSPECIFIED)
+            child.measuredHeight
+            totalHeight+=child.measuredHeight
         }
         layout.visibility = initialVisibility
         return totalHeight

expandablecardview/src/main/res/values/attr.xml

@@ -9,7 +9,6 @@
         <attr name="animationDuration" format="integer"/>
         <attr name="startExpanded" format="boolean"/>
         <attr name="expandableCardRipple" format="boolean"/>
-        <attr name="fullHeight" format="boolean"/>
         <attr name="expandableCardTitleBold" format="boolean"/>
         <attr name="expandableCardStrokeWidth" format="integer"/>
         <attr name="expandableCardTitleSize" format="float"/>