Merge "Removed obsolete MaterialCardView extension properties"

Author: hunterstich

app/src/main/java/com/materialstudies/reply/ui/home/EmailViewHolder.kt

@@ -18,13 +18,10 @@ package com.materialstudies.reply.ui.home
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.shape.MaterialShapeDrawable
 import com.materialstudies.reply.R
 import com.materialstudies.reply.data.Email
 import com.materialstudies.reply.databinding.EmailItemLayoutBinding
 import com.materialstudies.reply.ui.common.EmailAttachmentAdapter
-import com.materialstudies.reply.util.backgroundShapeDrawable
-import com.materialstudies.reply.util.foregroundShapeDrawable
 import com.materialstudies.reply.util.getStyleIdFromAttr
 import com.materialstudies.reply.util.setTextAppearanceCompat
 
@@ -38,9 +35,6 @@ class EmailViewHolder(
             = R.layout.email_attachment_preview_item_layout
     }
 
-    private val cardBackground: MaterialShapeDrawable = binding.cardView.backgroundShapeDrawable
-    private val cardForeground: MaterialShapeDrawable = binding.cardView.foregroundShapeDrawable
-
     override val reboundableView: View = binding.cardView
 
     init {
@@ -74,17 +68,11 @@ class EmailViewHolder(
         // rounded or squared. Since all other corners are set to 0dp rounded, they are
         // not affected.
         val interpolation = if (email.isStarred) 1F else 0F
-        setCardShapeInterpolation(interpolation)
+        binding.cardView.progress = interpolation
 
         binding.executePendingBindings()
     }
 
-    private fun setCardShapeInterpolation(interpolation: Float) {
-        cardBackground.interpolation = interpolation
-        cardForeground.interpolation = interpolation
-    }
-
-
     override fun onReboundOffsetChanged(
         currentSwipePercentage: Float,
         swipeThreshold: Float,
@@ -100,7 +88,7 @@ class EmailViewHolder(
         // Animate the top left corner radius of the email card as swipe happens.
         val interpolation = (currentSwipePercentage / swipeThreshold).coerceIn(0F, 1F)
         val adjustedInterpolation = Math.abs((if (isStarred) 1F else 0F) - interpolation)
-        setCardShapeInterpolation(adjustedInterpolation)
+        binding.cardView.progress = adjustedInterpolation
 
         // Start the background animation once the threshold is met.
         val thresholdMet = currentSwipePercentage >= swipeThreshold

app/src/main/java/com/materialstudies/reply/util/ViewExtensions.kt

@@ -17,13 +17,8 @@
 package com.materialstudies.reply.util
 
 import android.content.Context
-import android.graphics.drawable.InsetDrawable
-import android.graphics.drawable.LayerDrawable
-import android.graphics.drawable.RippleDrawable
 import android.os.Build
 import android.widget.TextView
-import com.google.android.material.card.MaterialCardView
-import com.google.android.material.shape.MaterialShapeDrawable
 
 @Suppress("DEPRECATION")
 fun TextView.setTextAppearanceCompat(context: Context, resId: Int) {
@@ -33,23 +28,3 @@ fun TextView.setTextAppearanceCompat(context: Context, resId: Int) {
         setTextAppearance(context, resId)
     }
 }
-
-/**
- * Helper method to get the MaterialShapeDrawable background of MaterialCardView. This should be
- * fixed in a future update to Material Components.
- *
- * TODO(https://issuetracker.google.com/issues/135604742) Remove once fix lands.
- */
-val MaterialCardView.backgroundShapeDrawable: MaterialShapeDrawable
-    get() = (this.background as InsetDrawable).drawable as MaterialShapeDrawable
-
-/**
- * Helper method to get the MaterialShapeDrawable foreground of MaterialCardView. This should be
- * fixed in a future update to Material Components.
- *
- * TODO(https://issuetracker.google.com/issues/135604742) Remove once fix lands.
- */
-val MaterialCardView.foregroundShapeDrawable: MaterialShapeDrawable
-    get() = (((this.foreground as InsetDrawable).drawable as LayerDrawable)
-        .getDrawable(0) as RippleDrawable)
-        .getDrawable(0) as MaterialShapeDrawable

app/src/main/res/values-night/themes.xml

@@ -18,7 +18,6 @@
     <style name="Theme.Reply.DayNight" parent="Theme.Reply.Dark"/>
 
     <style name="Theme.Reply.Dark" parent="Theme.Reply">
-
         <!--Color-->
         <item name="colorPrimary">@color/colorBlue200</item>
         <item name="colorPrimaryVariant">@color/colorBlue300</item>