Merge pull request #98 from natura-cosmeticos/DSY-1051-create-expanda…

…ble-card-view [DSY-1051] fix expansion panel collapsed size error happening on andr…
natura-cosmeticos · Jul 7, 2020 · 9a2e41f · 9a2e41f
2 parents d6eecbe + 0751d6f
commit 9a2e41f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/designsystem/src/main/kotlin/com/natura/android/expansionPanel/ExpansionPanel.kt b/designsystem/src/main/kotlin/com/natura/android/expansionPanel/ExpansionPanel.kt
@@ -6,8 +6,8 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.google.android.material.card.MaterialCardView
 import com.natura.android.R
 
 @SuppressLint("CustomViewStyleable")
@@ -17,7 +17,7 @@ class ExpansionPanel @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
-    private val container by lazy { findViewById<MaterialCardView>(R.id.ds_expansion_panel_container) }
+    private val container by lazy { findViewById<CardView>(R.id.ds_expansion_panel_container) }
     private val icon by lazy { findViewById<ImageView>(R.id.ds_expansion_panel_icon) }
     private val contentArea by lazy { findViewById<ConstraintLayout>(R.id.ds_expansion_panel_content_area) }
     private val title by lazy { findViewById<TextView>(R.id.ds_expansion_panel_title) }

diff --git a/designsystem/src/main/res/layout/ds_expansion_panel.xml b/designsystem/src/main/res/layout/ds_expansion_panel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -8,7 +8,7 @@
     android:layout_height="wrap_content"
     android:background="@drawable/ds_expansion_panel_border_collapsed"
     android:animateLayoutChanges="true"
-    android:layout_margin="?elevation02"
+    android:layout_margin="?spacingMicro"
     app:cardElevation="?elevation01"
     app:rippleColor="@android:color/transparent"
     app:layout_constraintBottom_toBottomOf="parent"
@@ -83,5 +83,5 @@
 
     </LinearLayout>
 
-</com.google.android.material.card.MaterialCardView>
+</androidx.cardview.widget.CardView>
 
diff --git a/designsystem/src/test/kotlin/com/natura/android/expansionPanel/ExpansionPanelTest.kt b/designsystem/src/test/kotlin/com/natura/android/expansionPanel/ExpansionPanelTest.kt
@@ -6,7 +6,6 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.google.android.material.card.MaterialCardView
 import com.google.common.truth.Truth
 import com.natura.android.R
 import org.junit.Before
@@ -48,7 +47,7 @@ class ExpansionPanelTest {
     fun borderlessWhenCollapsed() {
         val expectedBackground = ContextCompat.getDrawable(activityController.get(), R.drawable.ds_expansion_panel_border_collapsed)
 
-        val container = expansionPanel.findViewById(R.id.ds_expansion_panel_container) as MaterialCardView
+        val container = expansionPanel.findViewById(R.id.ds_expansion_panel_container) as View
 
         container.callOnClick()
         container.callOnClick()