Move motion interpolation behind theme attrs

Author: hunterstich

Reply/app/src/main/java/com/materialstudies/reply/ui/compose/ComposeFragment.kt

@@ -33,7 +33,7 @@ import com.materialstudies.reply.data.Email
 import com.materialstudies.reply.data.EmailStore
 import com.materialstudies.reply.databinding.ComposeRecipientChipBinding
 import com.materialstudies.reply.databinding.FragmentComposeBinding
-import com.materialstudies.reply.util.FastOutUltraSlowIn
+import com.materialstudies.reply.util.themeInterpolator
 import com.materialstudies.reply.util.transition.MaterialContainerTransition
 import kotlin.LazyThreadSafetyMode.NONE
 
@@ -119,7 +119,7 @@ class ComposeFragment : Fragment() {
                 binding.emailCardView
             )
             duration = resources.getInteger(R.integer.reply_motion_default_duration).toLong()
-            interpolator = FastOutUltraSlowIn()
+            interpolator = requireContext().themeInterpolator(R.attr.materialMotionInterpolator)
         }
         returnTransition = Slide().apply {
             duration = resources.getInteger(R.integer.reply_motion_micro_duration).toLong()

Reply/app/src/main/java/com/materialstudies/reply/ui/email/EmailFragment.kt

@@ -27,7 +27,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.materialstudies.reply.R
 import com.materialstudies.reply.data.EmailStore
 import com.materialstudies.reply.databinding.FragmentEmailBinding
-import com.materialstudies.reply.util.FastOutUltraSlowIn
+import com.materialstudies.reply.util.themeInterpolator
 import com.materialstudies.reply.util.transition.MaterialContainerTransition
 import kotlin.LazyThreadSafetyMode.NONE
 
@@ -96,14 +96,14 @@ class EmailFragment : Fragment() {
             correctForZOrdering = true
         ).apply {
             duration = resources.getInteger(R.integer.reply_motion_default_duration).toLong()
-            interpolator = FastOutUltraSlowIn()
+            interpolator = requireContext().themeInterpolator(R.attr.materialMotionInterpolator)
         }
         sharedElementReturnTransition = MaterialContainerTransition(
             R.id.recycler_view,
             correctForZOrdering = true
         ).apply {
             duration = resources.getInteger(R.integer.reply_motion_default_duration).toLong()
-            interpolator = FastOutUltraSlowIn()
+            interpolator = requireContext().themeInterpolator(R.attr.materialMotionInterpolator)
         }
     }
 

Reply/app/src/main/java/com/materialstudies/reply/ui/nav/BottomNavDrawerFragment.kt

@@ -37,9 +37,9 @@ import com.materialstudies.reply.R
 import com.materialstudies.reply.data.Account
 import com.materialstudies.reply.data.AccountStore
 import com.materialstudies.reply.databinding.FragmentBottomNavDrawerBinding
-import com.materialstudies.reply.util.FastOutUltraSlowIn
 import com.materialstudies.reply.util.lerp
 import com.materialstudies.reply.util.themeColor
+import com.materialstudies.reply.util.themeInterpolator
 import kotlin.LazyThreadSafetyMode.NONE
 import kotlin.math.abs
 
@@ -128,7 +128,9 @@ class BottomNavDrawerFragment :
 
     private var sandwichState: SandwichState = SandwichState.CLOSED
     private var sandwichAnim: ValueAnimator? = null
-    private val sandwichInterp = FastOutUltraSlowIn()
+    private val sandwichInterp by lazy(NONE) {
+        requireContext().themeInterpolator(R.attr.materialMotionInterpolator)
+    }
     // Progress value which drives the animation of the sandwiching account picker. Responsible
     // for both calling progress updates and state updates.
     private var sandwichProgress: Float = 0F

Reply/app/src/main/java/com/materialstudies/reply/util/ContextExtensions.kt

@@ -21,6 +21,8 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.util.TypedValue
+import android.view.animation.AnimationUtils
+import android.view.animation.Interpolator
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
@@ -47,12 +49,22 @@ fun Context.themeColor(
  * Retrieve a style from the current [android.content.res.Resources.Theme].
  */
 @StyleRes
-fun Context.themeStyle(attr: Int): Int {
+fun Context.themeStyle(@AttrRes attr: Int): Int {
     val tv = TypedValue()
     theme.resolveAttribute(attr, tv, true)
     return tv.data
 }
 
+@SuppressLint("Recycle")
+fun Context.themeInterpolator(@AttrRes attr: Int): Interpolator {
+    return AnimationUtils.loadInterpolator(
+        this,
+        obtainStyledAttributes(intArrayOf(attr)).use {
+            it.getResourceId(0, android.R.interpolator.fast_out_slow_in)
+        }
+    )
+}
+
 fun Context.getDrawableOrNull(@DrawableRes id: Int?): Drawable? {
     return if (id == null || id == 0) null else AppCompatResources.getDrawable(this, id)
 }

Reply/app/src/main/java/com/materialstudies/reply/util/FastOutUltraSlowIn.kt

@@ -24,6 +24,8 @@
     <attr name="emphasisMediumAlpha" format="float"/>
     <attr name="emphasisDisabledAlpha" format="float"/>
 
+    <attr name="materialMotionInterpolator" format="reference"/>
+
     <!--Custom view themes/styles-->
     <attr name="bottomNavigationDrawerStyle" format="reference" />
     <attr name="bottomNavigationDrawerNavigationViewTheme" format="reference" />

Reply/app/src/main/res/values/attrs.xml

@@ -16,8 +16,8 @@
 
     <!--Motion-->
 
-    <integer name="reply_motion_default_duration">350</integer>
-    <integer name="reply_motion_short_duration">250</integer>
+    <integer name="reply_motion_default_duration">300</integer>
+    <integer name="reply_motion_short_duration">225</integer>
     <integer name="reply_motion_micro_duration">175</integer>
 
 </resources>

Reply/app/src/main/res/values/motion.xml

@@ -62,6 +62,8 @@
         <item name="emphasisMediumAlpha">0.60</item>
         <item name="emphasisDisabledAlpha">0.38</item>
 
+        <item name="materialMotionInterpolator">@android:interpolator/fast_out_slow_in</item>
+
         <!--Styles-->
         <item name="bottomAppBarStyle">@style/Widget.MaterialComponents.BottomAppBar.PrimarySurface</item>
         <item name="bottomSheetStyle">@style/Widget.MaterialComponents.BottomSheet.Modal</item>